This commit was manufactured by cvs2svn to create tag 'v20050202'.
diff --git a/plugins/org.eclipse.jem.util/.classpath b/plugins/org.eclipse.jem.util/.classpath
deleted file mode 100644
index 76c372b..0000000
--- a/plugins/org.eclipse.jem.util/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="jemutil/"/>
- <classpathentry kind="src" path="property_files/"/>
- <classpathentry kind="src" path="jemutil-nonworkbnech/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.util/.cvsignore b/plugins/org.eclipse.jem.util/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/plugins/org.eclipse.jem.util/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/plugins/org.eclipse.jem.util/.options b/plugins/org.eclipse.jem.util/.options
deleted file mode 100644
index 0565417..0000000
--- a/plugins/org.eclipse.jem.util/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.util/debug/logtrace=false
-org.eclipse.jem.util/debug/logtracefile=false
-org.eclipse.jem.util/debug/loglevel=WARNING
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/.project b/plugins/org.eclipse.jem.util/.project
deleted file mode 100644
index e0e4120..0000000
--- a/plugins/org.eclipse.jem.util/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.util</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.util/README_for_PerformanceMonitorUtil_Compile_Errors.txt b/plugins/org.eclipse.jem.util/README_for_PerformanceMonitorUtil_Compile_Errors.txt
deleted file mode 100644
index e028980..0000000
--- a/plugins/org.eclipse.jem.util/README_for_PerformanceMonitorUtil_Compile_Errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-If you are getting compile errors in PerformanceMonitorUtil and PresentPerformanceMonitor classes it is because you
-don't have org.eclipse.perfmsr.core plugin installed. This is an optional plugin that is usually never needed
-except for performance testing.
-
-So to get around the compile errors we've created a stub plugin that you can use just for compiling. To use this
-go to CVS Repository view and check out as a project the org.eclipse.jem.util/org.eclipse.permsr.core.stub directory.
-This will create a plugin project with this as a stub for the performance monitor. You can then compile and run
-from the Run Runtime Workbench launches.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/about.html b/plugins/org.eclipse.jem.util/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/plugins/org.eclipse.jem.util/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>20th June, 2002</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, "Program" will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/build.properties b/plugins/org.eclipse.jem.util/build.properties
deleted file mode 100644
index e2660e1..0000000
--- a/plugins/org.eclipse.jem.util/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.util.jar = jemutil/,\
- property_files/,\
- jemutil-nonworkbnech/
-output.util.jar = bin/
-bin.includes = plugin.xml,\
- util.jar,\
- .options,\
- about.html,\
- plugin.properties
-src.includes = schema/,\
- about.html
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/LogEntry.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/LogEntry.java
deleted file mode 100644
index fc66d66..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/LogEntry.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: LogEntry.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-
-/**
- * This class should be used when logging information which should be grouped together. Instead of creating a new instance of this class every time it
- * is needed, for performance reasons, create an instance and reuse it.
- *
- *
- * @since 1.0.0
- */
-public class LogEntry {
-
- private int _executionMap = 0;
-
- private Throwable _caughtException = null;
-
- private String _propertiesFileName = null;
-
- private String localeOfOrigin = null;
-
- private String sourceIdentifier;
-
- private String elapsedTime;
-
- private String text;
-
- private String messageTypeIdentifier;
-
- /**
- * The file name parameter must be a name which can be used by ResourceBundle to load the string from the .properties file. The parameter must not
- * be null or the empty string.
- *
- * @param propertiesFileName
- *
- * @since 1.0.0
- */
- public LogEntry(String propertiesFileName) {
- setPropertiesFileName(propertiesFileName);
- }
-
- /**
- * Default Constructor
- */
- public LogEntry() {
- }
-
- /**
- * Get execution map
- *
- * @return execution map
- *
- * @since 1.0.0
- */
- public int getExecutionMap() {
- return _executionMap;
- }
-
- /**
- * Get the properties file name
- *
- * @return properties file name or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getPropertiesFileName() {
- return _propertiesFileName;
- }
-
- /**
- * Get target exception
- *
- * @return target exception or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public Throwable getTargetException() {
- return _caughtException;
- }
-
- /**
- * Get locale of origin
- *
- * @return locale of origin or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getLocaleOfOrigin() {
- return localeOfOrigin;
- }
-
- /**
- * Get source identifier.
- *
- * @return source identifier or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getSourceidentifier() {
- return sourceIdentifier;
- }
-
- /**
- * Get elapsed time
- *
- * @return elapsed time
- *
- * @since 1.0.0
- */
- public String getElapsedTime() {
- return elapsedTime;
- }
-
- /**
- * Get the message type identifier
- *
- * @return message type identifier or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getMessageTypeIdentifier() {
- return messageTypeIdentifier;
- }
-
- /**
- * Set execution map
- *
- * @param map
- *
- * @since 1.0.0
- */
- public void setExecutionMap(int map) {
- _executionMap = map;
- }
-
- /**
- * Set properties file name
- *
- * @param fName
- *
- * @since 1.0.0
- */
- public void setPropertiesFileName(String fName) {
- _propertiesFileName = fName;
- }
-
- /**
- * Set target exception
- *
- * @param exc
- *
- * @since 1.0.0
- */
- public void setTargetException(Throwable exc) {
- _caughtException = exc;
- }
-
- /**
- * Append stacktrace of current stack (at the time of call to this method) to the text buffer.
- *
- *
- * @since 1.0.0
- */
- public void appendStackTrace() {
- // Grab the stack trace from the Thread ...
- ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
- PrintWriter printWriter = new PrintWriter(byteOutput);
- // Can't call Thread.dumpStack() because it doesn't take a writer as input.
- // Copy its mechanism instead.
- new Exception("Stack trace").printStackTrace(printWriter); //$NON-NLS-1$
- printWriter.flush();
-
- // and update the text to the LogEntry's text.
- StringBuffer buffer = new StringBuffer();
- buffer.append(getText());
- buffer.append("\n"); //$NON-NLS-1$
- buffer.append(byteOutput.toString());
- setText(buffer.toString());
- }
-
- /**
- * Get the text.
- *
- * @return text or or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public String getText() {
- return text;
- }
-
- /**
- * Set the text
- *
- * @param string
- *
- * @since 1.0.0
- */
- public void setText(String string) {
- text = string;
- }
-
- /**
- * Set every entry to the default value except the properties file name.
- *
- *
- * @since 1.0.0
- */
- public void reset() {
- setExecutionMap(0);
- setTargetException(null);
- localeOfOrigin = null;
- sourceIdentifier = null;
- elapsedTime = null;
- setText(null);
- }
-
- /**
- * Set locale of origin.
- *
- * @param origin
- *
- * @since 1.0.0
- */
- public void setLocaleOfOrigin(String origin) {
- localeOfOrigin = origin;
- }
-
- /**
- * Set source id.
- *
- * @param id
- *
- * @since 1.0.0
- */
- public void setSourceID(String id) {
- sourceIdentifier = id;
- }
-
- /**
- * Set elapsed time.
- *
- * @param time
- *
- * @since 1.0.0
- */
- public void setElapsedTime(long time) {
- elapsedTime = String.valueOf(time);
- }
-
- /**
- * Set source identifier.
- *
- * @param string
- *
- * @since 1.0.0
- */
- public void setSourceIdentifier(String string) {
- setSourceID(string);
- }
-
- /**
- * Set message type identifier.
- *
- * @param string
- *
- * @since 1.0.0
- */
- public void setMessageTypeIdentifier(String string) {
- messageTypeIdentifier = string;
- }
-
- /**
- * Set message type id. Same as <code>setMessageTypeIdentifier.</code>
- * @param string
- *
- * @since 1.0.0
- */
- public void setMessageTypeID(String string) {
- setMessageTypeIdentifier(string);
- }
-
- /**
- * Set tokens. (Currently this is ignored).
- *
- * @param strings
- *
- * @since 1.0.0
- */
- public void setTokens(String[] strings) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer b = new StringBuffer();
- if (text != null)
- b.append(text);
- if (_caughtException != null)
- b.append(_caughtException.toString());
- return b.toString();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer.java
deleted file mode 100644
index 042c36e..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: ILogRenderer.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxy;
-
-/**
- * Basic log renderer interface. It is replaced by the extension <code>ILogRenderer2.</code>
- *
- * @since 1.0.0
- */
-public interface ILogRenderer {
-
- /**
- * Logged to console.
- */
- final public static String CONSOLE_DESCRIPTION = "console"; //$NON-NLS-1$
-
- /**
- * Logged to workbench.
- */
- final public static String WORKBENCH_DESCRIPTION = "workbench log"; //$NON-NLS-1$
-
- /**
- * Not logged.
- */
- final public static String NOLOG_DESCRIPTION = ""; //$NON-NLS-1$
-
- /**
- * Log levels. These are deprecated, use <code>java.util.logging.Level</code> codes instead.
- */
- final public static int LOG_ERROR = 0;
-
- final public static int LOG_TRACE = 1;
-
- final public static int LOG_WARNING = 2;
-
- final public static int LOG_INFO = 3;
-
- final public static String DefaultPluginID = "org.eclipse.jem.util"; //$NON-NLS-1$
-
- /**
- * Log the string at the specified type.
- *
- * @param msg
- * @param type
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(String msg, int type);
-
- /**
- * Start or stop the tracing.
- *
- * @param Flag
- * <code>true</code> to start the tracing.
- *
- * @since 1.0.0
- */
- public void setTraceMode(boolean Flag);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
deleted file mode 100644
index 9c70d50..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/ILogRenderer2.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: ILogRenderer2.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxy;
-
-import java.util.logging.Level;
-
-/**
- * Log renderer that provides more function. Basically it can handle
- * the logging of specific types in a different manner than the default
- * conversion to string supplied by Logger.
- *
- * It also uses the Level classes from java.util.logging as the logging levels.
- *
- * @since 1.0.0
- */
-public interface ILogRenderer2 extends ILogRenderer {
-
- /**
- * When Logger.setLevel(DEFAULT): restore to what the default level was.
- * When log(...,DEFAULT): Log at the default level for the type of object.
- */
- static final Level DEFAULT = new Logger.LocalLevel("DEFAULT", Integer.MAX_VALUE-1);
-
- /**
- * When log(...,TRACE) : Log only when in trace mode.
- * Don't use in Logger.setLevel(). Has no meaning in that case.
- */
- static final Level TRACE = new Logger.LocalLevel("TRACE", Integer.MAX_VALUE-2);
-
- /**
- * Log the throwable at the given level (if DEFAULT, use default level for a throwable).
- *
- * @param t
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(Throwable t, Level level);
-
- /**
- * Log the object at the given level (if DEFAULT, use default level for an object).
- *
- * @param o
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(Object o, Level level);
-
- /**
- * Log the boolean at the given level (if DEFAULT, use default level for a boolean).
- *
- * @param b
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(boolean b, Level level);
-
- /**
- * Log the char at the given level (if DEFAULT, use default level for a char).
- *
- * @param c
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(char c, Level level);
-
- /**
- * Log the byte at the given level (if DEFAULT, use default level for a byte).
- *
- * @param b
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(byte b, Level level);
-
- /**
- * Log the short at the given level (if DEFAULT, use default level for a short).
- *
- * @param s
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(short s, Level level);
-
- /**
- * Log the int at the given level (if DEFAULT, use default level for an int).
- *
- * @param i
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(int i, Level level);
-
- /**
- * Log the long at the given level (if DEFAULT, use default level for a long).
- *
- * @param l
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(long l, Level level);
-
- /**
- * Log the float at the given level (if DEFAULT, use default level for a float).
- *
- * @param f
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(float f, Level level);
-
- /**
- * Log the double at the given level (if DEFAULT, use default level for a double).
- *
- * @param d
- * @param level
- * @return
- *
- * @since 1.0.0
- */
- String log(double d, Level level);
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/JDKConsoleRenderer.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/JDKConsoleRenderer.java
deleted file mode 100644
index a491ef5..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/JDKConsoleRenderer.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: JDKConsoleRenderer.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxy;
-
-import java.util.logging.Level;
-
-/**
- * Default log renderer to use when not running under Eclipse. It logs to sysout and syserr.
- *
- * @since 1.1.0
- */
-
-public class JDKConsoleRenderer implements ILogRenderer2 {
-
- private boolean fTraceMode = false; // will we actually punch trace messaged or not
-
- private boolean fSettingTrace = false;
-
- private Logger fMyLogger = null;
-
- /**
- * Constructer taking a logger.
- *
- * @param logger
- *
- * @since 1.1.0
- */
- public JDKConsoleRenderer(Logger logger) {
- super();
- fMyLogger = logger;
- fTraceMode = fMyLogger.getTraceMode();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#log(java.lang.String, int)
- */
- public String log(String msg, int type) {
-
- if (type == ILogRenderer.LOG_TRACE && !fTraceMode)
- return null;
-
- if (type == ILogRenderer.LOG_ERROR)
- System.err.println(msg);
- else
- System.out.println(msg);
- return ILogRenderer.CONSOLE_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#setTraceMode(boolean)
- */
- public void setTraceMode(boolean flag) {
-
- if (fSettingTrace)
- return;
- fSettingTrace = true;
- fTraceMode = flag;
- fMyLogger.setTraceMode(flag);
- fSettingTrace = false;
- }
-
- /**
- * Log the string at the given level.
- *
- * @param msg
- * @param level
- * @return <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.1.0
- */
- protected String log(String msg, Level level) {
- if (level == Level.SEVERE)
- System.err.println(msg);
- else
- System.out.println(msg);
- return ILogRenderer.CONSOLE_DESCRIPTION;
- }
-
- /**
- * Answer if logging at the given level
- *
- * @param logLevel
- * @return <code>true</code> if logging at the given level.
- *
- * @since 1.1.0
- */
- protected boolean isLogging(Level logLevel) {
- return fTraceMode || fMyLogger.isLoggingLevel(logLevel);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(boolean, java.util.logging.Level)
- */
- public String log(boolean b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(byte, java.util.logging.Level)
- */
- public String log(byte b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(char, java.util.logging.Level)
- */
- public String log(char c, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(c), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(double, java.util.logging.Level)
- */
- public String log(double d, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(d), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(float, java.util.logging.Level)
- */
- public String log(float f, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(f), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(int, java.util.logging.Level)
- */
- public String log(int i, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(i), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(long, java.util.logging.Level)
- */
- public String log(long l, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(l), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Object, java.util.logging.Level)
- */
- public String log(Object o, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(o), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(short, java.util.logging.Level)
- */
- public String log(short s, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(String.valueOf(s), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Throwable, java.util.logging.Level)
- */
- public String log(Throwable t, Level level) {
- if (level == DEFAULT)
- level = Level.SEVERE;
- if (isLogging(level))
- return log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java b/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
deleted file mode 100644
index 45b394e..0000000
--- a/plugins/org.eclipse.jem.util/jemutil-nonworkbnech/org/eclipse/jem/util/logger/proxy/Logger.java
+++ /dev/null
@@ -1,836 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: Logger.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxy;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.*;
-import java.util.logging.Level;
-
-/**
- * This is a base, UI independent logger. It will
- * construct a consistent msg. body, and call an enfironment specific ILogRenderer.
- * By default, this logger will use a console based ILogRenderer,
- * and a J2EE Plugin identification.
- *
- * <p>
- * When running outside of Eclipse, the trace and logging level come from the system properties
- * <ul>
- * <li>"debug" (="true") - The default is <code>false</code>.
- * <li>"logLevel" (="level" where "level" is a level string, e.g. SEVERE, WARNING, etc. from the <code>java.util.logging.Level</code> class).
- * The default is "WARNING".
- * </ul>
- *
- *
- * @since 1.0.0
- */
-public class Logger {
-
- // This is used by ILogRenderer2 to define the default level.
- static class LocalLevel extends Level {
- public LocalLevel(String name, int level) {
- super(name, level);
- }
- }
-
- private boolean fTraceMode = false; // will we actually punch trace messaged or not
- private String fPluginID;
- private ILogRenderer fRenderer = null;
- private ILogRenderer2 renderer2 = null;
- public String fLineSeperator;
- private Level level;
- private Level defaultLevel = Level.SEVERE; // By default only severe or greater are logged.
- private String logFileName;
- private final static String DefaultLoggerPlugin = ILogRenderer.DefaultPluginID;
- static private Hashtable Loggers = new Hashtable(); // Keep track of all the Loggers
- final protected static String[] LogMark = { "*** ERROR *** ", //$NON-NLS-1$
- "[Trace] ", //$NON-NLS-1$
- "+++ Warning +++ ", //$NON-NLS-1$
- "Info " }; //$NON-NLS-1$
-
- final protected static String Filler = " "; // Use this to indent msg. body //$NON-NLS-1$
-
- protected Logger() {
- this(ILogRenderer.DefaultPluginID);
- }
-
- protected Logger(String pluginID) {
- fPluginID = pluginID;
- setRenderer(new JDKConsoleRenderer(this)); // Set up default to this. Someone can change it later.
- }
-
- /**
- * Return the stacktrace as a print formatted string.
- * @param e
- * @return the stacktrace as a string.
- *
- * @since 1.0.0
- */
- public String exceptionToString(Throwable e) {
- StringWriter stringWriter = new StringWriter();
- e.printStackTrace(new PrintWriter(stringWriter));
- return stringWriter.toString();
- }
-
- /**
- * Get the system default logger. This is used for clients that don't know if they
- * are running in Eclipse or outside of it. This way they have a common logger format
- * which switch correctly.
- * @return default logger.
- *
- * @since 1.0.0
- */
- static public Logger getLogger() {
- Logger defaultLogger = (Logger) Loggers.get(DefaultLoggerPlugin);
- if (defaultLogger == null) {
- defaultLogger = new Logger();
- defaultLogger.init();
- Loggers.put(DefaultLoggerPlugin, defaultLogger);
- }
- return defaultLogger;
- }
-
- /**
- * Get the logger for a specific plugin.
- * @param pluginId
- * @return logger for a specific pluggin.
- *
- * @since 1.0.0
- */
- static public Logger getLogger(String pluginId) {
- if (pluginId == null)
- return Logger.getLogger();
- Logger Logger = (Logger) Loggers.get(pluginId);
- if (Logger == null) {
- Logger = new Logger(pluginId);
- Logger.init();
- Loggers.put(pluginId, Logger);
- }
- return Logger;
- }
-
- /**
- * Used by subclass to get a logger if it exists, but not create one.
- * @param pluginId
- * @return logger.
- *
- * @since 1.0.0
- */
- static protected Logger getLoggerIfExists(String pluginId) {
- if (pluginId == null)
- return Logger.getLogger();
- else
- return (Logger) Loggers.get(pluginId);
- }
-
- /**
- * Get the plugin id for this logger.
- * @return pluginid
- *
- * @since 1.0.0
- */
- public String getPluginID() {
- return fPluginID;
- }
-
- /**
- * Get the trace mode for this logger
- * @return <code>true</code> if tracing is going on.
- *
- * @since 1.0.0
- */
- public boolean getTraceMode() {
- return fTraceMode;
- }
-
- /*
- * Indent the Msg. Body to make it easier to read the log
- */
- private void indentMsg(String msg, StringBuffer logMsg) {
- // Line seperator is different on different platform, unix = \n, windows \r\n and mac \r
- String sep = fLineSeperator;
- if (msg.indexOf("\r\n") != -1) //$NON-NLS-1$
- sep = "\r\n"; //$NON-NLS-1$
- else if (msg.indexOf("\n") != -1) //$NON-NLS-1$
- sep = "\n"; //$NON-NLS-1$
- else if (msg.indexOf("\r") != -1) //$NON-NLS-1$
- sep = "\r"; //$NON-NLS-1$
- StringTokenizer tokenizer = new StringTokenizer(msg, sep);
- boolean first = true;
- while (tokenizer.hasMoreTokens()) {
- if (first) {
- first = false;
- logMsg.append(Filler + tokenizer.nextToken());
- } else
- logMsg.append(fLineSeperator + Filler + tokenizer.nextToken());
- }
- }
- /*
- * If Eclipse is started with the -XDebug or -debug turn traces on for this Logger
- * Creation date: (8/23/2001 7:37:04 PM)
- */
- private void init() {
- if (System.getProperty("debug") != null) //$NON-NLS-1$
- fTraceMode = true;
- level = defaultLevel = Level.parse(System.getProperty("logLevel", Level.WARNING.getName()));
-
- try {
- fLineSeperator = System.getProperty("line.separator"); // Diff on Win/Unix/Mac //$NON-NLS-1$
- } catch (Throwable e) {
- fLineSeperator = "\n"; //$NON-NLS-1$
- }
- }
- /*
- * Generic log.
- * Creation date: (8/24/2001 1:55:34 PM)
- * @return java.lang.String
- * @param msg java.lang.String
- * @param type int
- */
- private String logAny(String msg, int type) {
- StringBuffer logMsg = new StringBuffer();
- logMsg.append(fLineSeperator);
- logMsg.append(LogMark[type]);
- return punchLog(logRest(msg, logMsg), type);
- }
-
- /**
- * This is to be used by renderers that want to put a msg out
- * in a generic format. This just returns the string that
- * should be logged. It puts things like headers on it.
- *
- * @param msg
- * @param aLevel
- * @return The generic message for the string and level.
- *
- * @since 1.0.0
- */
- public String getGenericMsg(String msg, Level aLevel) {
- StringBuffer genMsg = new StringBuffer(msg.length()+16);
- genMsg.append(fLineSeperator);
- genMsg.append(getLevelHeader(aLevel));
- genMsg.append(": ");
- genMsg.append(new Date());
- indentMsg(msg, genMsg);
- return genMsg.toString();
- }
-
- private static final Level[] LEVEL_SEARCH = new Level[] {
- Level.SEVERE,
- Level.WARNING,
- Level.INFO,
- ILogRenderer2.TRACE
- };
-
- private static final String[] LEVEL_MARK = new String[] {
- "*** ERROR ***",
- "+++ Warning +++",
- "Info",
- "[Trace]"
- };
-
- private String getLevelHeader(Level aLevel) {
- for (int i=0; i<LEVEL_SEARCH.length; i++)
- if (LEVEL_SEARCH[i] == aLevel)
- return LEVEL_MARK[i];
- return aLevel.getName(); // Not found, just use level string.
- }
-
- // The write's are here for history. Will implement using log(obj, Level) for all of the types.
-
-
- /**
- * deprecated use log(Level, Exception)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- *
- */
- public String write(Level aLevel, Exception ex) {
- return log(aLevel, ex);
- }
-
- /**
- * deprecated use log(Throwable)
- * @param ex
- * @return
- *
- * @since 1.0.0
- *
- */
- public String write(Throwable ex) {
- return log(ex);
- }
-
- /**
- * deprecated use log(Object, Level)
- * @param aLevel
- * @param logEntry
- * @return
- *
- * @since 1.0.0
- */
- public String write(Level aLevel, Object logEntry) {
- return log(logEntry, aLevel);
- }
-
- /**
- * deprecated use log(String, Level)
- * @param aLevel
- * @param string
- * @return
- *
- * @since 1.0.0
- */
- public String write(Level aLevel, String string) {
- return log(string, aLevel);
- }
- /**
- * deprecated use log(Throwable, Level)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- */
- public String write(Level aLevel, Throwable ex) {
- return log(ex, aLevel);
- }
- /**
- * deprecated use log(Throwable, Level)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- */
- public String log(Level aLevel, Exception ex) {
- return log(ex, aLevel);
- }
- /**
- * deprecated use log(Throwable, Level)
- * @param aLevel
- * @param ex
- * @return
- *
- * @since 1.0.0
- */
- public String log(Level aLevel, Throwable ex) {
- return log(ex, aLevel);
- }
-
- /**
- * Get the logging level
- * @return logging level
- *
- * @since 1.0.0
- */
- public Level getLevel() {
- return level;
- }
-
- /**
- * Check if the requested level is being logged. (e.g. if current level is SEVERE, then FINE will not be logged).
- * @param requestlevel
- * @return <code>true</code> if the level will be logged.
- *
- * @since 1.0.0
- */
- public boolean isLoggingLevel(Level requestlevel) {
- if (requestlevel == ILogRenderer2.TRACE && !getTraceMode())
- return false; // We aren't tracing but requested trace.
-
- return !(requestlevel.intValue() < getLevel().intValue() || getLevel() == Level.OFF);
- }
-
- /**
- * Log an error string.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logError(String msg) {
- return log(msg, Level.SEVERE);
- }
-
- /**
- * Log an error throwable
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logError(Throwable e) {
- return log(e, Level.SEVERE);
- }
-
- /**
- * Log an info message.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logInfo(String msg) {
- return log(msg, Level.INFO);
- }
-
-/**
- * Log a throwable as a warning.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logInfo(Throwable e) {
- return log(e, Level.INFO);
- }
-
- /**
- * Append the string to logMsg buffer passed in. Append the date and format the
- * string with nice indentation.
- *
- * @param msg
- * @param logMsg
- * @return the string from the logMsg after logging the rest.
- *
- * @since 1.0.0
- */
- protected String logRest(String msg, StringBuffer logMsg) {
- logMsg.append(new Date());
- indentMsg(msg, logMsg);
- return logMsg.toString();
- }
-
- /**
- * Log the msg as trace only.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logTrace(String msg) {
- if (fTraceMode)
- return log(msg, ILogRenderer2.TRACE);
- else
- return ILogRenderer.NOLOG_DESCRIPTION;
- }
-
- /**
- * Log the throwable as trace only.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logTrace(Throwable e) {
- return log(e, ILogRenderer2.TRACE);
- }
-
- /**
- * Log the message as warning.
- * @param msg
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logWarning(String msg) {
- return log(msg, Level.WARNING);
- }
- /**
- * Log the throwable as a warning.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String logWarning(Throwable e) {
- return log(e, Level.WARNING);
- }
-
- /**
- * Ask the Renderer to punch the msg. in the log.. one
- * caller at the time
- * Creation date: (8/24/2001 9:19:17 AM)
- * @return java.lang.String
- * @param msg java.lang.String
- * @param type int
- */
- protected synchronized String punchLog(String msg, int type) {
- return fRenderer.log(msg, type);
- }
-
- /**
- * Set the renderer to use.
- * @param renderer
- *
- * @since 1.0.0
- */
- public void setRenderer(ILogRenderer renderer) {
- fRenderer = renderer;
- renderer2 = (renderer instanceof ILogRenderer2) ? (ILogRenderer2) renderer : null;
- renderer.setTraceMode(getTraceMode());
- }
-
- /**
- * Set the trace mode.
- * @param flag <code>true</code> to turn on tracing.
- *
- * @since 1.0.0
- */
- public void setTraceMode(boolean flag) {
- fTraceMode = flag;
- if (fRenderer != null)
- fRenderer.setTraceMode(flag);
- }
-
- /**
- * Set the level cutoff for logging. Anything below this level will not log.
- * Do not set level to <code>ILogRenderer2.TRACE</code>. It doesn't make sense.
- *
- * @param level (Use <code>ILogRenderer2.DEFAULT</code> to restore to default for this logger.
- *
- * @since 1.0.0
- */
- public void setLevel(Level level) {
- this.level = level != ILogRenderer2.DEFAULT ? level : defaultLevel;
- }
-
- /**
- * Set the default level for this logger. It won't touch the current level.
- *
- * @param level
- *
- * @since 1.0.0
- */
- public void setDefaultLevel(Level level) {
- this.defaultLevel = level;
- }
-
- /**
- * Get the log file name.
- * @return Returns the logFileName.
- */
- public String getLogFileName() {
- return logFileName;
- }
-
- /**
- * Set the log file name.
- * @param logFileName The logFileName to set.
- */
- public void setLogFileName(String logFileName) {
- this.logFileName = logFileName;
- }
-
- // Now all of the log() types that use a Level.
-
- /**
- * Log the throwable at the default level for a throwable.
- * @param e
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(Throwable e) {
- return log(e, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the throwable at the given level.
- * @param e
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(Throwable e, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(e, logLevel);
- } else {
- // Do it the old way.
- String stackTrace = exceptionToString(e);
- return logAny(stackTrace, getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.SEVERE));
- }
- }
-
- public String log(Object o) {
- return log(o, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the object at the given level.
- * @param o
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(Object o, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(o, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(o), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- // The following are added to match up with Hyades so that primitives can be logged too.
-
- /**
- * Log a boolean at the default level.
- * @param b
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(boolean b) {
- return log(b, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log a boolean at the given level.
- * @param b
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(boolean b, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(b, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(b), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the character at the default level.
- * @param c
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(char c) {
- return log(c, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the character at the given level.
- * @param c
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(char c, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(c, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(c), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the byte at the default level.
- * @param b
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(byte b) {
- return log(b, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the byte at the given level.
- * @param b
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(byte b, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(b, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(b), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the short at the default level.
- * @param s
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(short s) {
- return log(s, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the short at the given level.
- * @param s
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(short s, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(s, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(s), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the int at the default level.
- * @param i
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(int i) {
- return log(i, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the int at the default level.
- * @param i
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(int i, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(i, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(i), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the long at the default level.
- * @param l
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(long l) {
- return log(l, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the long at the given level.
- * @param l
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(long l, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(l, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(l), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the float at the default level.
- * @param f
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(float f) {
- return log(f, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the float at the given level.
- * @param f
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(float f, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(f, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(f), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /**
- * Log the double at the default level
- * @param d
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(double d) {
- return log(d, ILogRenderer2.DEFAULT);
- }
-
- /**
- * Log the double at the given level
- *
- * @param d
- * @param logLevel
- * @return how it was logged. See <code>CONSOLE_DESCRIPTION.</code>
- *
- * @since 1.0.0
- */
- public String log(double d, Level logLevel) {
- if (renderer2 != null) {
- return renderer2.log(d, logLevel);
- } else {
- // Do it the old way.
- return logAny(String.valueOf(d), getOldType(logLevel != ILogRenderer2.DEFAULT ? level : Level.FINEST));
- }
- }
-
- /*
- * Turn new type into old type. The defaultLevel is the
- * level to use if the incoming level is marked as default.
- */
- private int getOldType(Level aLevel) {
- if (aLevel == Level.SEVERE)
- return ILogRenderer.LOG_ERROR;
- else if (aLevel == Level.WARNING)
- return ILogRenderer.LOG_WARNING;
- else if (aLevel == Level.INFO)
- return ILogRenderer.LOG_INFO;
- else if (aLevel == ILogRenderer2.TRACE)
- return ILogRenderer.LOG_TRACE;
- else
- return ILogRenderer.LOG_INFO;
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/EMFWorkbenchContextFactory.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/EMFWorkbenchContextFactory.java
deleted file mode 100644
index 92bafc9..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/EMFWorkbenchContextFactory.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFWorkbenchContextFactory.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.emf.workbench.*;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-
-public class EMFWorkbenchContextFactory {
- public static final EMFWorkbenchContextFactory INSTANCE;
-
- static {
- INSTANCE = createFactoryInstance();
- }
- private final Class CONTRIBUTOR_CLASS = IEMFContextContributor.class;
- protected Map emfContextCache = new WeakHashMap();
-
-
- private static EMFWorkbenchContextFactory createFactoryInstance() {
- EMFWorkbenchContextFactory factory = createFactoryInstanceFromExtension();
- if (factory == null)
- factory = new EMFWorkbenchContextFactory();
- return factory;
- }
-
- private static EMFWorkbenchContextFactory createFactoryInstanceFromExtension() {
- final EMFWorkbenchContextFactory[] factoryHolder = new EMFWorkbenchContextFactory[1];
- RegistryReader reader = new RegistryReader(JEMUtilPlugin.ID, "internalWorkbenchContextFactory") { //$NON-NLS-1$
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals("factoryClass")) //$NON-NLS-1$
- try {
- factoryHolder[0] = (EMFWorkbenchContextFactory)element.createExecutableExtension("name"); //$NON-NLS-1$
- return true;
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return false;
- }
- };
- reader.readRegistry();
- return factoryHolder[0];
- }
-
- /**
- * Constructor for EMFNatureFactory.
- */
- protected EMFWorkbenchContextFactory() {
- super();
-
- }
-
-
- protected void cacheEMFContext(IProject aProject, EMFWorkbenchContextBase emfContext) {
- if (aProject != null && emfContext != null)
- emfContextCache.put(aProject, emfContext);
- }
-
- protected EMFWorkbenchContextBase getCachedEMFContext(IProject aProject) {
- if (aProject != null)
- return (EMFWorkbenchContextBase) emfContextCache.get(aProject);
- return null;
- }
-
- /**
- * <code>aProject</code> is either being closed or deleted so we need to cleanup our cache.
- */
- public void removeCachedProject(IProject aProject) {
- if (aProject != null)
- emfContextCache.remove(aProject);
-
- }
- /**
- * Return a new or existing EMFNature on <code>aProject</code>. Allow the <code>contributor</code>
- * to contribute to the new or existing nature prior to returning.
- */
- public EMFWorkbenchContextBase createEMFContext(IProject aProject, IEMFContextContributor contributor) {
- if (aProject == null)
- throw new IllegalStateException("[EMFWorkbenchContextBase]" + EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextFactory_UI_0")); //$NON-NLS-1$ //$NON-NLS-2$
- if (!aProject.isAccessible())
- throw new IllegalStateException("[EMFWorkbenchContextBase]" + EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextFactory_UI_1", new Object[]{aProject.getName()})); //$NON-NLS-1$ //$NON-NLS-2$
- EMFWorkbenchContextBase context = getCachedEMFContext(aProject);
- if (context == null) {
- context = primCreateEMFContext(aProject);
- cacheEMFContext(aProject, context);
- if (contributor == null)
- initializeEMFContextFromContributors(aProject, context);
- }
- if (contributor != null && context != null)
- contributor.primaryContributeToContext(context);
- return context;
- }
-
- protected void initializeEMFContextFromContributors(IProject aProject, EMFWorkbenchContextBase emfContext) {
- if (aProject == null || emfContext == null)
- return;
- List runtimes = EMFNature.getRegisteredRuntimes(aProject);
- for (int i = 0; i < runtimes.size(); i++) {
- IProjectNature nature = (IProjectNature) runtimes.get(i);
- if (nature != null && CONTRIBUTOR_CLASS.isInstance(nature))
- ((IEMFContextContributor) nature).primaryContributeToContext(emfContext);
- }
- }
-
- protected boolean isNatureEnabled(IProject aProject, String natureId) {
- try {
- return aProject.isNatureEnabled(natureId);
- } catch (CoreException e) {
- return false;
- }
- }
-
- protected String[] getNatureIds(IProject aProject) {
- try {
- if (aProject.isAccessible())
- return aProject.getDescription().getNatureIds();
- } catch (CoreException e) {
- }
- return null;
- }
-
- protected IProjectNature getNature(IProject aProject, String natureId) {
- try {
- return aProject.getNature(natureId);
- } catch (CoreException e) {
- return null;
- }
- }
-
- protected EMFWorkbenchContextBase primCreateEMFContext(IProject aProject) {
- return new EMFWorkbenchContextBase(aProject);
- }
- /**
- * Return an existing EMFNature on <code>aProject</code>.
- */
- public EMFWorkbenchContextBase getEMFContext(IProject aProject) {
- return getCachedEMFContext(aProject);
- }
-
- public ResourceSetWorkbenchSynchronizer createSynchronizer(ResourceSet aResourceSet, IProject aProject) {
- return new ResourceSetWorkbenchSynchronizer(aResourceSet, aProject);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
deleted file mode 100644
index 3e8004f..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/ProjectResourceSetImpl.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ProjectResourceSetImpl.java,v $$
- * $$Revision: 1.4 $$ $$Date: 2005/01/26 18:45:51 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-public class ProjectResourceSetImpl extends ResourceSetImpl implements ProjectResourceSet {
- private boolean isReleasing = false;
- private IProject project;
- protected List resourceHandlers = new ArrayList();
- protected ResourceSetWorkbenchSynchronizer synchronizer;
- protected ProjectResourceSetImpl() {
- HashMap resourceMap = new HashMap(10);
- resourceMap.put(XMLResource.OPTION_USE_PARSER_POOL, EMFNature.SHARED_PARSER_POOL);
- loadOptions = resourceMap; // Tell it to cache uri->resource access.
- }
- public ProjectResourceSetImpl(IProject aProject) {
- this();
- setProject(aProject);
- initializeSharedCacheListener();
- }
- protected void initializeSharedCacheListener() {
- JEMUtilPlugin.getSharedCache().beginListening(this);
- }
- protected boolean isReleasing() {
- return isReleasing;
- }
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#delegatedGetResource(URI, boolean)
- */
- protected Resource delegatedGetResource(URI uri, boolean loadOnDemand) {
- Resource res = super.delegatedGetResource(uri, loadOnDemand);
- if (res == null)
- res = getResourceFromHandlers(uri);
- return res;
- }
- public Resource createResource(URI uri) {
- if (isReleasing) return null;
- //Check the map first when creating the resource and do not
- //normalize if a value is found.
- boolean isMapped = !(((URIConverterImpl.URIMap)getURIConverter().getURIMap()).getURI(uri).equals(uri));
- URI converted = uri;
- if (!isMapped)
- converted = getURIConverter().normalize(uri);
- Resource result = createResourceFromHandlers(converted);
- if (result == null)
- result = super.createResource(converted);
-
- return result;
- }
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceSetImpl#demandLoad(Resource)
- */
- protected void demandLoad(Resource resource) throws IOException {
- if (!isReleasing)
- super.demandLoad(resource);
- }
-
- /**
- * See if any resource handlers from the WorkbenchContext
- * decide to create the Resource in another manner.
- */
- protected Resource createResourceFromHandlers(URI uri) {
- Resource resource = null;
- ResourceHandler handler = null;
- for (int i = 0; i < resourceHandlers.size(); i++) {
- handler = (ResourceHandler) resourceHandlers.get(i);
- resource = handler.createResource(this, uri);
- if (resource != null)
- return resource;
- }
- return null;
- }
- /**
- * See if any resource handlers from the WorkbenchContext
- * can return a Resource from a <code>uri</code>.
- */
- protected Resource getResourceFromHandlers(URI uri) {
- if (isReleasing) return null;
- for (int i = 0; i < resourceHandlers.size(); i++) {
- Resource resource = ((ResourceHandler) resourceHandlers.get(i)).getResource(this, uri);
- if (resource != null)
- return resource;
- }
- return null;
- }
- public void release() {
- setIsReleasing(true);
- if (synchronizer != null)
- synchronizer.dispose();
- synchronizer = null;
- removeAndUnloadAllResources();
- resourceHandlers = null;
- eAdapters().clear();
- setProject(null);
- JEMUtilPlugin.getSharedCache().stopListening(this);
- }
- protected void removeAndUnloadAllResources() {
- boolean caughtException = false;
- if (getResources().isEmpty()) return;
- List list = new ArrayList(getResources());
- getResources().clear();
- Resource res;
- int size = list.size();
- for (int i = 0; i < size; i++) {
- res = (Resource) list.get(i);
- try {
- res.unload();
- } catch (RuntimeException ex) {
- Logger.getLogger().logError(ex);
- caughtException = true;
- }
- }
- if (caughtException)
- throw new RuntimeException("Exception(s) unloading resources - check log files"); //$NON-NLS-1$
- }
- protected void setIsReleasing(boolean aBoolean) {
- isReleasing = aBoolean;
- }
- /**
- * Gets the project.
- * @return Returns a IProject
- */
- public IProject getProject() {
- return project;
- }
- /**
- * Sets the project.
- * @param project The project to set
- */
- protected void setProject(IProject project) {
- this.project = project;
- }
- /*
- * Javadoc copied from interface.
- */
- public EObject getEObject(URI uri, boolean loadOnDemand) {
- if (isReleasing) return null;
- Resource resource = getResource(uri.trimFragment(), loadOnDemand);
- EObject result = null;
- if (resource != null && resource.isLoaded())
- result = resource.getEObject(uri.fragment());
- if (result == null)
- result = getEObjectFromHandlers(uri, loadOnDemand);
- return result;
- }
- /**
- * See if any resource handlers from the WorkbenchContext
- * can return a EObject from a <code>uri</code> after
- * failing to find it using the normal mechanisms.
- */
- protected EObject getEObjectFromHandlers(URI uri, boolean loadOnDemand) {
- EObject obj = null;
- ResourceHandler handler = null;
- for (int i = 0; i < resourceHandlers.size(); i++) {
- handler = (ResourceHandler) resourceHandlers.get(i);
- obj = handler.getEObjectFailed(this, uri, loadOnDemand);
- if (obj != null)
- return obj;
- }
- return null;
- }
-
- public boolean add(ResourceHandler resourceHandler) {
- return resourceHandlers.add(resourceHandler);
- }
- public void addFirst(ResourceHandler resourceHandler) {
- resourceHandlers.add(0, resourceHandler);
- }
- public boolean remove(ResourceHandler resourceHandler) {
- return resourceHandlers.remove(resourceHandler);
- }
- /**
- * Returns the synchronizer.
- * @return ResourceSetWorkbenchSynchronizer
- */
- public ResourceSetWorkbenchSynchronizer getSynchronizer() {
- return synchronizer;
- }
- /**
- * Sets the synchronizer.
- * @param synchronizer The synchronizer to set
- */
- public void setSynchronizer(ResourceSetWorkbenchSynchronizer synchronizer) {
- this.synchronizer = synchronizer;
- }
- /**
- * @see org.eclipse.emf.ecore.resource.ResourceSet#setResourceFactoryRegistry(Registry)
- */
- public void setResourceFactoryRegistry(Resource.Factory.Registry factoryReg) {
- if (resourceFactoryRegistry != null && factoryReg != null) {
- preserveEntries(factoryReg.getExtensionToFactoryMap(), resourceFactoryRegistry.getExtensionToFactoryMap());
- preserveEntries(factoryReg.getProtocolToFactoryMap(), resourceFactoryRegistry.getProtocolToFactoryMap());
- }
- super.setResourceFactoryRegistry(factoryReg);
- }
- /*
- * Preserve the entries from map2 in map1 if no collision.
- */
- protected void preserveEntries(Map map1, Map map2) {
- if (map2.isEmpty())
- return;
- Iterator it = map2.entrySet().iterator();
- Map.Entry entry;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- if (!map1.containsKey(entry.getKey()))
- map1.put(entry.getKey(), entry.getValue());
- }
- }
- /*
- * Javadoc copied from interface.
- */
- public Resource getResource(URI uri, boolean loadOnDemand) {
- if (isReleasing) return null;
- return super.getResource(uri, loadOnDemand);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.emf.workbench.ProjectResourceSet#resetNormalizedURICache()
- */
- public void resetNormalizedURICache() {
- if (getURIResourceMap() != null)
- getURIResourceMap().clear();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceHandler.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceHandler.java
deleted file mode 100644
index d240b62..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceHandler.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkspaceResourceHandler.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * The main purpose of this class is to redirect, if necessary, to another
- * ResourceSet. This class should be used in conjunction with the WorkbenchURIConverter
- * so that the URIs passed will use the platform protocol. Anything else will be considered
- * to be ambiguous and we will not be able to redirect.
- */
-public class WorkspaceResourceHandler implements ResourceHandler {
- /**
- * Constructor for WorkspaceResourceHandler.
- */
- public WorkspaceResourceHandler() {
- super();
- }
- /*
- * @see IResourceHandler#getResource(ResourceSet, URI)
- */
- public Resource getResource(ResourceSet originatingResourceSet, URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri))
- return getResourceForPlatformProtocol(originatingResourceSet, uri);
- URI mappedURI = ((URIConverterImpl.URIMap)originatingResourceSet.getURIConverter().getURIMap()).getURI(uri);
- if (isGlobalPluginLoad(mappedURI))
- return getResourceForPlatformPluginProtocol(originatingResourceSet, uri);
- return null;
- }
- /**
- * Redirect to the correct project based on the project name in the <code>uri</code>.
- * The <code>uri</code> will be in the following format: platform:/resource/[project name].
- */
- protected Resource createResourceForPlatformProtocol(ResourceSet originatingResourceSet, URI uri) {
- String projectName = uri.segment(1);
- IProject project = getProject(projectName);
- if (project != null && project.isAccessible()) {
- ResourceSet set = WorkbenchResourceHelperBase.getResourceSet(project);
- if (originatingResourceSet != set)
- return createResource(uri, set);
- }
- return null;
- }
- /**
- * Redirect to the correct project based on the project name in the <code>uri</code>.
- * The <code>uri</code> will be in the following format: platform:/resource/[project name].
- */
- protected Resource createResourceForPlatformPluginProtocol(ResourceSet originatingResourceSet, URI uri) {
-
- ResourceSet set = JEMUtilPlugin.getPluginResourceSet();
- return createResource(uri, set);
- }
- protected Resource createResource(URI uri, ResourceSet redirectedResourceSet) {
- return redirectedResourceSet.createResource(uri);
- }
- /**
- * Redirect to the correct project based on the first segment in the file name.
- * This is for compatability purposes for people using the platform:/resource protocol.
- */
- protected Resource getResourceForPlatformProtocol(ResourceSet originatingResourceSet, URI uri) {
- String projectName = uri.segment(1);
- IProject project = getProject(projectName);
- if (project != null && project.isAccessible()) {
- ResourceSet set = WorkbenchResourceHelperBase.getResourceSet(project);
- if (originatingResourceSet != set)
- return getResource(uri, set);
- }
- return null;
- }
- /**
- * Redirect to the correct project based on the first segment in the file name.
- * This is for compatability purposes for people using the platform:/resource protocol.
- */
- protected Resource getResourceForPlatformPluginProtocol(ResourceSet originatingResourceSet, URI uri) {
-
- ResourceSet set = JEMUtilPlugin.getPluginResourceSet();
- return getResource(uri, set);
-
- }
- protected Resource getResource(URI uri, ResourceSet redirectedResourceSet) {
- return redirectedResourceSet.getResource(uri, false);
- }
-
- protected IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
- protected IProject getProject(String projectName) {
- IWorkspace ws = getWorkspace();
- if (ws == null)
- return null;
- return ws.getRoot().getProject(projectName);
- }
- protected IProject getProject(ResourceSet resourceSet) {
- return WorkbenchResourceHelperBase.getProject(resourceSet);
- }
- /**
- * @see org.eclipse.jem.util.ResourceHandler#createResource(ResourceSet, URI)
- */
- public Resource createResource(ResourceSet originatingResourceSet, URI uri) {
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(uri))
- return createResourceForPlatformProtocol(originatingResourceSet, uri);
- URI mappedURI = ((URIConverterImpl.URIMap)originatingResourceSet.getURIConverter().getURIMap()).getURI(uri);
- if (isGlobalPluginLoad(mappedURI))
- return createResourceForPlatformPluginProtocol(originatingResourceSet, uri);
- return null;
- }
- /**
- * @see org.eclipse.jem.util.ResourceHandler#getEObjectFailed(ResourceSet, URI, boolean)
- * Subclasses may override.
- */
- public EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand) {
- return null;
- }
-
- protected boolean isGlobalPluginLoad(URI aURI) {
- if (WorkbenchResourceHelperBase.isPlatformPluginResourceURI(aURI)) {
- String[] globalPlugins = JEMUtilPlugin.getGlobalLoadingPluginNames();
- for (int i=0;i<globalPlugins.length;i++) {
- if (aURI.segment(1).startsWith(globalPlugins[i]))
- return true;
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceNotifier.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceNotifier.java
deleted file mode 100644
index fc8785e..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/WorkspaceResourceNotifier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkspaceResourceNotifier.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.notify.impl.NotifierImpl;
-
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-
-/**
- * This class is used to capture all ADD and REMOVE notifications from each ProjectResourceSet
- * and forward it on to any interrested listeners. This is to allow you to listen to one object
- * to gain all ADD and REMOVE notifications for each ResourceSet within the system.
- */
-public class WorkspaceResourceNotifier extends NotifierImpl {
- protected Adapter projectAdapter = new WorkspaceResourceCacheAdapter();
-
- class WorkspaceResourceCacheAdapter extends AdapterImpl {
- /**
- * Forward ADD and REMOVE notification.
- */
- public void notifyChanged(Notification msg) {
- switch (msg.getEventType()) {
- case Notification.ADD :
- case Notification.ADD_MANY :
- case Notification.REMOVE :
- case Notification.REMOVE_MANY :
- eNotify(msg);
- break;
- }
- }
- }
-
- /**
- * Constructor for WorkspaceResourceCache.
- */
- public WorkspaceResourceNotifier() {
- super();
- }
-
- /**
- * Begin listening to a ProjectResourceSet.
- */
- public void beginListening(ProjectResourceSet aResourceSet) {
- if (aResourceSet != null) {
- if (aResourceSet.eAdapters() == null ||
- !aResourceSet.eAdapters().contains(projectAdapter))
- aResourceSet.eAdapters().add(projectAdapter);
- }
- }
- /**
- * Stop listening to a ProjectResourceSet.
- */
- public void stopListening(ProjectResourceSet aResourceSet) {
- if (aResourceSet != null)
- aResourceSet.eAdapters().remove(projectAdapter);
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nature/EMFNatureRegistry.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nature/EMFNatureRegistry.java
deleted file mode 100644
index f29d2f8..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nature/EMFNatureRegistry.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFNatureRegistry.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench.nature;
-
-import java.util.HashSet;
-import java.util.Set;
-
-
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-public class EMFNatureRegistry {
-
- private static final String NATURE_REGISTRATION_POINT = "org.eclipse.jem.util.nature_registration"; //$NON-NLS-1$
- private static final String NATURE = "nature"; //$NON-NLS-1$
- private static final String STATIC_ID = "id"; //$NON-NLS-1$
-
- /**
- * Constructor
- */
- private EMFNatureRegistry() {
- super();
- readRegistry();
- }
-
- private static EMFNatureRegistry singleton;
-
- public final Set REGISTERED_NATURE_IDS = new HashSet();
-
- public static EMFNatureRegistry singleton() {
- if (singleton == null)
- singleton = new EMFNatureRegistry();
- return singleton;
- }
-
- protected void readRegistry() {
- // register Nature IDs for the J2EENatures
- IExtensionRegistry r = Platform.getExtensionRegistry();
- IConfigurationElement[] ce = r.getConfigurationElementsFor(NATURE_REGISTRATION_POINT);
- String natureId;
- for (int i=0; i<ce.length; i++) {
- if (ce[i].getName().equals(NATURE)) {
- natureId = ce[i].getAttribute(STATIC_ID);
- if (natureId != null)
- registerNatureID(natureId);
- }
- }
- }
-
- /**
- * @param natureId
- */
- private void registerNatureID(String natureId) {
- if (!REGISTERED_NATURE_IDS.contains(natureId))
- REGISTERED_NATURE_IDS.add(natureId);
- else
- Logger.getLogger().logError(EMFWorkbenchResourceHandler.getString("EMFNatureRegistry_ERROR_0", new Object[] {natureId})); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler.java
deleted file mode 100644
index 63ef3fe..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFWorkbenchResourceHandler.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.internal.util.emf.workbench.nls;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class EMFWorkbenchResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("emfworkbench");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle= getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- } else {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
-public static String getString(String key, Object[] args) {
-
- try {return MessageFormat.format(getString(key), args);}
- catch (IllegalArgumentException e) {return getString(key);}
-
-}
-public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/NotPresentPerformanceMonitor.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/NotPresentPerformanceMonitor.java
deleted file mode 100644
index 8c5bab0..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/NotPresentPerformanceMonitor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.jem.util;
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: NotPresentPerformanceMonitor.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/01/12 16:57:32 $$
- */
-/**
- * This is the instantiation to use if the performance monitor plugin is not installed. It basically does nothing.
- *
- * <p>
- * This class is not intended to be instantiated by clients.
- * </p>
- *
- * @since 1.0.0
- */
-public class NotPresentPerformanceMonitor extends PerformanceMonitorUtil {
-
- /*
- * Only instantiated from this package.
- */
- NotPresentPerformanceMonitor() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#setVar(java.lang.String)
- */
- public void setVar(String var) {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int, int)
- */
- protected void doSnapshot(int step, int types) {
- }
-
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int)
- */
- protected void doSnapshot(int step) {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
deleted file mode 100644
index e58a1a4..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PerformanceMonitorUtil.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: PerformanceMonitorUtil.java,v $
- * $Revision: 1.3 $ $Date: 2005/02/02 20:51:09 $
- */
-package org.eclipse.jem.util;
-import java.util.EventObject;
-
-import org.eclipse.perfmsr.core.IPerformanceMonitor;
-
-/**
- * This is a simplified wrapper to the IPerformanceMonitor that hides it so that the actual plugin can be optional and not required.
- *
- * <p>
- * This class is not meant to be subclassed by clients.
- * </p>
- *
- * @since 1.0.0
- */
-public abstract class PerformanceMonitorUtil {
- /**
- * Event for PerformanceListener notification.
- *
- * @since 1.1.0
- */
- public static class PerformanceEvent extends EventObject {
-
- PerformanceEvent(Object source, int step) {
- super(source);
- snapshowWithTypes = false;
- this.step = step;
- this.types = 0; // Not set.
- }
-
- PerformanceEvent(Object source, int step, int types) {
- super(source);
- snapshowWithTypes = true;
- this.step = step;
- this.types = types;
- }
-
-
- /**
- * Snapshot with types if <code>true</code>.
- * @since 1.1.0
- */
- public final boolean snapshowWithTypes;
-
- /**
- * Step of snapshot
- * @since 1.1.0
- */
- public final int step;
-
- /**
- * types of snapshot.
- * @since 1.1.0
- */
- public final int types;
- }
-
- /**
- * Performance Listener interface
- *
- * @since 1.1.0
- */
- public interface PerformanceListener {
- /**
- * Snapshot was called.
- * @param event
- *
- * @since 1.1.0
- */
- public void snapshot(PerformanceEvent event);
- }
-
- private PerformanceListener[] listeners;
-
- public interface Types {
-
- /**
- * 1 - Write out the performance counters from the operating system. These include working set, peak working set, elapsed time, user time, and
- * kernel time.
- */
- int OperatingSystemCounters = IPerformanceMonitor.Types.OperatingSystemCounters;
-
- /**
- * 2 - Write out the global performance info. This includes things like the total committed memory for the entire system.
- *
- * This function depends on the GetPerformanceInfo() function being available in the Windows psapi.dll. This is available in XP but is usually
- * not available in Win/2000. If it is not available then this function throws an UnsupportedOperationException.
- */
- int GlobalSystemCounters = IPerformanceMonitor.Types.GlobalSystemCounters;
-
- /**
- * 4 - Write out the size of the Java Heap.
- */
- int JavaHeapSize = IPerformanceMonitor.Types.JavaHeapSize;
-
- /**
- * 8 - Write out how much of the Java heap is being used. This calls the garbage collector so it may skew timing results.
- */
- int JavaHeapUsed = IPerformanceMonitor.Types.JavaHeapUsed;
-
- /**
- * 16 - The plugin startup and size information.
- */
- int PluginInfo = IPerformanceMonitor.Types.PluginInfo;
-
- /** 0xffff - Everything. */
- int All = IPerformanceMonitor.Types.All;
- }
-
- private static PerformanceMonitorUtil sharedMonitor;
-
- public static PerformanceMonitorUtil getMonitor() {
- if (sharedMonitor == null) {
- try {
- Class.forName("org.eclipse.perfmsr.core.PerfMsrCorePlugin"); // This just tests if the performance plugin is available. Throws
- // exception otherwise.
- Class presentClass = Class.forName("org.eclipse.jem.util.PresentPerformanceMonitor"); // Get the class we use wrapper it.
- sharedMonitor = (PerformanceMonitorUtil) presentClass.newInstance();
- if (!sharedMonitor.isValid())
- sharedMonitor = null;
- } catch (RuntimeException e) {
- // If any runtime exception, just use the not present one.
- } catch (ClassNotFoundException e) {
- // If class not found, then plugin not available, so just use the not present one.
- } catch (InstantiationException e) {
- // Problem instantiating, so just use the not present one.
- } catch (IllegalAccessException e) {
- // Some illegal access, so just use the not present one.
- }
- if (sharedMonitor == null) {
- // Couldn't get the performance one for some reason. Use not present one instead.
- sharedMonitor = new NotPresentPerformanceMonitor();
- }
- }
- return sharedMonitor;
- }
-
- protected boolean isValid() {
- return true;
- }
-
- /**
- * Set the variations that are in effect.
- *
- * @param var
- * a comma delimited string of variation numbers
- */
- public abstract void setVar(String var);
-
- /**
- * Take a snapshot of some default performance measurements.
- *
- * @param step
- * this identifies the step that the snapshot is for
- */
- public final void snapshot(int step) {
- doSnapshot(step);
- if (listeners != null)
- notifySnapshot(new PerformanceEvent(this, step));
- }
-
- private void notifySnapshot(PerformanceEvent event) {
- PerformanceListener[] list = listeners;
- for (int i = 0; i < list.length; i++) {
- list[i].snapshot(event);
- }
- }
-
- /**
- * Do the actual snapshot
- * @param step
- *
- * @see #snapshot(int)
- * @since 1.1.0
- */
- protected abstract void doSnapshot(int step);
-
- /**
- * Take a snapshot of the selected performance measurements.
- *
- * @param step
- * this identifies the step that the snapshot is for
- *
- * @param types
- * This controls which measurements are selected. It is an or'd together list of the IPerformanceMonitor.Types constants.
- *
- * @see IPerformanceMonitor.Types
- */
- public void snapshot(int step, int types) {
- doSnapshot(step, types);
- if (listeners != null)
- notifySnapshot(new PerformanceEvent(this, step, types));
- }
-
- /**
- * Do the actual snapshot
- * @param step
- *
- * @see #snapshot(int, int)
- * @since 1.1.0
- */
- protected abstract void doSnapshot(int step, int types);
-
- /**
- * Add listener to list.
- * @param listener
- *
- * @since 1.1.0
- */
- public void addPerformanceListener(PerformanceListener listener) {
- if (findListener(listener) != -1)
- return;
- PerformanceListener[] newList = new PerformanceListener[listeners != null ? listeners.length+1 : 1];
- if (listeners != null)
- System.arraycopy(listeners, 0, newList, 0, listeners.length);
- newList[newList.length-1] = listener;
- listeners = newList;
- }
-
- private int findListener(PerformanceListener listener) {
- if (listeners != null) {
- for (int i = 0; i < listeners.length; i++) {
- if (listeners[i] == listener)
- return i;
- }
- }
- return -1;
- }
-
- /**
- * Remove the listener from the list.
- * @param listener
- *
- * @since 1.1.0
- */
- public void removePerformanceListener(PerformanceListener listener) {
- int index = findListener(listener);
- if (index != -1) {
- if (listeners.length == 1) {
- listeners = null;
- return;
- }
- PerformanceListener[] newList = new PerformanceListener[listeners.length-1];
- System.arraycopy(listeners, 0, newList, 0, index);
- System.arraycopy(listeners, index+1, newList, index, newList.length-index);
- listeners = newList;
- }
- }
- /**
- * Upload the results to the server. This causes the file to be
- * closed, and the monitor to be placed into the finished state.
- *
- * This method can only be called if the uploadhost, uploadport and uploaduserid
- * have been configured before hand.
- *
- * @param description an optional description (it can be null)
- *
- */
- public boolean upload(String description){return false;}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PresentPerformanceMonitor.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PresentPerformanceMonitor.java
deleted file mode 100644
index 672977a..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/PresentPerformanceMonitor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: PresentPerformanceMonitor.java,v $
- * $Revision: 1.3 $ $Date: 2005/02/02 20:51:09 $
- */
-package org.eclipse.jem.util;
-import org.eclipse.perfmsr.core.IPerformanceMonitor;
-import org.eclipse.perfmsr.core.PerfMsrCorePlugin;
-
-/**
- * This is the version used when the performance plugin is available.
- *
- * <p>
- * This class is not meant to be instantiated by clients.
- * </p>
- *
- * @since 1.0.0
- */
-public class PresentPerformanceMonitor extends PerformanceMonitorUtil {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#upload(java.lang.String)
- */
- public boolean upload(String description) {
- return monitor.upload(description).success;
- }
-
- private IPerformanceMonitor monitor;
-
- /*
- * So that only instantiated by this package.
- */
- PresentPerformanceMonitor() {
- monitor = PerfMsrCorePlugin.getPerformanceMonitor(true);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#isValid()
- */
- protected boolean isValid() {
- return monitor != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#setVar(java.lang.String)
- */
- public void setVar(String var) {
- monitor.setVar(var);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int)
- */
- protected void doSnapshot(int step) {
- monitor.snapshot(step);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.util.PerformanceMonitorUtil#doSnapshot(int, int)
- */
- protected void doSnapshot(int step, int types) {
- monitor.snapshot(step, types);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
deleted file mode 100644
index 809b7aa..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: RegistryReader.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util;
-import org.eclipse.core.runtime.*;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Class to read a registry. It is meant to be subclassed to provide specific function.
- *
- * @since 1.0.0
- */
-public abstract class RegistryReader {
-
- String pluginId;
-
- String extensionPointId;
-
- private static Bundle systemBundle;
-
- /**
- * Utility method to get the plugin id of a configuation element
- *
- * @param configurationElement
- * @return plugin id of configuration element
- * @since 1.0.0
- */
- public static String getPluginId(IConfigurationElement configurationElement) {
- String pluginId = null;
-
- if (configurationElement != null) {
- IExtension extension = configurationElement.getDeclaringExtension();
-
- if (extension != null)
- pluginId = extension.getNamespace();
- }
-
- return pluginId;
- }
-
- /**
- * Constructor for RegistryReader taking a registry, plugin id, and extension point id.
- *
- * @param registry
- * @param pluginID
- * @param extensionPoint
- *
- * @deprecated Use RegistryReader(plugin, extensionPoint) instead. The registry passed in is ignored.
- * @since 1.0.0
- */
- public RegistryReader(IPluginRegistry registry, String pluginID, String extensionPoint) {
- this(pluginID, extensionPoint);
- }
-
- /**
- * Constructor for RegistryReader taking the plugin id and extension point id.
- *
- * @param pluginID
- * @param extensionPoint
- *
- * @since 1.0.0
- */
- public RegistryReader(String pluginID, String extensionPoint) {
- super();
- this.pluginId = pluginID;
- extensionPointId = extensionPoint;
- }
-
- private void internalReadElement(IConfigurationElement element) {
- boolean recognized = this.readElement(element);
- if (!recognized) {
- logError(element, "Error processing extension: " + element); //$NON-NLS-1$
- }
- }
-
- /*
- * Logs the error in the desktop log using the provided text and the information in the configuration element.
- */
- protected void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + extension.getNamespace() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- Logger.getLogger().logError(buf.toString());
- }
-
- /*
- * Logs a very common registry error when a required attribute is missing.
- */
- protected void logMissingAttribute(IConfigurationElement element, String attributeName) {
- logError(element, "Required attribute '" + attributeName + "' not defined"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /*
- * Implement this method to read element attributes. If this element has subelements, the reader will recursively cycle through them and call this
- * method so don't do it here.
- */
- public abstract boolean readElement(IConfigurationElement element);
-
- /**
- * Read the extension point and parse it.
- *
- * @since 1.0.0
- */
- public void readRegistry() {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(pluginId, extensionPointId);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- internalReadElement(elements[i]);
- }
- }
-
- /**
- * Tests to see if it is valid at this point in time to create an executable extension. A valid reason not to would be that the workspace is
- * shutting donw.
- *
- * @param element
- * @return <code>true</code> if it is valid point to create an executable extension.
- *
- * @since 1.0.0
- */
- public static boolean canCreateExecutableExtension(IConfigurationElement element) {
- if (Platform.isRunning() && getSystemBundle().getState() != Bundle.STOPPING)
- return true;
- return false;
- }
-
- /**
- * Get the system bundle
- *
- * @return system bundle.
- *
- * @since 1.0.0
- */
- protected static Bundle getSystemBundle() {
- if (systemBundle == null)
- systemBundle = Platform.getBundle("org.eclipse.osgi");
- return systemBundle;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
deleted file mode 100644
index 5aaf358..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/TimerTests.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: TimerTests.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/10 19:26:50 $
- */
-package org.eclipse.jem.util;
-
-import java.text.NumberFormat;
-import java.util.*;
-
-/**
- *
- * @since 1.0.2
- */
-public class TimerTests {
-
- /**
- * Default TimerTests class to use when not using your own. It's a global.
- */
- public static TimerTests basicTest = new TimerTests();
-
- public static final String CURRENT_PARENT_ID = "current parent";
- protected String currentParentId = null;
-
-
- protected static class TimerStep {
- static final int START = 0;
- static final int STOP = 1;
- static final int START_CUMULATIVE = 2;
- static final int STOP_CUMULATIVE = 3;
- static final int START_ACCUMULATING = 4;
- static final int STOP_ACCUMULATING = 5;
- protected String id;
- protected int type;
- protected long currentTime;
- protected int threadId;
-}
-
- protected boolean testOn = false;
- protected List steps;
-
- public synchronized boolean startStep(String id) {
- if (!testOn)
- return true;
-
- TimerStep step = createTimerStep(id, TimerStep.START);
- return step != null;
- }
-
- protected TimerStep createTimerStep(String id, int stepType) {
- TimerStep newStep = new TimerStep();
- newStep.threadId = Thread.currentThread().hashCode();
- newStep.id = id;
- newStep.type = stepType;
- newStep.currentTime = System.currentTimeMillis();
- steps.add(newStep);
-
- return newStep;
- }
-
- public synchronized boolean stopStep(String id) {
- if (!testOn)
- return true;
- TimerStep step = createTimerStep(id, TimerStep.STOP);
- return step != null;
- }
-
- public synchronized boolean startAccumulating(String id) {
- if (!testOn)
- return true;
-
- return createTimerStep(id, TimerStep.START_ACCUMULATING) != null;
- }
-
- public synchronized boolean stopAccumulating(String id) {
- if (!testOn)
- return true;
-
- return createTimerStep(id, TimerStep.STOP_ACCUMULATING) != null;
- }
- public synchronized boolean startCumulativeStep(String id) {
- if (!testOn)
- return true;
-
- return createTimerStep(id, TimerStep.START_CUMULATIVE) != null;
- }
-
- public synchronized boolean stopCumulativeStep(String id) {
- if (!testOn)
- return true;
- return createTimerStep(id, TimerStep.STOP_CUMULATIVE) != null;
- }
-
- /**
- * Clear the tests so that you can restart and do some more tests.
- *
- *
- * @since 1.0.2
- */
- public synchronized void clearTests() {
- if (!testOn)
- return;
- steps.clear();
- currentParentId = null;
- }
-
- /**
- * Turn this test on. If not turned on then all calls will quickly return with no errors. This allows the code to stay in place even when not
- * debugging.
- * <p>
- * When turned off, it will clear the test.
- *
- * @param on
- *
- * @since 1.0.2
- */
- public synchronized void testState(boolean on) {
- if (on == testOn)
- return;
- if (on) {
- testOn = true;
- if (steps == null)
- steps = new ArrayList();
- } else {
- testOn = false;
- steps = null;
- }
- currentParentId = null;
- }
- private static class CumulativeInformation {
- public TimerStep currentCumulativeStep;
- public long cumTime;
- public int cumCount;
- public long maxTime;
- public long minTime = Integer.MAX_VALUE;
- }
- public synchronized void printIt() {
- if (!testOn)
- return;
- if (steps == null)
- return;
- Map stepInfoByThreadId = new HashMap();
- Map indentsByThreadId = new HashMap();
- Map cumSteps;
- TimerStep prevStep = null;
- TimerStep startStep;
- NumberFormat percentFormatter = NumberFormat.getPercentInstance();
- double totalTime = 0;
- StringBuffer strb = new StringBuffer(150);
- if (steps.size() > 2){
- totalTime = ((TimerStep)steps.get(steps.size()-1)).currentTime - ((TimerStep)steps.get(0)).currentTime;
- }
- for (int i = 0; i < steps.size(); i++) {
- TimerStep step = (TimerStep) steps.get(i);
- Integer threadId = new Integer(step.threadId);
- switch (step.type) {
- case TimerStep.START:
- case TimerStep.STOP:
- Integer threadIndent = (Integer) indentsByThreadId.get(threadId);
- int indent = 0;
- if (step.type == TimerStep.START) {
- if (threadIndent != null)
- indent = threadIndent.intValue() + 1;
- indentsByThreadId.put(threadId, new Integer(indent));
- } else {
- if (threadIndent != null)
- indent = threadIndent.intValue();
- if (indent > 0)
- indentsByThreadId.put(threadId, new Integer(indent - 1));
- else {
- indentsByThreadId.remove(threadId);
- indent = 0;
- }
- }
- strb.setLength(0);
- strb.append(step.currentTime);
- strb.append("\t");
- for (int j = 0; j < indent; j++) {
- strb.append(" ");
- }
- switch (step.type) {
- case TimerStep.START:
- strb.append("Start");
- break;
-
- case TimerStep.STOP:
- strb.append("Stop ");
- break;
- default:
- break;
- }
- ;
- strb.append(" \"");
- strb.append(step.id);
- strb.append("\" id(");
- strb.append(step.threadId);
- strb.append(")");
- Map startSteps = (Map) stepInfoByThreadId.get(threadId);
- if (startSteps == null)
- stepInfoByThreadId.put(threadId, startSteps = new HashMap());
- if (step.type == TimerStep.START) {
- // Store the start step for later lookup when calulating the total time
- startSteps.put(step.id, step);
- } else {
- // This is the stop time for a step. We need to find
- // the corresponding start time and calculate the total time.
- Object item = startSteps.remove(step.id);
- if (item instanceof TimerStep) {
- startStep = (TimerStep) item;
- if (startStep != null) {
- int addchars = 100 - strb.length();
- for (int j = 0; j < addchars; j++) {
- strb.append(" ");
- }
- long delta = step.currentTime - startStep.currentTime;
- strb.append(" Total = " + delta + " ms");
- if (totalTime > 0)
- strb.append(" " + percentFormatter.format(delta/totalTime));
- }
- } else
- strb.append(" ---> Couldn't find Starting point for \"" + step.id + "\"");
- }
- if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --");
- prevStep = step;
- System.out.println(strb);
- break;
-
- case TimerStep.START_ACCUMULATING:
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps == null)
- stepInfoByThreadId.put(threadId, cumSteps = new HashMap());
- cumSteps.put(step.id, new CumulativeInformation());
- threadIndent = (Integer) indentsByThreadId.get(threadId);
- indent = 0;
- if (threadIndent != null)
- indent = threadIndent.intValue();
- strb.setLength(0);
- strb.append(step.currentTime);
- strb.append("\t");
- for (int j = 0; j < indent; j++) {
- strb.append(" ");
- }
- strb.append("Start Accumulating");
- strb.append(" \"");
- strb.append(step.id);
- strb.append("\" id(");
- strb.append(step.threadId);
- strb.append(")");
- if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --");
- prevStep = step;
- System.out.println(strb);
- break;
-
- case TimerStep.START_CUMULATIVE:
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps != null) {
- Object info = cumSteps.get(step.id);
- if (info instanceof CumulativeInformation)
- ((CumulativeInformation) info).currentCumulativeStep = step;
- }
- break;
-
- case TimerStep.STOP_CUMULATIVE:
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps != null) {
- Object info = cumSteps.get(step.id);
- if (info instanceof CumulativeInformation) {
- CumulativeInformation cumInfo = (CumulativeInformation) info;
- if (cumInfo.currentCumulativeStep != null) {
- cumInfo.cumCount++;
- long delta = step.currentTime - cumInfo.currentCumulativeStep.currentTime;
- cumInfo.cumTime += delta;
- if (cumInfo.maxTime < delta)
- cumInfo.maxTime = delta;
- if (delta < cumInfo.minTime)
- cumInfo.minTime = delta;
- }
- }
- }
- break;
-
- case TimerStep.STOP_ACCUMULATING:
- threadIndent = (Integer) indentsByThreadId.get(threadId);
- indent = 0;
- if (threadIndent != null)
- indent = threadIndent.intValue();
- strb.setLength(0);
- strb.append(step.currentTime);
- strb.append("\t");
- for (int j = 0; j < indent; j++) {
- strb.append(" ");
- }
- strb.append("Stop Accumulating");
- strb.append(" \"");
- strb.append(step.id);
- strb.append("\" id(");
- strb.append(step.threadId);
- strb.append(")");
- cumSteps = (Map) stepInfoByThreadId.get(threadId);
- if (cumSteps != null) {
- Object info = cumSteps.get(step.id);
- if (info instanceof CumulativeInformation) {
- CumulativeInformation cumInfo = (CumulativeInformation) info;
- if (cumInfo.currentCumulativeStep != null) {
- strb.append(" cumulative time=");
- strb.append(cumInfo.cumTime);
- strb.append(" cumulative count=");
- strb.append(cumInfo.cumCount);
- strb.append(" max time=");
- strb.append(cumInfo.maxTime);
- strb.append(" min time=");
- strb.append(cumInfo.minTime);
- strb.append(" avg time=");
- Double cumT = new Double(cumInfo.cumTime);
- Double cumC = new Double(cumInfo.cumCount);
- strb.append(cumT.doubleValue()/cumC.doubleValue());
- }
- }
- }
- if (i > 0 && (step.currentTime - prevStep.currentTime) > 0)
- System.out.println("-- " + (step.currentTime - prevStep.currentTime) + " ms --");
- prevStep = step;
- System.out.println(strb);
- break;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
deleted file mode 100644
index 3c42fe8..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UIContextDetermination.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: UIContextDetermination.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Static utility class for UIContext determination.
- *
- * @since 1.0.0
- */
-public class UIContextDetermination {
-
- private static final int UNKNOWN = 100;
-
- public static final String HEADLESS_CONTEXT_LITERAL = "Headless";
-
- public static final String UI_CONTEXT_LITERAL = "UI";
-
- public static final int HEADLESS_CONTEXT = 102;
-
- public static final int UI_CONTEXT = 100;
-
- private static Map cachedExtensions = null;
-
- private static int currentContext = UNKNOWN;
-
- private UIContextDetermination() {
- }
-
- /**
- * Returns an instance of a given class based on the UI or Headless context.
- *
- * @param key
- * @return new class instance for the given key.
- * @throws IllegalArgumentException
- * If the key is invalid (e.g. no extension is found for the key)
- */
- public static Object createInstance(String key) {
- Object result = null;
- if (cachedExtensions == null)
- initExtensions();
- IConfigurationElement contextSensitiveClass = (IConfigurationElement) cachedExtensions.get(key);
- try {
- if (contextSensitiveClass != null)
- result = contextSensitiveClass
- .createExecutableExtension(UIContextDeterminationRegistryReader.UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR);
- } catch (CoreException e) {
- Logger.getLogger().logError("Problem loading extension not found for key \"" + key + "\".");
- Logger.getLogger().logError(e);
- }
- if (result == null)
- Logger.getLogger().logError("Extension not found for key \"" + key + "\".");
- return result;
- }
-
- /**
- * Returns the current context -- determines the value if necessary.
- *
- * @return current context
- * @see #HEADLESS_CONTEXT
- * @see #UI_CONTEXT
- */
- public static int getCurrentContext() {
- if (currentContext == UNKNOWN) {
- currentContext = HEADLESS_CONTEXT;
- new UITesterRegistryReader().readRegistry();
- }
- return currentContext;
- }
-
- /*
- * Invokes the UIContextDeterminationRegistryReader to cache all of the extensions, if necessary.
- *
- */
- private static void initExtensions() {
- if (cachedExtensions == null) {
- cachedExtensions = new HashMap();
- new UIContextDeterminationRegistryReader().readRegistry();
- }
- }
-
- /*
- * Converts the input to one of UI_CONTEXT or HEADLESS_CONTEXT. Defaults to HEADLESS on invalid input
- *
- * @param literal @return
- */
- private static int convertLiteral(String literal) {
- return (UI_CONTEXT_LITERAL.equals(literal)) ? UI_CONTEXT : HEADLESS_CONTEXT;
- }
-
- /*
- * Reads the registration of UI Context-sensitive class extensions and initializes the cache of the UIContextDetermination object.
- *
- * @author mdelder
- */
- private static class UIContextDeterminationRegistryReader extends RegistryReader {
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_ELEMENT = "uiContextSensitiveClass";
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_KEY_ATTR = "key";
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_CLASSNAME_ATTR = "className";
-
- public static final String UI_CONTEXT_SENSTIVE_CLASS_CONTEXT_ATTR = "context";
-
- public UIContextDeterminationRegistryReader() {
- super(JEMUtilPlugin.PLUGIN_ID, JEMUtilPlugin.UI_CONTEXT_EXTENSION_POINT);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- boolean result = false;
- if (element.getName().equals(UI_CONTEXT_SENSTIVE_CLASS_ELEMENT)) {
-
- String key = element.getAttribute(UI_CONTEXT_SENSTIVE_CLASS_KEY_ATTR);
- String context = element.getAttribute(UI_CONTEXT_SENSTIVE_CLASS_CONTEXT_ATTR);
-
- if (!cachedExtensions.containsKey(key) || getCurrentContext() == convertLiteral(context))
- cachedExtensions.put(key, element);
- result = true;
- }
- return result;
- }
- }
-
- /*
- * Reads the uiTester extension and instantiate the any of the UITester classes it finds.
- *
- * The implementation has the side effect that if multiple UITesters are registered, any of them can trip the currentContext into the UI_CONTEXT
- * state.
- *
- * @author mdelder
- */
- private static class UITesterRegistryReader extends RegistryReader {
-
- public static final String UI_TESTER_ELEMENT = "uiTester"; //$NON-NLS-1$
-
- public static final String UI_TESTER_CLASSNAME_ATTR = "className"; //$NON-NLS-1$
-
- public UITesterRegistryReader() {
- super(JEMUtilPlugin.PLUGIN_ID, JEMUtilPlugin.UI_TESTER_EXTENSION_POINT);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf.workbench.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- boolean result = false;
- if (element.getName().equals(UI_TESTER_ELEMENT)) {
- result = true;
- try {
- if (canCreateExecutableExtension(element)) {
- UITester tester = (UITester) element.createExecutableExtension(UI_TESTER_CLASSNAME_ATTR);
- if (tester.isCurrentContextUI())
- currentContext = UI_CONTEXT;
- }
- } catch (Throwable t) {
- Logger.getLogger().log("UIContextDetermination is proceeding in HEADLESS mode"); //$NON-NLS-1$
- }
- }
- return result;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UITester.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UITester.java
deleted file mode 100644
index 06486f7..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/UITester.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jem.util;
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: UITester.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-/**
- * Interface for a UITester. The "classname" attribute on the "uiTester" extension point should implement this class.
- *
- * @since 1.0.0
- */
-public interface UITester {
-
- /**
- * Answer if the current context is an UI context.
- *
- * @return <code>true</code> if an UI context.
- *
- * @since 1.0.0
- */
- public boolean isCurrentContextUI();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/EMFWorkbenchContextBase.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/EMFWorkbenchContextBase.java
deleted file mode 100644
index 7228847..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/EMFWorkbenchContextBase.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFWorkbenchContextBase.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.jem.internal.util.emf.workbench.*;
-import org.eclipse.jem.internal.util.emf.workbench.nls.EMFWorkbenchResourceHandler;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * ContextBase for EMFWorkbench.
- *
- * <p>
- * This is meant to be subclassed as needed for additional or override function. It will be instantiated by default.
- * </p>
- *
- * @since 1.0.0
- */
-public class EMFWorkbenchContextBase {
-
- protected IProject project;
-
- protected ProjectResourceSet resourceSet;
-
- /**
- * Construct with a project.
- *
- * @param aProject
- *
- * @since 1.0.0
- */
- public EMFWorkbenchContextBase(IProject aProject) {
- if (aProject == null)
- throw new IllegalArgumentException(EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextBase_ERROR_1")); //$NON-NLS-1$
- project = aProject;
- }
-
- /**
- * Dispose of the context base.
- *
- *
- * @since 1.0.0
- */
- public void dispose() {
- if (resourceSet != null)
- resourceSet.release();
- resourceSet = null;
- project = null;
- }
-
- /**
- * Get the project this context is associated with.
- *
- * @return project
- *
- * @since 1.0.0
- */
- public IProject getProject() {
- return project;
- }
-
- /**
- * Return the resource set (creating if needed) for context.
- *
- * @return resource set
- *
- * @since 1.0.0
- */
- public ProjectResourceSet getResourceSet() {
- if (resourceSet == null) {
- resourceSet = createResourceSet();
- initializeResourceSet(resourceSet);
- }
- return resourceSet;
- }
-
- /**
- * Used for optimization; answer whether a resourceSet has been created
- *
- * @return <code>true</code> if a resource set has been created.
- *
- * @since 1.0.0
- */
- public boolean hasResourceSet() {
- return resourceSet != null;
- }
-
- /**
- * Initialize the resource set.
- *
- * @param aResourceSet
- *
- * @since 1.0.0
- */
- protected void initializeResourceSet(ProjectResourceSet aResourceSet) {
- createResourceSetSynchronizer(aResourceSet);
- aResourceSet.setURIConverter(createURIConverter(aResourceSet));
- aResourceSet.add(new WorkspaceResourceHandler());
- JEMUtilPlugin.getDefault().addExtendedResourceHandlers(aResourceSet);
-
- }
-
- /**
- * Create the resource set. By default it is a ProjectResourceSetImpl.
- *
- * @return project's new resource set.
- *
- * @since 1.0.0
- */
- protected ProjectResourceSet createResourceSet() {
- if (project == null)
- throw new IllegalStateException(EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextBase_ERROR_2")); //$NON-NLS-1$
- return new ProjectResourceSetImpl(project);
- }
-
- /**
- * Create a URIConverter for the resource set.
- *
- * @param aResourceSet
- * @return a uri converter.
- *
- * @since 1.0.0
- */
- protected WorkbenchURIConverter createURIConverter(ProjectResourceSet aResourceSet) {
- return new WorkbenchURIConverterImpl(getProject(), aResourceSet.getSynchronizer());
- }
-
- /**
- * Create a resource set workbench synchronizer.
- *
- * @param aResourceSet
- * @return a resource set workbench synchronizer.
- *
- * @since 1.0.0
- */
- protected ResourceSetWorkbenchSynchronizer createResourceSetSynchronizer(ProjectResourceSet aResourceSet) {
- return EMFWorkbenchContextFactory.INSTANCE.createSynchronizer(aResourceSet, getProject());
- }
-
- /**
- * Delete the resource from the workspace.
- *
- * @param aResource
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public void deleteResource(Resource aResource) throws CoreException {
- if (aResource != null)
- deleteFile(aResource);
- }
-
- /**
- * Delete the file associated with the resource.
- *
- * @param resource
- *
- * @since 1.0.0
- */
- public void deleteFile(Resource resource) {
- throw new UnsupportedOperationException(EMFWorkbenchResourceHandler.getString("EMFWorkbenchContextBase_ERROR_0")); //$NON-NLS-1$
- }
-
- /**
- * Get resource (with the given URI) from the project resource set. Load it if not already loaded.
- *
- * @param uri
- * @return resource for the uri, or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public Resource getResource(URI uri) {
- return this.resourceSet.getResource(uri, true);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/IEMFContextContributor.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/IEMFContextContributor.java
deleted file mode 100644
index 7d92876..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/IEMFContextContributor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: IEMFContextContributor.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-
-package org.eclipse.jem.util.emf.workbench;
-
-/**
- * EMF Context Contributor interface. Implimenters are called to contribute to the context.
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase#createEMFContext(IProject, IEMFContextContributor)
- * @since 1.0.0
- */
-public interface IEMFContextContributor {
-
- /**
- * This is your opportunity to add a primary EMFNature. Typically you would add to the WorkbenchContext held by <code>aNature</code> in order to
- * change the container for the WorkbenchURIConverter or add adapter factories to the ResourceSet or anything else that is needed.
- *
- * @param aNature
- *
- * @since 1.0.0
- */
- void primaryContributeToContext(EMFWorkbenchContextBase aNature);
-
- /**
- * This is your opportunity to add a secondary EMFNature. Typically you would add to the WorkbenchContext held by <code>aNature</code> in order
- * to change the container for the WorkbenchURIConverter or add adapter factories to the ResourceSet or anything else that is needed.
- *
- * @param aNature
- *
- * @since 1.0.0
- */
- void secondaryContributeToContext(EMFWorkbenchContextBase aNature);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ISynchronizerExtender.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ISynchronizerExtender.java
deleted file mode 100644
index 6a56aae..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ISynchronizerExtender.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ISynchronizerExtender.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.core.resources.IResourceDelta;
-
-/**
- * Implimenters allows clients, eg {@link org.eclipse.jem.util.emf.workbench.EMFNatureContributor}, to extend the behavior of the
- * ResourceSetWorkbenchSynchronizer.
- *
- * @see org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer#addExtender(ISynchronizerExtender)
- * @since 1.0.0
- */
-public interface ISynchronizerExtender {
-
- /**
- * Notification that project has changed.
- *
- * @param delta
- *
- * @since 1.0.0
- */
- void projectChanged(IResourceDelta delta);
-
- /**
- * Notification that project has been closed.
- *
- *
- * @since 1.0.0
- */
- void projectClosed();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/JavaProjectUtilities.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/JavaProjectUtilities.java
deleted file mode 100644
index cf7d222..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/JavaProjectUtilities.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: JavaProjectUtilities.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/12 17:40:55 $
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.core.JavaModel;
-import org.eclipse.jdt.internal.core.JavaModelManager;
-
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Project utilities that are Java (JDT) specific. This class should be
- * referenced only if the JDT is installed, otherwise you will get
- * class definition not found errors. This is because JDT is optional
- * for thie org.eclipse.jem.util bundle.
- * @since 1.1.0
- */
-public class JavaProjectUtilities extends ProjectUtilities {
-
- public JavaProjectUtilities() {
- super();
- }
-
- /**
- * Get the java project nature for the given project.
- *
- * @param p
- * project
- * @return the java project nature for the project or <code>null</code> if not a java project.
- *
- * @since 1.0.0
- */
- public static IJavaProject getJavaProject(IProject p) {
- try {
- return (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- return null;
- }
- }
-
- /**
- * Touch classpath. It simply takes the classpath and sets it back in.
- *
- * @param javaProject
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void updateClasspath(IJavaProject javaProject) throws JavaModelException {
- if (javaProject != null)
- javaProject.setRawClasspath(javaProject.getRawClasspath(), new NullProgressMonitor());
- }
-
- /**
- * Return the location of the binary output files for the JavaProject.
- *
- * @param p
- * project
- * @return path to binary output folder or <code>null</code> if not java project or other problem.
- *
- * @since 1.0.0
- */
- public static IPath getJavaProjectOutputLocation(IProject p) {
- try {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- if (!javaProj.isOpen())
- javaProj.open(null);
- return javaProj.getOutputLocation();
- } catch (JavaModelException e) {
- return null;
- }
- }
-
- /**
- * Get the project's binary output container.
- *
- * @param p
- * project
- * @return project's output container or <code>null</code> if not java project or some other error.
- *
- * @since 1.0.0
- */
- public static IContainer getJavaProjectOutputContainer(IProject p) {
- IPath path = getJavaProjectOutputLocation(p);
- if (path == null)
- return null;
- if (path.segmentCount() == 1)
- return p;
- return p.getFolder(path.removeFirstSegments(1));
- }
-
- /**
- * Get the binary output absolute (local file system) path.
- *
- * @param p
- * project
- * @return project's output path or <code>null</code> if not java project or some other error.
- *
- * @since 1.0.0
- */
- public static IPath getJavaProjectOutputAbsoluteLocation(IProject p) {
- IContainer container = getJavaProjectOutputContainer(p);
- if (container != null)
- return container.getLocation();
- return null;
- }
-
- /**
- * Get the JDT JavaModel.
- *
- * @return JDT's JavaModel
- *
- * @since 1.0.0
- */
- public static JavaModel getJavaModel() {
- return JavaModelManager.getJavaModelManager().getJavaModel();
- }
-
- /**
- * Get all source package fragment roots.
- *
- * @param javaProj
- * @return source package fragment roots
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static List getSourcePackageFragmentRoots(IJavaProject javaProj) throws JavaModelException {
- List result = new ArrayList();
- IPackageFragmentRoot[] roots = javaProj.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- if (root.getKind() == IPackageFragmentRoot.K_SOURCE)
- result.add(result);
- }
- return result;
- }
-
- /**
- * Remove the resource from the classpath
- *
- * @param p
- * project
- * @param res
- * resource
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, IResource res) throws JavaModelException {
- IClasspathEntry entry = JavaCore.newLibraryEntry(res.getFullPath(), null, null);
- removeFromJavaClassPath(p, entry);
- }
-
- /**
- * Remove the path from the classpath
- *
- * @param p
- * project
- * @param path
- * path to remove
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, IPath path) throws JavaModelException {
- org.eclipse.core.resources.IFile f = p.getFile(path);
- removeFromJavaClassPath(p, f);
- }
-
- /**
- * Remove the classpath entry from the project's classpath.
- *
- * @param p
- * @param entry
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, IClasspathEntry entry) throws JavaModelException {
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- }
- if (javaProject != null) {
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- javaProject.setRawClasspath(primRemoveFromJavaClassPath(classpath, entry), new NullProgressMonitor());
- }
- }
-
- /**
- * Remove the list of entries from the classpath of the project.
- *
- * @param p
- * project
- * @param entries
- * list of IClassPathEntry's
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, List entries) throws JavaModelException {
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- }
- if (javaProject != null) {
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- javaProject.setRawClasspath(primRemoveFromJavaClassPath(classpath, entries), new NullProgressMonitor());
- }
- }
-
- protected static IClasspathEntry[] primRemoveFromJavaClassPath(IClasspathEntry[] classpath, IClasspathEntry entry) throws JavaModelException {
- List result = new ArrayList();
- boolean didRemove = false;
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry cpEntry = classpath[i];
- if (!entry.getPath().equals(classpath[i].getPath()))
- result.add(cpEntry);
- else
- didRemove = true;
- }
- if (!didRemove)
- return classpath;
- return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
- }
-
- protected static IClasspathEntry[] primRemoveFromJavaClassPath(IClasspathEntry[] classpath, List entries) throws JavaModelException {
- List arrayList = Arrays.asList(classpath);
- List removeable = new ArrayList(arrayList);
- IClasspathEntry entry;
- boolean didRemove = false;
- int size = entries.size();
- for (int i = 0; i < size; i++) {
- entry = (IClasspathEntry) entries.get(i);
- for (int j = 0; j < classpath.length; j++) {
- IClasspathEntry cpEntry = classpath[j];
- if (entry.getPath().equals(classpath[j].getPath())) {
- if (removeable.remove(cpEntry))
- didRemove = true;
- }
- }
- }
- if (!didRemove)
- return classpath;
- return (IClasspathEntry[]) removeable.toArray(new IClasspathEntry[removeable.size()]);
- }
-
- /**
- * Get the classpath as an array or URL's.
- *
- * @param javaProject
- * @return array of URL's or <code>null</code> if javaProject was <code>null</code>.
- *
- * @since 1.0.0
- */
- public static URL[] getClasspathAsURLArray(IJavaProject javaProject) {
- if (javaProject == null)
- return null;
- Set visited = new HashSet();
- List urls = new ArrayList(20);
- collectClasspathURLs(javaProject, urls, visited, true);
- URL[] result = new URL[urls.size()];
- urls.toArray(result);
- return result;
- }
-
- private static void collectClasspathURLs(IJavaProject javaProject, List urls, Set visited, boolean isFirstProject) {
- if (visited.contains(javaProject))
- return;
- visited.add(javaProject);
- IPath outPath = getJavaProjectOutputAbsoluteLocation(javaProject.getProject());
- outPath = outPath.addTrailingSeparator();
- URL out = ProjectUtilities.createFileURL(outPath);
- urls.add(out);
- IClasspathEntry[] entries = null;
- try {
- entries = javaProject.getResolvedClasspath(true);
- } catch (JavaModelException e) {
- return;
- }
- IClasspathEntry entry;
- for (int i = 0; i < entries.length; i++) {
- entry = entries[i];
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY:
- case IClasspathEntry.CPE_CONTAINER:
- case IClasspathEntry.CPE_VARIABLE:
- collectClasspathEntryURL(entry, urls);
- break;
- case IClasspathEntry.CPE_PROJECT: {
- if (isFirstProject || entry.isExported())
- collectClasspathURLs(getJavaProject(entry), urls, visited, false);
- break;
- }
- }
- }
- }
-
- private static void collectClasspathEntryURL(IClasspathEntry entry, List urls) {
- URL url = ProjectUtilities.createFileURL(entry.getPath());
- if (url != null)
- urls.add(url);
- }
-
- private static IJavaProject getJavaProject(IClasspathEntry entry) {
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(entry.getPath().segment(0));
- if (proj != null)
- return getJavaProject(proj);
- return null;
- }
-
- /**
- * Is this project a binary project.
- * <p>
- * Typically a Java project is considered binary if it does not have a source entry in the classpath.
- *
- * @param project
- * Project to test
- * @return <code>true</code> if project is a binary project.
- */
- public static boolean isBinaryProject(IProject aProject) {
-
- IJavaProject javaProj = getJavaProject(aProject);
- if (javaProj == null)
- return false;
- IClasspathEntry[] entries = null;
- try {
- entries = javaProj.getRawClasspath();
- } catch (JavaModelException jme) {
- return false;
- }
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE)
- return false;
- }
- return true;
- }
-
- /**
- * Append to java class path.
- * <p>
- * Append a list of IClasspathEntry's to the build path of the passed project. Updated to remove existing occurrences of the passed entries before
- * appending.
- * </p>
- *
- * @param p
- * project
- * @param appendClasspathEntries
- * list of entries
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void appendJavaClassPath(IProject p, List appendClasspathEntries) throws JavaModelException {
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- }
- if (javaProject != null) {
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- List newPathList = new ArrayList(classpath.length);
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry entry = classpath[i];
- // Skip entries which are in the append list
- if (appendClasspathEntries.indexOf(entry) < 0)
- newPathList.add(entry);
- }
- newPathList.addAll(appendClasspathEntries);
- IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
- javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
- }
- }
-
- /**
- * Append classpath entry.
- * <p>
- * Append one IClasspathEntry to the build path of the passed project. If a classpath entry having the same path as the parameter already exists,
- * then does nothing.
- * </p>
- *
- * @param p
- * Project
- * @param newEntry
- * Entry
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void appendJavaClassPath(IProject p, IClasspathEntry newEntry) throws JavaModelException {
- IJavaProject javaProject = getJavaProject(p);
- if (javaProject == null)
- return;
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- List newPathList = new ArrayList(classpath.length);
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry entry = classpath[i];
- // fix dup class path entry for .JETEmitter project
- // Skip the entry to be added if it already exists
- if (Platform.getOS().equals(Platform.OS_WIN32)) {
- if (!entry.getPath().toString().equalsIgnoreCase(newEntry.getPath().toString()))
- newPathList.add(entry);
- else
- return;
- } else {
- if (!entry.getPath().equals(newEntry.getPath()))
- newPathList.add(entry);
- else
- return;
- }
- }
- newPathList.add(newEntry);
- IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
- javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
- }
-
- /**
- * Return the source path matching the parameter; if the parameter is null, or if the source folder is not on the classpath, return the first
- * source path on the classpath
- *
- * @param p
- * project
- * @param defaultSourceName
- * source folder to find if on classpath, or if <code>null</code> the first folder
- * @return path searched for or <code>null</code> if not java project or some other problem.
- *
- * @since 1.0.0
- */
- public static IPath getSourcePathOrFirst(IProject p, String defaultSourceName) {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- IClasspathEntry firstSource = null;
- IPath defaultSourcePath = null;
- if (defaultSourceName != null)
- defaultSourcePath = ProjectUtilities.createPath(p, defaultSourceName);
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- if (firstSource == null) {
- firstSource = cp[i];
- if (defaultSourcePath == null)
- break;
- }
- if (cp[i].getPath().equals(defaultSourcePath))
- return defaultSourcePath.removeFirstSegments(1);
- }
- }
- if (firstSource == null)
- return null;
- if (firstSource.getPath().segment(0).equals(p.getName()))
- return firstSource.getPath().removeFirstSegments(1);
- return null;
- }
-
- protected static List getSourcePaths(IProject p) {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- List sourcePaths = new ArrayList();
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- sourcePaths.add(cp[i].getPath().removeFirstSegments(1));
- }
- }
- return sourcePaths;
- }
-
- /**
- * Hack to force a reload of the .classpath file
- *
- * @param project
- * project to reload
- * @since 1.0.0
- */
- public static void forceClasspathReload(IProject project) throws JavaModelException {
- IJavaProject javaProj = getJavaProject(project);
- if (javaProj != null) {
- IClasspathEntry[] entries = javaProj.readRawClasspath();
- if (entries != null) {
- IPath output = javaProj.readOutputLocation();
- if (output != null)
- javaProj.setRawClasspath(entries, output, null);
- }
- }
- }
-
- /**
- * Get the paths of all of the local jars in the classpath for the project. It does not recurse into referenced projects.
- *
- * @param proj
- * project to search (should be a java project).
- * @return A list of IPath, where each entry is a project relative path to a JAR contained in the project.
- */
- public static List getLocalJARPathsFromClasspath(IProject proj) {
- IJavaProject javaProj = getJavaProject(proj);
- if (javaProj == null)
- return null;
- IPath projectPath = proj.getFullPath();
- List result = new ArrayList();
- try {
- IClasspathEntry[] entries = javaProj.getRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IPath path = entry.getPath();
- int segments = path.matchingFirstSegments(projectPath);
- if (segments > 0)
- result.add(path.removeFirstSegments(segments));
- }
- }
- } catch (JavaModelException e) {
- JEMUtilPlugin.getLogger().logError(e);
- }
- return result;
- }
-
- /*
- * return list of path that may contain classes
- */
- protected static List getlibraryPaths(IProject p) {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- List libraryPaths = new ArrayList();
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- libraryPaths.add(cp[i].getPath().removeFirstSegments(1));
- }
- }
- return libraryPaths;
- }
-
- /**
- * Return the source folder matching the parameter; if the parameter is null, or if the source folder is not on the classpath, return the first
- * source folder on the classpath
- *
- * @param p
- * project
- * @param defaultSourceName
- * source folder to find if on classpath, or if <code>null</code> the first folder
- * @return container searched for or <code>null</code> if not java project or some other problem.
- *
- * @since 1.0.0
- */
- public static IContainer getSourceFolderOrFirst(IProject p, String defaultSourceName) {
- try {
- IPath sourcePath = getSourcePathOrFirst(p, defaultSourceName);
- if (sourcePath == null)
- return null;
- else if (sourcePath.isEmpty())
- return p;
- else
- return p.getFolder(sourcePath);
- } catch (IllegalArgumentException ex) {
- return null;
- }
- }
-
- /**
- * Returns a list of IFolder that represents each source folder in a java project
- *
- * @deprecated Use {@link #getSourceContainers(IProject)}because the project itself might be a source container
- *
- * @param p
- * project
- * @return
- *
- * @since 1.0.0
- */
- public static List getSourceFolders(IProject p) {
- try {
- List sourceFolders = new ArrayList();
- List sourcePaths = getSourcePaths(p);
- if (sourcePaths != null && !sourcePaths.isEmpty()) {
- for (int i = 0; i < sourcePaths.size(); i++) {
- IPath path = (IPath) sourcePaths.get(i);
- if (!path.isEmpty())
- sourceFolders.add(p.getFolder(path));
- }
- }
- return sourceFolders;
- } catch (IllegalArgumentException ex) {
- return Collections.EMPTY_LIST;
- }
- }
-
- /**
- * Get source containers for the project.
- *
- * @param p
- * project
- * @return list of source containers.
- *
- * @since 1.0.0
- */
- public static List getSourceContainers(IProject p) {
- try {
- List sourceContainers = new ArrayList();
- List sourcePaths = getSourcePaths(p);
- if (sourcePaths != null && !sourcePaths.isEmpty()) {
- for (int i = 0; i < sourcePaths.size(); i++) {
- IPath path = (IPath) sourcePaths.get(i);
- if (path.isEmpty())
- sourceContainers.add(p);
- else
- sourceContainers.add(p.getFolder(path));
- }
- }
- return sourceContainers;
- } catch (IllegalArgumentException ex) {
- return Collections.EMPTY_LIST;
- }
- }
-
- /**
- * Return list of IContainers that are Libraries in the classpath.
- *
- * @param p
- * project
- * @return list of library IContainers.
- *
- * @since 1.0.0
- */
- public static List getLibraryContainers(IProject p) {
- try {
- List libraryContainers = new ArrayList();
- List libraryPaths = getlibraryPaths(p);
- if (libraryPaths != null && !libraryPaths.isEmpty()) {
- for (int i = 0; i < libraryPaths.size(); i++) {
- IPath path = (IPath) libraryPaths.get(i);
- if (path.isEmpty())
- libraryContainers.add(p);
- else
- libraryContainers.add(p.getFolder(path));
- }
- }
- return libraryContainers;
- } catch (IllegalArgumentException ex) {
- return Collections.EMPTY_LIST;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectResourceSet.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectResourceSet.java
deleted file mode 100644
index ba38087..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectResourceSet.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ProjectResourceSet.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * A ResourceSet for an entire project. It allows sharing of resources from multiple editors/viewers for a project.
- *
- * @since 1.0.0
- */
-
-public interface ProjectResourceSet extends ResourceSet {
-
- IProject getProject();
-
- /**
- * Call when the ResourceSet is no longer to be used.
- *
- *
- * @since 1.0.0
- */
- void release();
-
- /**
- * Add the <code>resourceHandler</code> to the end of the list of resourceHandlers.
- *
- * @param resourceHandler
- * IResourceHandler
- * @return boolean Return <code>true</code> if it was added.
- * @since 1.0.0
- */
- boolean add(ResourceHandler resourceHandler);
-
- /**
- * Add the <code>resourceHandler</code> to the front of the list of resourceHandlers.
- *
- * @param resourceHandler
- * IResourceHandler
- * @since 1.0.0
- */
- void addFirst(ResourceHandler resourceHandler);
-
- /**
- * Remove the <code>resourceHandler</code> from the list of resourceHandlers.
- *
- * @param resourceHandler
- * IResourceHandler
- * @return boolean Return true if it was removed.
- * @since 1.0.0
- */
- boolean remove(ResourceHandler resourceHandler);
-
- /**
- * Return the ResourceSet synchronizer that will synchronize the ResourceSet with changes from the Workbench.
- *
- * @return ResourceSetWorkbenchSynchronizer
- * @since 1.0.0
- */
- ResourceSetWorkbenchSynchronizer getSynchronizer();
-
- /**
- * Set the ResourceSet synchronizer that will synchronize the ResourceSet with changes from the Workbench.
- *
- * @param aSynchronizer
- * @return ResourceSetWorkbenchSynchronizer
- * @since 1.0.0
- */
- void setSynchronizer(ResourceSetWorkbenchSynchronizer aSynchronizer);
-
- /**
- * This should be called by clients whenever the structure of the project changes such that any cached URIs will be invalid. For example, if the
- * source folders within the URIConverter change.
- *
- * @since 1.0.0
- */
- void resetNormalizedURICache();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
deleted file mode 100644
index 7e80f23..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ProjectUtilities.java
+++ /dev/null
@@ -1,749 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ProjectUtilities.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/01/12 17:40:55 $$
- */
-
-package org.eclipse.jem.util.emf.workbench;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * EMF Workbench Project Utilities.
- *
- * @since 1.0.0
- */
-
-public class ProjectUtilities {
-
- /**
- * Project control file name in project.
- *
- * @since 1.0.0
- */
- public final static String DOT_PROJECT = ".project"; //$NON-NLS-1$
-
- /**
- * Classpath control file name in project.
- *
- * @since 1.0.0
- */
- public final static String DOT_CLASSPATH = ".classpath"; //$NON-NLS-1$
-
- public ProjectUtilities() {
- }
-
- /**
- * Add the nature id to the project ahead of all other nature ids.
- *
- * @param proj
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addNatureToProject(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 1, prevNatures.length);
- newNatures[0] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- /**
- * Add the nature id after all of the other nature ids for the project.
- *
- * @param proj
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addNatureToProjectLast(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
- newNatures[prevNatures.length] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- /**
- * Remove the nature id from the project.
- *
- * @param project
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void removeNatureFromProject(IProject project, String natureId) throws CoreException {
- IProjectDescription description = project.getDescription();
- String[] prevNatures = description.getNatureIds();
- int size = prevNatures.length;
- int newsize = 0;
- String[] newNatures = new String[size];
- boolean matchfound = false;
- for (int i = 0; i < size; i++) {
- if (prevNatures[i].equals(natureId)) {
- matchfound = true;
- continue;
- } else
- newNatures[newsize++] = prevNatures[i];
- }
- if (!matchfound)
- throw new CoreException(new Status(IStatus.ERROR, JEMUtilPlugin.ID, 0,
- "The nature id " + natureId + " does not exist on the project " + project.getName(), null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- else {
- String[] temp = newNatures;
- newNatures = new String[newsize];
- System.arraycopy(temp, 0, newNatures, 0, newsize);
- description.setNatureIds(newNatures);
- project.setDescription(description, null);
- }
- }
-
- /**
- * Add the list of projects to end of the "referenced projects" list from the project's description.
- *
- * @param project
- * @param toBeAddedProjectsList
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addReferenceProjects(IProject project, List toBeAddedProjectsList) throws CoreException {
-
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add(projects[i]);
- }
-
- for (int i = 0; i < toBeAddedProjectsList.size(); i++) {
- projectsList.add(toBeAddedProjectsList.get(i));
- }
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Add the single project to the end of the "referenced projects" list from the project's description.
- *
- * @param project
- * @param projectToBeAdded
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static void addReferenceProjects(IProject project, IProject projectToBeAdded) throws CoreException {
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add(projects[i]);
- }
-
- projectsList.add(projectToBeAdded);
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Force a an immediate build of the project.
- *
- * @param project
- * @param progressMonitor
- *
- * @since 1.0.0
- */
- public static void forceAutoBuild(IProject project, IProgressMonitor progressMonitor) {
- try {
- project.build(IncrementalProjectBuilder.FULL_BUILD, progressMonitor);
- } catch (CoreException ce) {
- //Revisit: Need to use a Logger
- //Logger.getLogger().logError(ce);
- }
- }
-
- /**
- * Return if auto build is turned on.
- *
- * @return <code>true</code> if auto build is turned on.
- *
- * @since 1.0.0
- */
- public static boolean getCurrentAutoBuildSetting() {
-
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- return wd.isAutoBuilding();
- }
-
- /**
- * Get the project associated with the given object.
- *
- * @param object
- * may be an <code>IProject, IResource, IAdaptable (to an IProject), EObject (gets IProject if object is in a ProjectResourceSet</code>.
- * @param natureId
- * if <code>null</code> then returns project. If not <code>null</code> then returns project only if project has this nature id.
- * @return project associated with the object or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(Object object, String natureId) {
- IProject result = getProject(object);
- if (natureId == null)
- return result;
- if (result != null && result.isAccessible() && natureId != null)
- try {
- if (result.hasNature(natureId))
- return result;
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return null;
- }
-
- /**
- * Get the project associated with the given object.
- *
- * @param object
- * may be an <code>IProject, IResource, IAdaptable (to an IProject), EObject (gets IProject if object is in a ProjectResourceSet</code>.
- * @return project associated with the object or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(Object object) {
- IProject result = null;
-
- if (object instanceof IProject)
- result = (IProject) object;
- else if (object instanceof IResource)
- result = ((IResource) object).getProject();
- else if (object instanceof IAdaptable)
- result = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
- else if (object instanceof EObject)
- result = getProject((EObject) object);
-
- return result;
- }
-
- /**
- * Get the project associated with the given EObject. (If in a ProjectResourceSet, then the project from that resource set).
- *
- * @param aRefObject
- * @return project if associated or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(EObject aRefObject) {
- if (aRefObject != null) {
- Resource resource = aRefObject.eResource();
- return getProject(resource);
- }
- return null;
- }
-
- /**
- * Get the project associated with the given Resource. (If in a ProjectResourceSet, then the project from that resource set).
- *
- * @param resource
- * @return project if associated or <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public static IProject getProject(Resource resource) {
- ResourceSet set = resource == null ? null : resource.getResourceSet();
- if (set instanceof ProjectResourceSet)
- return ((ProjectResourceSet) set).getProject();
- URIConverter converter = set == null ? null : set.getURIConverter();
- if (converter != null && converter instanceof WorkbenchURIConverter && ((WorkbenchURIConverter) converter).getOutputContainer() != null)
- return ((WorkbenchURIConverter) converter).getOutputContainer().getProject();
- else
- return null;
- }
-
- /**
- * Remove the list of projects from the list of "referenced projects" in the project's description.
- *
- * @param project
- * @param toBeRemovedProjectList
- * @throws org.eclipse.core.runtime.CoreException
- *
- * @since 1.0.0
- */
- public static void removeReferenceProjects(IProject project, List toBeRemovedProjectList) throws org.eclipse.core.runtime.CoreException {
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add(projects[i]);
- }
-
- for (int i = 0; i < toBeRemovedProjectList.size(); i++) {
- projectsList.remove(toBeRemovedProjectList.get(i));
- }
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Remove the project from the list of "referenced projects" in the description for the given project.
- *
- * @param project
- * @param toBeRemovedProject
- * @throws org.eclipse.core.runtime.CoreException
- *
- * @since 1.0.0
- */
- public static void removeReferenceProjects(IProject project, IProject toBeRemovedProject) throws org.eclipse.core.runtime.CoreException {
- IProjectDescription description = project.getDescription();
- IProject[] projects = description.getReferencedProjects();
-
- ArrayList projectsList = new ArrayList();
-
- for (int i = 0; i < projects.length; i++) {
- projectsList.add((projects[i]));
- }
-
- projectsList.remove(toBeRemovedProject);
-
- IProject[] refProjects = new IProject[projectsList.size()];
-
- for (int i = 0; i < refProjects.length; i++) {
- refProjects[i] = (IProject) (projectsList.get(i));
- }
-
- description.setReferencedProjects(refProjects);
- project.setDescription(description, null);
- }
-
- /**
- * Turn auto-building off.
- *
- *
- * @since 1.0.0
- */
- public static void turnAutoBuildOff() {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- wd.setAutoBuilding(false);
- workspace.setDescription(wd);
- } catch (CoreException ce) {
- //Logger.getLogger().logError(ce);
- }
- }
-
- /**
- * Turn auto-building on.
- *
- *
- * @since 1.0.0
- */
- public static void turnAutoBuildOn() {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- wd.setAutoBuilding(true);
- workspace.setDescription(wd);
- } catch (CoreException ce) {
- //Logger.getLogger().logError(ce);
- }
- }
-
- /**
- * Set the auto-building state.
- *
- * @param aBoolean
- * <code>true</code> to turn auto-building on.
- *
- * @since 1.0.0
- */
- public static void turnAutoBuildOn(boolean aBoolean) {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription wd = workspace.getDescription();
- wd.setAutoBuilding(aBoolean);
- workspace.setDescription(wd);
- } catch (CoreException ce) {
- //Logger.getLogger().logError(ce);
-
- }
- }
-
- /**
- * Adds a builder to the build spec for the given project.
- *
- * @param builderID
- * The id of the builder.
- * @param project
- * Project to add to.
- * @return whether the builder id was actually added (it may have already existed)
- * @throws CoreException
- * @since 1.0.0
- */
- public static boolean addToBuildSpec(String builderID, IProject project) throws CoreException {
- return addToBuildSpecBefore(builderID, null, project);
- }
-
- /**
- * Adds a builder to the build spec for the given project, immediately before the specified successor builder.
- *
- * @param builderID
- * The id of the builder.
- * @param successorID
- * The id to put the builder before.
- * @return whether the builder id was actually added (it may have already existed)
- * @throws CoreException
- * @since 1.0.0
- */
- public static boolean addToBuildSpecBefore(String builderID, String successorID, IProject project) throws CoreException {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(builderID)) {
- found = true;
- break;
- }
- }
- if (!found) {
- boolean successorFound = false;
- ICommand command = description.newCommand();
- command.setBuilderName(builderID);
- ICommand[] newCommands = new ICommand[commands.length + 1];
- for (int j = 0, index = 0; j < commands.length; j++, index++) {
- if (successorID != null && commands[j].getBuilderName().equals(successorID)) {
- successorFound = true;
- newCommands[index++] = command;
- }
- newCommands[index] = commands[j];
- }
- if (!successorFound)
- newCommands[newCommands.length - 1] = command;
- description.setBuildSpec(newCommands);
- project.setDescription(description, null);
- }
- return !found;
- }
-
- /**
- * Remove the builder from the build spec.
- *
- * @param builderID
- * The id of the builder.
- * @param project
- * Project to remove from.
- * @return boolean if the builder id was found and removed
- * @throws CoreException
- * @since 1.0.0
- */
- public static boolean removeFromBuildSpec(String builderID, IProject project) throws CoreException {
- IProjectDescription description = project.getDescription();
- ICommand[] commands = description.getBuildSpec();
- boolean found = false;
- for (int i = 0; i < commands.length; ++i) {
- if (commands[i].getBuilderName().equals(builderID)) {
- found = true;
- break;
- }
- }
- if (found) {
- ICommand[] newCommands = new ICommand[commands.length - 1];
- int newCount = 0;
- for (int i = 0; i < commands.length; ++i) {
- if (!(commands[i].getBuilderName().equals(builderID))) {
- //Add the existng to the new array
- newCommands[newCount] = commands[i];
- newCount++;
- }
- }
-
- description.setBuildSpec(newCommands);
- project.setDescription(description, null);
-
- }
- return found;
-
- }
-
- /**
- * Ensure the container is not read-only.
- * <p>
- * For Linux, a Resource cannot be created in a ReadOnly folder. This is only necessary for new files.
- *
- * @param resource
- * workspace resource to make read/write
- * @since 1.0.0
- */
- public static void ensureContainerNotReadOnly(IResource resource) {
- if (resource != null && !resource.exists()) { //it must be new
- IContainer container = resource.getParent();
- while (container != null && !container.isReadOnly())
- container = container.getParent();
- if (container != null)
- container.setReadOnly(false);
- }
- }
-
- /**
- * Get projects from primary nature.
- *
- * @param natureID
- * @return All projects that have the given nature id as the first nature id.
- *
- * @since 1.0.0
- */
- public static IProject[] getProjectsForPrimaryNature(String natureID) {
- IProject[] projectsWithNature = new IProject[] {};
- List result = new ArrayList();
- IProject[] projects = getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- if (isProjectPrimaryNature(projects[i], natureID))
- result.add(projects[i]);
- }
- return (IProject[]) result.toArray(projectsWithNature);
- }
-
- /**
- * Get all projects in the workspace
- *
- * @return all workspace projects
- *
- * @since 1.0.0
- */
- public static IProject[] getAllProjects() {
- return ResourcesPlugin.getWorkspace().getRoot().getProjects();
- }
-
- /**
- * Is this nature id the primary nature id for the project
- *
- * @param project
- * @param natureID
- * @return <code>true</code> if first nature id for the project.
- *
- * @since 1.0.0
- */
- public static boolean isProjectPrimaryNature(IProject project, String natureID) {
- String[] natures = null;
- try {
- natures = project.getDescription().getNatureIds();
- } catch (Exception e1) {
- }
- return (natures != null && natures.length > 0 && natures[0].equals(natureID));
- }
-
- protected static IPath createPath(IProject p, String defaultSourceName) {
- IPath path = new Path(p.getName());
- path = path.append(defaultSourceName);
- path = path.makeAbsolute();
- return path;
- }
-
- /**
- * Returns a list of existing files which will be modified if the classpath changes for the given proeject.
- *
- * @param p
- * project
- * @return list of affected files.
- *
- * @since 1.0.0
- */
- public static List getFilesAffectedByClasspathChange(IProject p) {
- List result = new ArrayList(2);
- addFileIfExists(p, result, DOT_CLASSPATH);
- addFileIfExists(p, result, DOT_PROJECT);
- return result;
- }
-
- protected static void addFileIfExists(IProject p, List aList, String filename) {
- IFile aFile = p.getFile(filename);
- if (aFile != null && aFile.exists())
- aList.add(aFile);
- }
-
- /**
- * Strip off a leading "/" from each project name in the array, if it has one.
- *
- * @param projecNames
- * @return array of project names with all leading '/' removed.
- *
- * @since 1.0.0
- */
- public static String[] getProjectNamesWithoutForwardSlash(String[] projecNames) {
- String[] projNames = new String[projecNames.length];
- List temp = java.util.Arrays.asList(projecNames);
- for (int i = 0; i < temp.size(); i++) {
- String name = (String) (temp.get(i));
- if (name.startsWith("/")) { //$NON-NLS-1$
- projNames[i] = name.substring(1, name.length());
- } else {
- projNames[i] = name;
- }
- }
- return projNames;
- }
-
- protected static URL createFileURL(IPath path) {
- try {
- return path.toFile().toURL();
- } catch (MalformedURLException e) {
- Logger.getLogger().log(e, Level.WARNING);
- return null;
- }
- }
-
- /**
- * Find first newObject that is not in the oldObjects array (using "==").
- *
- * @param oldObjects
- * @param newObjects
- * @return first newObject not found in oldObjects, or <code>null</code> if all found.
- *
- * @since 1.0.0
- */
- public static Object getNewObject(Object[] oldObjects, Object[] newObjects) {
- if (oldObjects != null && newObjects != null && oldObjects.length < newObjects.length) {
- for (int i = 0; i < newObjects.length; i++) {
- boolean found = false;
- Object object = newObjects[i];
- for (int j = 0; j < oldObjects.length; j++) {
- if (oldObjects[j] == object) {
- found = true;
- break;
- }
- }
- if (!found)
- return object;
- }
- }
- if (oldObjects == null && newObjects != null && newObjects.length == 1)
- return newObjects[0];
- return null;
- }
-
- /**
- * List of all files in the project.
- * <p>
- * Note: A more efficient way to do this is to use {@link IResource#accept(org.eclipse.core.resources.IResourceProxyVisitor, int)}
- *
- * @param 1.0.0
- * @return list of files in the project
- *
- * @see IResource#accept(org.eclipse.core.resources.IResourceProxyVisitor, int)
- * @since 1.0.0
- */
- public static List getAllProjectFiles(IProject project) {
- List result = new ArrayList();
- if (project == null)
- return result;
- try {
- result = collectFiles(project.members(), result);
- } catch (CoreException e) {
- }
- return result;
- }
-
- private static List collectFiles(IResource[] members, List result) throws CoreException {
- // recursively collect files for the given members
- for (int i = 0; i < members.length; i++) {
- IResource res = members[i];
- if (res instanceof IFolder) {
- collectFiles(((IFolder) res).members(), result);
- } else if (res instanceof IFile) {
- result.add(res);
- }
- }
- return result;
- }
-
- /**
- * Get the project.
- *
- * @param projectName
- * @return a IProject given the projectName
- * @since 1.0.0
- */
- public static IProject getProject(String projectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- /**
- * Return whether the given builder name is attached to the project.
- *
- * @param project
- * @param builderName
- * @return <code>true</code> if builder name is attached to the project.
- *
- * @since 1.0.0
- */
- public static boolean hasBuilder(IProject project, String builderName) {
- try {
- ICommand[] builders = project.getDescription().getBuildSpec();
- for (int i = 0; i < builders.length; i++) {
- ICommand builder = builders[i];
- if (builder != null) {
- if (builder.getBuilderName().equals(builderName))
- return true;
- }
- }
- } catch (Exception e) {
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceHandler.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceHandler.java
deleted file mode 100644
index 865a6c9..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ResourceHandler.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * Implementers of this interface are provide extension capabilities on resource set. Such as looking or creating in other resource sets for a
- * resource or an EObject.
- *
- * @see org.eclipse.jem.util.emf.workbench.ProjectResourceSet#add(ResourceHandler)
- * @since 1.0.0
- */
-public interface ResourceHandler {
-
- /**
- * Each ResourceHandler for a WorkbenchContext (which holds a ProjectResourceSet) will get an oportunity to get the Resource given the uriString
- * prior to the originatingResourceSet getting it in the normal manner.
- *
- * If this handler loaded a Resource in its create(ResourceSet, uriString) then this method should be able to return it as well.
- *
- * @param originatingResourceSet
- * @param uri
- * @return resource if found or <code>nulll/code> if this handler didn't find it.
- *
- * @since 1.0.0
- */
- Resource getResource(ResourceSet originatingResourceSet, URI uri);
-
- /**
- * Get the EObject for the given URI, if it can. Load the resource if loadOnDemand is <code>true</code>.
- *
- * @param originatingResourceSet
- * @param uri
- * uri of EObject being requested
- * @param loadOnDemand
- * <code>true</code> if resource should be loaded
- * @return eobject if found or <code>null</code> if not.
- */
- EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand);
-
- /**
- * Create the resource pointed to be the URI if this handler will handle it.
- *
- * @param originatingResourceSet
- * @param uri
- * @return resource if created, or <code>null</code> if handler doesn't handle this type.
- */
- Resource createResource(ResourceSet originatingResourceSet, URI uri);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceSetWorkbenchSynchronizer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceSetWorkbenchSynchronizer.java
deleted file mode 100644
index 5f9398e..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/ResourceSetWorkbenchSynchronizer.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: ResourceSetWorkbenchSynchronizer.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-
-package org.eclipse.jem.util.emf.workbench;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.util.emf.workbench.EMFWorkbenchContextFactory;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Synchronizer on the workbench. It listens for the project to see if it is closed or deleted. If it does it notifies this out.
- *
- * @since 1.0.0
- */
-public class ResourceSetWorkbenchSynchronizer implements IResourceChangeListener {
-
- protected IProject project;
-
- protected ResourceSet resourceSet;
-
- /** Extenders that will be notified after a pre build resource change */
- protected List extenders;
-
- /** The delta for this project that will be broadcast to the extenders */
- protected IResourceDelta currentProjectDelta;
-
- private int currentEventType = -1;
-
- /**
- * Constructor taking a resource set and project.
- *
- * @param aResourceSet
- * @param aProject
- *
- * @since 1.0.0
- */
- public ResourceSetWorkbenchSynchronizer(ResourceSet aResourceSet, IProject aProject) {
- resourceSet = aResourceSet;
- project = aProject;
- if (aResourceSet != null && aResourceSet instanceof ProjectResourceSet)
- ((ProjectResourceSet) aResourceSet).setSynchronizer(this);
- initialize();
- }
-
- /**
- * Get the project for this synchronizer
- *
- * @return project
- *
- * @since 1.0.0
- */
- public IProject getProject() {
- return project;
- }
-
- /*
- * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- currentEventType = event.getType();
- currentProjectDelta = null;
- if ((currentEventType == IResourceChangeEvent.PRE_CLOSE || currentEventType == IResourceChangeEvent.PRE_DELETE)
- && event.getResource().equals(getProject())) {
- release();
- notifyExtendersOfClose();
- }
- }
-
- protected void notifyExtendersIfNecessary() {
- if (currentEventType != IResourceChangeEvent.POST_CHANGE || extenders == null || currentProjectDelta == null)
- return;
- for (int i = 0; i < extenders.size(); i++) {
- ISynchronizerExtender extender = (ISynchronizerExtender) extenders.get(i);
- extender.projectChanged(currentProjectDelta);
- }
- }
-
- protected void notifyExtendersOfClose() {
- if (extenders != null && !extenders.isEmpty()) {
- for (int i = 0; i < extenders.size(); i++) {
- ISynchronizerExtender extender = (ISynchronizerExtender) extenders.get(i);
- extender.projectClosed();
- }
- }
- }
-
- protected IWorkspace getWorkspace() {
- if (getProject() == null)
- return ResourcesPlugin.getWorkspace();
- return getProject().getWorkspace();
- }
-
- protected void initialize() {
- getWorkspace().addResourceChangeListener(this,
- IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_BUILD);
- }
-
- /**
- * Dispose of the synchronizer. Called when no longer needed.
- *
- *
- * @since 1.0.0
- */
- public void dispose() {
- getWorkspace().removeResourceChangeListener(this);
- }
-
- /**
- * The project is going away so we need to cleanup ourself and the ResourceSet.
- */
- protected void release() {
- if (JEMUtilPlugin.isActivated()) {
- try {
- if (resourceSet instanceof ProjectResourceSet)
- ((ProjectResourceSet) resourceSet).release();
- } finally {
- EMFWorkbenchContextFactory.INSTANCE.removeCachedProject(getProject());
- dispose();
- }
- }
- }
-
- /**
- * Add an extender to be notified of events.
- *
- * @param extender
- *
- * @since 1.0.0
- */
- public void addExtender(ISynchronizerExtender extender) {
- if (extenders == null)
- extenders = new ArrayList(3);
- extenders.add(extender);
- }
-
- /**
- * Remove extender from notification of events.
- *
- * @param extender
- *
- * @since 1.0.0
- */
- public void removeExtender(ISynchronizerExtender extender) {
- if (extenders == null)
- return;
- extenders.remove(extender);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getClass().getName() + '(' + ((getProject() != null) ? getProject().getName() : "null") + ')'; //$NON-NLS-1$
- }
-
- /**
- * Tell Synchronizer that a file is about to be saved. This method should be called prior to writing to an IFile from an EMF resource.
- * <p>
- * Default does nothing, but subclasses can do something.
- * </p>
- *
- * @param aFile
- * file about to be saved.
- *
- * @since 1.0.0
- */
- public void preSave(IFile aFile) {
- //Default is do nothing
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchByteArrayOutputStream.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchByteArrayOutputStream.java
deleted file mode 100644
index 0fc25aa..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchByteArrayOutputStream.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchByteArrayOutputStream.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-/**
- * ByteArray OutputStream for the Workbench. It works with the synchronizer {@link org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer}to
- * notify of a save. It also changes all of the line separators to the current system line separator, i.e. if there are some '\r' and we are on
- * Windows(R) then they will be converted to '\n\r'), if the setting for the stream is to do eol conversion.
- *
- * @since 1.0.0
- */
-public class WorkbenchByteArrayOutputStream extends URIConverterImpl.PlatformResourceOutputStream {
-
- private boolean fConvertEOL = false;
-
- protected ResourceSetWorkbenchSynchronizer synchronizer;
-
- /**
- * Construct with an IFile
- *
- * @param aFile
- *
- * @since 1.0.0
- */
- public WorkbenchByteArrayOutputStream(IFile aFile) {
- this(aFile, null);
- }
-
- /**
- * Construct with a IFile and a synchronizer. This way synchronizer will know when file is about to be saved.
- *
- * @param aFile
- * @param aSynchronizer
- *
- * @since 1.0.0
- */
- public WorkbenchByteArrayOutputStream(IFile aFile, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- super(aFile, false, true, null);
- synchronizer = aSynchronizer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.OutputStream#close()
- */
- public void close() throws IOException {
- if (synchronizer != null)
- synchronizer.preSave(file);
- super.close();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl.PlatformResourceOutputStream#flush()
- */
- public void flush() throws IOException {
- if (synchronizer != null)
- synchronizer.preSave(file);
- super.flush();
- }
-
- /*
- * Convert the end of line characters.
- */
- private int convertEOL(byte[] data) {
- // Algorithm:
- // Remove all '\r' chars
- // Replace all '\n' chars with line seperator chars
-
- String EOL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
- byte[] EOLBytes = EOL.getBytes();
-
- int out = 0;
-
- for (int in = 0; in < data.length; in++) {
- if (data[in] == '\r') {
- // don't output (ie, throw the char away)
- } else if (data[in] == '\n') {
- // The code does not currently handle expanding the array
- if ((in - out + 1) < EOLBytes.length)
- throw new UnsupportedOperationException("WorkbenchByteArrayOutputStream: Expanding EOL chars not implemented"); //$NON-NLS-1$
-
- for (int i = 0; i < EOLBytes.length; i++) {
- data[out++] = EOLBytes[i];
- }
- } else {
- // Just copy the data
- data[out++] = data[in];
- }
- }
-
- return out;
- }
-
- /**
- * Is EOL conversion turned on.
- *
- * @return <code>true</code> if EOL conversion is turned on.
- *
- * @since 1.0.0
- */
- public boolean isConvertEOLChars() {
- return fConvertEOL;
- }
-
- /**
- * Set the EOL conversion flag.
- *
- * @param set
- * <code>true</code> if EOL should be converted to current line separator.
- *
- * @since 1.0.0
- */
- public void setConvertEOLChars(boolean set) {
- fConvertEOL = set;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.ByteArrayOutputStream#toByteArray()
- */
- public synchronized byte[] toByteArray() {
- byte[] contents = super.toByteArray();
- if (isConvertEOLChars())
- convertEOL(contents);
- return contents;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
deleted file mode 100644
index c976061..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchResourceHelperBase.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchResourceHelperBase.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.util.*;
-
-import org.eclipse.core.internal.resources.ResourceException;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.*;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.util.emf.workbench.EMFWorkbenchContextFactory;
-import org.eclipse.jem.internal.util.emf.workbench.WorkspaceResourceHandler;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Workbench resource helper
- *
- * @since 1.0.0
- */
-public class WorkbenchResourceHelperBase {
-
- /**
- * Everything is static, don't know why there is an instance here.
- */
- public static final WorkbenchResourceHelperBase INSTANCE = new WorkbenchResourceHelperBase();
-
- protected static WorkspaceResourceHandler workspaceURILoader = new WorkspaceResourceHandler();
-
- protected static void resolveContainedProxies(EObject refObject) {
- List contained = refObject.eContents();
- EObject mofObject;
- for (int i = 0; i < contained.size(); i++) {
- mofObject = (EObject) contained.get(i);
- resolveProxies(mofObject);
- }
- }
-
- protected static void resolveNonContainedProxies(EObject refObject) {
- List references = refObject.eClass().getEAllReferences();
- EReference reference;
- for (int i = 0; i < references.size(); i++) {
- reference = (EReference) references.get(i);
- if (!reference.isContainment()) {
- if (reference.isMany()) {
- List value = (List) refObject.eGet(reference);
- for (int j = 0; j < value.size(); j++)
- value.get(j);
- } else {
- refObject.eGet(reference);
- }
- }
- }
- }
-
- /**
- * Force all of the proxies with <code>resource</code> to be resolved.
- *
- * @param resource
- *
- * @since 1.0.0
- */
- public static void resolveProxies(Resource resource) {
- if (resource != null) {
- List topLevels = resource.getContents();
- EObject mofObject;
- for (int i = 0; i < topLevels.size(); i++) {
- mofObject = (EObject) topLevels.get(i);
- resolveProxies(mofObject);
- }
- }
- }
-
- /**
- * Return a List of proxies that are contained by the <code>resource</code>.
- *
- * @param resource
- * @return list of proxies.
- *
- * @since 1.0.0
- */
- public static List gatherProxies(Resource resource) {
- if (resource == null)
- return Collections.EMPTY_LIST;
- List list = new ArrayList();
- List topLevels = resource.getContents();
- int size = topLevels.size();
- EObject mofObject;
- for (int i = 0; i < size; i++) {
- mofObject = (EObject) topLevels.get(i);
- gatherProxies((InternalEObject) mofObject, list);
- }
- return list;
- }
-
- protected static void gatherProxies(InternalEObject refObject, List proxies) {
- if (refObject == null)
- return;
- List contains = refObject.eClass().getEAllContainments();
- if (contains != null) {
- int size = contains.size();
- EStructuralFeature sf = null;
- for (int i = 0; i < size; i++) {
- sf = (EStructuralFeature) contains.get(i);
- gatherProxies(refObject, sf, proxies);
- }
- }
- }
-
- protected static void gatherProxies(InternalEObject refObject, EStructuralFeature sf, List proxies) {
- Object value = null;
- InternalEObject proxy = null;
- if (sf.isMany() || refObject.eIsSet(sf)) {
- value = refObject.eGet(sf, false);
- if (value != null) {
- if (sf.isMany()) {
- Iterator j = ((InternalEList) value).basicIterator();
- while (j.hasNext()) {
- proxy = (InternalEObject) j.next();
- if (proxy.eIsProxy())
- proxies.add(proxy);
- }
- } else if (((InternalEObject) value).eIsProxy())
- proxies.add(value);
- }
- }
- }
-
- protected static void resolveProxies(EObject refObject) {
- if (refObject != null) {
- resolveNonContainedProxies(refObject);
- resolveContainedProxies(refObject);
- }
- }
-
- /**
- * Return an existing context base on <code>aProject</code>.
- *
- * @param aProject
- * @return the context base for the project or <code>null</code> if none.
- *
- * @since 1.0.0
- */
- public static EMFWorkbenchContextBase getEMFContext(IProject aProject) {
- return EMFWorkbenchContextFactory.INSTANCE.getEMFContext(aProject);
- }
-
- /**
- * Create a resource from the URI. The URI must contain the project name, either as the first segment, or if in platform resource url protocol.
- * {@link #getResourceSet(URI)}
- *
- * @param uri
- * @return a new resource for the uri or <code>null</code> if not a project uri
- *
- * @since 1.0.0
- */
- public static Resource createResource(URI uri) {
- ResourceSet set = getResourceSet(uri);
- if (set != null)
- return set.createResource(uri);
- return null;
- }
-
- /**
- * Check for a cached Resource for the given URI, if none is found, create a new Resource for with the URI against the proper ResourceSet.
- *
- * @param uri
- * @return resource or <code>null</code> if not a project uri.
- *
- * @since 1.0.0
- */
- public static Resource getExistingOrCreateResource(URI uri) {
- return getExistingOrCreateResource(uri, getResourceSet(uri));
- }
-
- /**
- * Check for a cached Resource for the given URI, if none is found, create a new Resource for with the URI against the given ResourceSet.
- *
- * @param uri
- * @param set
- * @return resource or <code>null</code> if set was <code>null</code>.
- *
- * @since 1.0.0
- */
- public static Resource getExistingOrCreateResource(URI uri, ResourceSet set) {
- Resource res = null;
- if (set != null) {
- res = set.getResource(uri, false);
- if (res == null)
- res = set.createResource(uri);
- }
- return res;
- }
-
- /**
- * Return a new or existing context base on <code>aProject</code>. Allow the <code>contributor</code> to contribute to the new or existing
- * nature prior to returning.
- *
- * @param aProject
- * @param contributor
- * @return the context base for the project.
- *
- * @since 1.0.0
- */
- public static EMFWorkbenchContextBase createEMFContext(IProject aProject, IEMFContextContributor contributor) {
- return EMFWorkbenchContextFactory.INSTANCE.createEMFContext(aProject, contributor);
- }
-
- /**
- * Does the passed URI have the form platform:/resource/... ?
- *
- * @param uri
- * @return <code>true</code> if it is a platform resource protocol.
- *
- * @since 1.0.0
- */
- public static boolean isPlatformResourceURI(URI uri) {
- return JEMUtilPlugin.PLATFORM_PROTOCOL.equals(uri.scheme()) && JEMUtilPlugin.PLATFORM_RESOURCE.equals(uri.segment(0));
- }
-
- /**
- * This api may be used to cache a Resource if it has a URI that is Workspace relative. Return true if it is cached.
- *
- * @param aResource
- * @return <code>true</code> if it was successful to cache.
- *
- * @since 1.0.0
- */
- public static boolean cacheResource(Resource aResource) {
- if (aResource != null) {
- ResourceSet set = getResourceSet(aResource.getURI());
- if (set != null)
- return set.getResources().add(aResource);
- }
- return false;
- }
-
- /**
- * This api is used if you create a new MOF resource and you want to add it to the correct ResourceSet. In order to do that, we need the IProject
- * that you want aResource to be cached within as well as the IPath which is the full path of the location of the new Resource.
- *
- * @param aProject
- * @param aResource
- * @param fullPath
- * @return <code>true</code> if resource was cached.
- *
- * @since 1.0.0
- */
- public static boolean cacheResource(IProject aProject, Resource aResource, IPath fullPath) {
- if (aProject == null || aResource == null || !aProject.isAccessible())
- return false;
- ResourceSet set = getResourceSet(aProject);
- if (set != null) {
- URI converted = set.getURIConverter().normalize(aResource.getURI());
- if (converted != aResource.getURI())
- aResource.setURI(converted);
- return set.getResources().add(aResource);
- }
- return false;
- }
-
- /**
- * Get the path of the project resource relative to the workspace or relative to the list of containers in this project.
- *
- * @param aResource
- * @return path
- *
- * @since 1.0.0
- */
- public static String getActualProjectRelativeURI(IResource aResource) {
- if (aResource == null || !aResource.isAccessible())
- return null;
- IProject project = aResource.getProject();
- IPath path = getPathInProject(project, aResource.getFullPath());
- return path.makeRelative().toString();
- }
-
- /**
- * Return an IPath that can be used to load a Resource using the <code>fullPath</code>. This will be a project relative path.
- *
- * @param project
- * @param fullPath
- * @return path
- *
- * @since 1.0.0
- */
- public static IPath getPathInProject(IProject project, IPath fullPath) {
- List containers = getProjectURIConverterContainers(project);
- if (!containers.isEmpty())
- return getPathFromContainers(containers, fullPath);
- return fullPath;
- }
-
- protected static List getProjectURIConverterContainers(IProject project) {
- EMFWorkbenchContextBase nature = createEMFContext(project, null);
- if (nature != null) {
- WorkbenchURIConverter conv = (WorkbenchURIConverter) nature.getResourceSet().getURIConverter();
- if (conv != null)
- return conv.getInputContainers();
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * If this path is contained within one of the listed containers, then return the path relative to the container.
- *
- * @param containers
- * @param fullPath
- * @return path relative to a container, or unchanged path if not in a container.
- *
- * @since 1.0.0
- */
- public static IPath getPathFromContainers(List containers, IPath fullPath) {
- IContainer container = null;
- IPath result;
- int size = containers.size();
- int matching = -1;
- IPath containerPath;
- for (int i = 0; i < size; i++) {
- container = (IContainer) containers.get(i);
- containerPath = container.getFullPath();
- matching = fullPath.matchingFirstSegments(containerPath);
- if (matching > 0 && matching == containerPath.segmentCount()) {
- result = fullPath.removeFirstSegments(matching);
- result = result.makeRelative();
- return result;
- }
- }
- return fullPath;
- }
-
- /**
- * Return true if the <code>uri</code> has its container segments visible from the input containers for the <code>project</code>.
- *
- * @param project
- * @param uri
- * @return <code>true</code> if the uri is visible from the input containers.
- *
- * @since 1.0.0
- */
- public static boolean hasContainerStructure(IProject project, URI uri) {
- if (project != null && uri != null) {
- IPath path = new Path(uri.toString());
- List containers = getProjectURIConverterContainers(project);
- int segmentCount = path.segmentCount();
- IPath containerPath = segmentCount > 1 ? path.removeLastSegments(1) : null;
- IContainer container = null;
- for (int i = 0; i < containers.size(); i++) {
- container = (IContainer) containers.get(i);
- if (!container.isAccessible())
- continue;
- if (segmentCount == 1) {
- if (container == project)
- return true;
- } else if (containerPath != null) {
- IFolder folder = container.getFolder(containerPath);
- if (folder != null && folder.isAccessible())
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Get the resource for the uri.
- *
- * @param uri
- * @return
- *
- * @since 1.0.0
- */
- public static Resource getResource(URI uri) {
- return workspaceURILoader.getResource(null, uri);
- }
-
- /**
- * Return the Resource for the passed IFile without forcing a load.
- *
- * @param aFile
- * @return
- *
- * @since 1.0.0
- */
- public static Resource getResource(IFile aFile) {
- return getResource(aFile, false);
- }
-
- /**
- * Return the Resource for the passed IFile, forcing a load if <code>loadOnDemand</code> says so.
- *
- * @param aFile
- * @param loadOnDemand
- * <code>true</code> will force a load of resource if not loaded.
- * @return
- *
- * @since 1.0.0
- */
- public static Resource getResource(IFile aFile, boolean loadOnDemand) {
- if (aFile != null)
- return getResource(URI.createPlatformResourceURI(aFile.getFullPath().toString()), loadOnDemand);
- return null;
- }
-
- /**
- * Return the Resource for the passed IFile without a load if not loaded.
- *
- * @param aFile
- * @return
- *
- * @since 1.0.0
- */
- public static Resource load(IFile aFile) {
- return getResource(aFile, true);
- }
-
- /**
- * This method will direct the getResource(URI, boolean) call to the correct ProjectResourceSet based on the project name in the URI.
- *
- * @param uri
- * This must be an absolute URI of the form platform:/resource/...
- * @param loadOnDemand
- * <code>true</code> will force the resource to be loaded if not already loaded.
- * @return Resource
- */
- public static Resource getResource(URI uri, boolean loadOnDemand) {
- ResourceSet set = getResourceSet(uri);
- if (set != null)
- return set.getResource(uri, loadOnDemand);
- return null;
- }
-
- /**
- * Return a ResourceSet for the passed URI. The URI should be in the format platform:/resource/{project name}/... or {project name}/... for this
- * api to work.
- *
- * @param uri
- * @return the resource set or <code>null</code> if not of correct form or project doesn't have a resource set.
- *
- * @since 1.0.0
- */
- public static ResourceSet getResourceSet(URI uri) {
- String projectName = null;
- if (isPlatformResourceURI(uri))
- projectName = uri.segment(1);
- else {
- projectName = new org.eclipse.core.runtime.Path(uri.path()).segment(0);
- } //assume project name is first in the URI
- IProject project = getWorkspace().getRoot().getProject(projectName);
- if (project != null && project.isAccessible())
- return getResourceSet(project);
- return null;
- }
-
- /**
- * Return the ResourceSet for the passed IProject.
- *
- * @param project
- * @return resource set
- */
- public static ResourceSet getResourceSet(IProject project) {
- EMFWorkbenchContextBase nat = createEMFContext(project, null);
- if (nat != null)
- return nat.getResourceSet();
- return null;
- }
-
- /**
- * Get the workspace. (just use {@link ResourcesPlugin#getWorkspace()}).
- *
- * @return
- *
- * @since 1.0.0
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Get the project associated with the resource set.
- *
- * @param set
- * @return project or <code>null</code> if resource set not associated with a project.
- *
- * @since 1.0.0
- */
- public static IProject getProject(ResourceSet set) {
- if (set != null) {
- if (set instanceof ProjectResourceSet) {
- ProjectResourceSet pset = (ProjectResourceSet) set;
- return pset.getProject();
- }
- }
- return null;
- }
-
- protected static boolean isRegisteredURIMapping(String href) {
- if (href != null) {
- String file = href;
- int index = href.indexOf('#');
- if (index > -1)
- file = href.substring(0, index);
- return URIConverter.URI_MAP.get(file) != null;
- }
- return false;
- }
-
- /**
- * Remove all of the resources from the resource set and then unload them. Unload forces all of the objects to become proxies so next resolve will
- * reload the resource.
- *
- * @param resources
- * @param aSet
- *
- * @since 1.0.0
- */
- public static void removeAndUnloadAll(List resources, ResourceSet aSet) {
- if (aSet == null || resources == null || resources.isEmpty())
- return;
- aSet.getResources().removeAll(resources);
- Resource res;
- for (int i = 0; i < resources.size(); i++) {
- res = (Resource) resources.get(i);
- res.unload();
- }
- }
-
- /**
- * Turn object into a proxy.
- *
- * @param anObject
- * @return <code>true</code> if object was able to become a proxy.
- *
- * @since 1.0.0
- */
- public static boolean becomeProxy(EObject anObject) {
- if (anObject != null) {
- Resource res = anObject.eResource();
- if (res != null) {
- URI uri = res.getURI();
- ((InternalEObject) anObject).eSetProxyURI(uri.appendFragment(res.getURIFragment(anObject)));
- //anObject.eAdapters().clear();
- return true;
- }
- }
- return false;
- }
-
- /**
- * Return true if the WrappedException is actually a Resource Not Found.
- *
- * @param wrappedEx
- * @return <code>true</code> is exception wrappers a resource not found.
- * @since 1.0.0
- */
- public static boolean isResourceNotFound(WrappedException wrappedEx) {
- Exception excep = wrappedEx.exception();
- while (excep instanceof WrappedException) {
- excep = ((WrappedException) excep).exception();
- }
- return primIsResourceNotFound(excep);
- }
-
- private static boolean primIsResourceNotFound(Exception excep) {
- if (excep instanceof ResourceException) {
- IStatus status = ((ResourceException) excep).getStatus();
- return status.getCode() == IResourceStatus.RESOURCE_NOT_FOUND;
- }
- return false;
- }
-
- /**
- * Return true if the WrappedException is actually a Resource Not Found.
- *
- * @param wrappedEx
- * @return <code>true</code> is exception wrappers a resource not found.
- * @since 1.0.0
- */
- public static boolean isResourceNotFound(Resource.IOWrappedException wrappedEx) {
- return primIsResourceNotFound(wrappedEx.getWrappedException());
- }
-
- /**
- * Return a URI represenation of the platformURI without the leading "platform:/resource/" if present.
- *
- * @param platformURI
- * @return uri
- * @since 1.0.0
- */
- public static URI getNonPlatformURI(URI platformURI) {
- if (isPlatformResourceURI(platformURI)) {
- String uriString = primGetNonPlatformURIString(platformURI);
- return URI.createURI(uriString);
- }
- return platformURI;
- }
-
- /**
- * Return a String represenation of the platformURI without the leading "platform:/resource/" if present.
- *
- * @param platformURI
- * @return
- * @since 1.0.0
- */
- public static String getNonPlatformURIString(URI platformURI) {
- if (isPlatformResourceURI(platformURI)) { return primGetNonPlatformURIString(platformURI); }
- return platformURI.toString();
- }
-
- /*
- * Remove "platform:/resource/" from the front of the platformURI and return the remaining String.
- */
- private static String primGetNonPlatformURIString(URI platformURI) {
- String uriString = platformURI.toString();
- //"platform:/resource/" is 19 characters.
- return uriString.substring(19, uriString.length());
- }
-
- /**
- * Does the passed URI have the form platform:/plugin/... ?
- *
- * @param uri
- * @return <code>true</code> if uri is platform plugin protocol.
- *
- * @since 1.0.0
- */
- public static boolean isPlatformPluginResourceURI(URI uri) {
- return JEMUtilPlugin.PLATFORM_PROTOCOL.equals(uri.scheme()) && JEMUtilPlugin.PLATFORM_PLUGIN.equals(uri.segment(0));
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverter.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverter.java
deleted file mode 100644
index e082d33..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverter.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchURIConverter.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.URIConverter;
-
-/**
- * Implementers of this interface are WorkbenchURI converters. Workbench URI converters handle references to files in the project's containers.
- * This converter is only necessary to resolve old ambiguous workbench URIs.
- * @since 1.0.0
- */
-public interface WorkbenchURIConverter extends URIConverter {
-
- /**
- * Add input container to to the converter.
- *
- * @param aContainer
- *
- * @since 1.0.0
- */
- void addInputContainer(IContainer aContainer);
-
- /**
- * Add list of containers to the converter.
- *
- * @param containers
- * list of <code>IContainer</code>
- *
- * @since 1.0.0
- */
- void addInputContainers(List containers);
-
- /**
- * Get the file relative to a container.
- *
- * @param uri
- * @return file relative to a container or <code>null</code> if not.
- *
- * @since 1.0.0
- */
- IFile getFile(String uri);
-
- /**
- * Get first input container
- *
- * @return first input container or <code>null</code> if none set.
- *
- * @since 1.0.0
- */
- IContainer getInputContainer();
-
- /**
- * Get all input containers.
- *
- * @return all input containers.
- *
- * @since 1.0.0
- */
- List getInputContainers();
-
- /**
- * Get the output container if set.
- *
- * @return output container or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- IContainer getOutputContainer();
-
- /**
- * Set the output container.
- *
- * @param container
- *
- * @since 1.0.0
- */
- void setOutputContainer(IContainer container);
-
- /**
- * Return an IFile for
- *
- * @aPath. If we have a parent and we do not contain the first segment of the aPath, forward to the parent to retrieve the file.
- * @param aPath
- * @return
- *
- * @since 1.0.0
- */
- IFile getOutputFile(IPath aPath);
-
- /**
- * Get output file with mapping applied.
- *
- * @param uri
- * @return
- *
- * @since 1.0.0
- */
- IFile getOutputFileWithMappingApplied(String uri);
-
- /**
- * Remove input container from list.
- *
- * @param aContainer
- * @return <code>true</code> if removed.
- *
- * @since 1.0.0
- */
- boolean removeInputContainer(IContainer aContainer);
-
- /**
- * Return true if we can retrieve the resource used to open an input stream on.
- *
- * @param aFileName
- * @return <code>true</code> if filename is valid for file stream access.
- * @since 1.0.0
- *
- */
- boolean canGetUnderlyingResource(String aFileName);
-
- /**
- * Is force save relative flag turned on.
- *
- * @return <code>true</code> if force save relative is turned on.
- *
- * @since 1.0.0
- */
- boolean isForceSaveRelative();
-
- /**
- * Set to true if you do not want any path manipulation when creating the output stream..
- *
- * @param forceSaveRelative
- * <code>true</code> to force saves as relative.
- */
- void setForceSaveRelative(boolean forceSaveRelative);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverterImpl.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverterImpl.java
deleted file mode 100644
index 6a9f7f8..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/WorkbenchURIConverterImpl.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: WorkbenchURIConverterImpl.java,v $$
- * $$Revision: 1.2 $$ $$Date: 2005/01/26 16:40:52 $$
- */
-package org.eclipse.jem.util.emf.workbench;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A default implementation of the WorkbenchURIConverter interface.
- *
- * @since 1.0.0
- */
-public class WorkbenchURIConverterImpl extends URIConverterImpl implements WorkbenchURIConverter {
-
- private final static IWorkspaceRoot WORKSPACE_ROOT = URIConverterImpl.workspaceRoot;
- private final static String WORKSPACE_ROOT_LOCATION = WORKSPACE_ROOT.getLocation().toString();
-
- private static final String FILE_PROTOCOL = "file"; //$NON-NLS-1$
-
- private static final IPath INVALID_PATH = new Path("!!!!~!!!!"); //$NON-NLS-1$
-
- private static final IFile INVALID_FILE = WORKSPACE_ROOT.getFile(INVALID_PATH.append(INVALID_PATH));
-
- //Used to avoid trying to fixup the URI when getting the
- //OutputStream
- protected boolean forceSaveRelative = false;
-
- protected List inputContainers;
-
- protected IContainer outputContainer;
-
- protected ResourceSetWorkbenchSynchronizer resourceSetSynchronizer;
-
- /*
- * KLUDGE: We need to know the meta data area. This is so that any uri that starts with the metadata directory
- * is considered a file uri and NOT a workspace uri. The metadata is where plugin's store their working data.
- * It is not part of the workspace root.
- *
- * There is no request for simply the metadata area. The log file is in the metadata directory. So we will
- * get the log file location and just remove the log file name. That should leave us with the metadata directory
- * only. If Eclipse ever decides to move it from here, this will no longer work. But it hasn't moved in three
- * versions.
- *
- * @since 1.1.0
- */
- static protected final String METADATA_LOCATION = Platform.getLogFileLocation().removeLastSegments(1).toString();
-
- /**
- * Default converter constructor, no containers.
- *
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl() {
- super();
- }
-
- /**
- * Construct with an input container.
- *
- * @param anInputContainer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer anInputContainer) {
- this(anInputContainer, (ResourceSetWorkbenchSynchronizer) null);
- }
-
- /**
- * Construct with an input container and a synchronzier.
- *
- * @param aContainer
- * @param aSynchronizer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer aContainer, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- this(aContainer, null, aSynchronizer);
- }
-
- /**
- * Construct with an input container and an output container.
- *
- * @param anInputContainer
- * @param anOutputContainer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer anInputContainer, IContainer anOutputContainer) {
- this(anInputContainer, anOutputContainer, null);
- }
-
- /**
- * Construct with an input container, output container, and a synchronizer.
- *
- * @param anInputContainer
- * @param anOutputContainer
- * @param aSynchronizer
- *
- * @since 1.0.0
- */
- public WorkbenchURIConverterImpl(IContainer anInputContainer, IContainer anOutputContainer, ResourceSetWorkbenchSynchronizer aSynchronizer) {
- addInputContainer(anInputContainer);
- setOutputContainer(anOutputContainer);
- resourceSetSynchronizer = aSynchronizer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#addInputContainer(org.eclipse.core.resources.IContainer)
- */
- public void addInputContainer(IContainer aContainer) {
- if (aContainer != null && !getInputContainers().contains(aContainer))
- getInputContainers().add(aContainer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#addInputContainers(java.util.List)
- */
- public void addInputContainers(List containers) {
- for (int i = 0; i < containers.size(); i++) {
- addInputContainer((IContainer) containers.get(i));
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#removeInputContainer(org.eclipse.core.resources.IContainer)
- */
- public boolean removeInputContainer(IContainer aContainer) {
- return getInputContainers().remove(aContainer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getInputContainers()
- */
- public List getInputContainers() {
- if (inputContainers == null)
- inputContainers = new ArrayList();
- return inputContainers;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getInputContainer()
- */
- public IContainer getInputContainer() {
- if (!getInputContainers().isEmpty())
- return (IContainer) getInputContainers().get(0);
- else
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getOutputContainer()
- */
- public IContainer getOutputContainer() {
- if (outputContainer == null)
- outputContainer = getInputContainer();
- return outputContainer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#setOutputContainer(org.eclipse.core.resources.IContainer)
- */
- public void setOutputContainer(IContainer newOutputContainer) {
- outputContainer = newOutputContainer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getOutputFile(org.eclipse.core.runtime.IPath)
- */
- public IFile getOutputFile(IPath aPath) {
- IFile file = null;
- if (getOutputContainer() != null) {
- if (forceSaveRelative)
- return primGetOutputFile(aPath);
- file = getOutputFileForPathWithContainerSegments(aPath);
- if (file != null)
- return file;
- else
- return primGetOutputFile(aPath);
- }
- return file;
- }
-
- protected IFile primGetOutputFile(IPath aPath) {
- return primGetFile(getOutputContainer(), aPath);
- }
-
- protected IFile getOutputFileForPathWithContainerSegments(IPath aPath) {
- IContainer out = getOutputContainer();
- return getFileForPathWithContainerSegments(aPath, out, false);
- }
-
- protected IFile getFileForPathWithContainerSegments(IPath aPath, IContainer container, boolean testExists) {
- IPath containerPath = null;
- IFile file = null;
- if (testExists) {
- containerPath = container.getProjectRelativePath();
- if (!containerPath.isEmpty()) {
- file = getFileForMatchingPath(aPath, containerPath, container);
- if (file != null && file.exists())
- return file;
- }
- }
- containerPath = container.getFullPath();
- file = getFileForMatchingPath(aPath, containerPath, container);
- return file;
- }
-
- protected IFile getFileForMatchingPath(IPath containerPath, IPath sourcePath, IContainer container) {
- int matches = 0;
- matches = containerPath.matchingFirstSegments(sourcePath);
- if (matches > 0 && matches == sourcePath.segmentCount()) {
- IPath loadPath = containerPath.removeFirstSegments(matches);
- return primGetFile(container, loadPath);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getFile(java.lang.String)
- */
- public IFile getFile(String uri) {
- return getFile(new Path(uri));
- }
-
- /**
- * Get the file from the path.
- *
- * @param path
- * @return
- * @see WorkbenchURIConverter#getFile(String)
- * @since 1.0.0
- */
- public IFile getFile(IPath path) {
- IFile file = null;
- if (getInputContainer() != null) {
- path = path.makeRelative();
- java.util.Iterator it = getInputContainers().iterator();
- while (it.hasNext()) {
- IContainer con = (IContainer) it.next();
- file = getInputFile(con, path);
- if (file != null && file.exists())
- return file;
- }
- }
- if (file == null)
- return INVALID_FILE;
- return file;
- }
-
- /**
- * Get output file from string path.
- *
- * @param uri
- * @return
- *
- * @see WorkbenchURIConverter#getOutputFile(IPath)
- * @since 1.0.0
- */
- public IFile getOutputFile(String uri) {
- return getOutputFile(new Path(uri));
- }
-
- /**
- * Get the input file from the container and path.
- *
- * @param con
- * @param path
- * @return
- *
- * @since 1.0.0
- */
- public IFile getInputFile(IContainer con, IPath path) {
- IFile file = null;
- if (WORKSPACE_ROOT.equals(con) && path.segmentCount() < 2)
- path = INVALID_PATH.append(path);
- file = primGetFile(con, path);
- if (file == null || !file.exists())
- file = getFileForPathWithContainerSegments(path, con, true);
- return file;
- }
-
- protected IFile primGetFile(IContainer container, IPath path) {
- try {
- return container.getFile(path);
- } catch (IllegalArgumentException ex) {
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#canGetUnderlyingResource(java.lang.String)
- */
- public boolean canGetUnderlyingResource(String aFileName) {
- IFile file = getFile(aFileName);
- return file != null && file.exists();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#isForceSaveRelative()
- */
- public boolean isForceSaveRelative() {
- return forceSaveRelative;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#setForceSaveRelative(boolean)
- */
- public void setForceSaveRelative(boolean forceSaveRelative) {
- this.forceSaveRelative = forceSaveRelative;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.URIConverter#normalize(org.eclipse.emf.common.util.URI)
- */public URI normalize(URI uri) {
- URI result = uri;
- String fragment = null;
- if (uri.hasFragment()) {
- fragment = uri.fragment();
- result = uri.trimFragment();
- }
- result = getInternalURIMap().getURI(result);
- if (WorkbenchResourceHelperBase.isPlatformResourceURI(result))
- return appendFragment(result, fragment);
- if (WorkbenchResourceHelperBase.isPlatformPluginResourceURI(result)) {
- URI normalized = normalizePluginURI(result, fragment);
- return (normalized != null) ? normalized : uri;
- }
- String protocol = result.scheme();
- URI fileSearchURI = null;
- if (protocol == null) {
- fileSearchURI = normalizeEmptyProtocol(result, fragment);
- if (fileSearchURI != null)
- return fileSearchURI;
- } else if (FILE_PROTOCOL.equals(protocol)) {
- fileSearchURI = normalizeFileProtocol(result, fragment);
- if (fileSearchURI != null)
- return fileSearchURI;
- } else if (JEMUtilPlugin.WORKSPACE_PROTOCOL.equals(protocol))
- return normalizeWorkspaceProtocol(result, fragment);
- return super.normalize(uri);
- }
-
- /*
- * Resolves a plugin format into the actual.
- */
- protected URI normalizePluginURI(URI uri, String fragment) {
- if (uri.segmentCount() < 2)
- return uri; // Invalid, just let it go on.
- // See if already normalized.
- int u_scoreNdx = uri.segment(1).lastIndexOf('_');
- if (u_scoreNdx != -1) {
- // Not normalized. Remove the version to make it normalized.
- String[] segments = uri.segments();
- segments[1] = segments[1].substring(0, u_scoreNdx);
- return URI.createHierarchicalURI(uri.scheme(), uri.authority(), uri.device(), segments, uri.query(), fragment);
- } else
- return uri;
- }
-
- protected URI normalizeWorkspaceProtocol(URI aWorkspaceURI, String fragment) {
- URI result;
- String uriString = aWorkspaceURI.toString();
- uriString = uriString.substring(JEMUtilPlugin.WORKSPACE_PROTOCOL.length() + 1);
- result = URI.createPlatformResourceURI(uriString);
- if (fragment != null)
- result = appendFragment(aWorkspaceURI, fragment);
- return result;
- }
-
- protected URI normalizeEmptyProtocol(URI aFileUri, String fragment) {
- //Make the relative path absolute and return a platform URI.
- IPath path = new Path(aFileUri.toString());
- return normalizeToWorkspaceURI(path, fragment);
- }
-
- private URI normalizeToWorkspaceURI(IPath path, String fragment) {
- URI result = null;
- IFile file = getFile(path);
- if (file == null || !file.exists())
- file = getOutputFile(path);
- if (file != null) {
- result = URI.createPlatformResourceURI(file.getFullPath().toString());
- result = appendFragment(result, fragment);
- }
- return result;
- }
-
- protected URI normalizeFileProtocol(URI aFileUri, String fragment) {
- URI result = null;
- //Make the relative path absolute and return a platform URI.
- String devicePath = aFileUri.devicePath();
- //Test for workspace location.
- if (!devicePath.startsWith(METADATA_LOCATION) &&
- devicePath.startsWith(WORKSPACE_ROOT_LOCATION) && devicePath.length() > WORKSPACE_ROOT_LOCATION.length()) {
- //test for workspace location
- result = normalizeToWorkspaceURI(new Path(devicePath.substring(WORKSPACE_ROOT_LOCATION.length())), fragment);
- } else if (aFileUri.isRelative()) {
- result = normalizeToWorkspaceURI(new Path(aFileUri.toString()), fragment);
- } else {
- result = aFileUri;
- }
- return result;
- }
-
- protected URI appendFragment(URI result, String fragment) {
- if (fragment != null)
- return result.appendFragment(fragment);
- else
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter#getOutputFileWithMappingApplied(java.lang.String)
- */
- public IFile getOutputFileWithMappingApplied(String uri) {
- URI converted = getInternalURIMap().getURI(URI.createURI(uri));
- return getOutputFile(new Path(converted.toString()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl#createPlatformResourceOutputStream(java.lang.String)
- */
- public OutputStream createPlatformResourceOutputStream(String platformResourcePath) throws IOException {
- IFile file = WORKSPACE_ROOT.getFile(new Path(platformResourcePath));
- ProjectUtilities.ensureContainerNotReadOnly(file);
- return new WorkbenchByteArrayOutputStream(file, resourceSetSynchronizer);
- }
-
- protected URI getContainerRelativeURI(IFile aFile) {
- IPath path = WorkbenchResourceHelperBase.getPathFromContainers(inputContainers, aFile.getFullPath());
- if (path != null)
- return URI.createURI(path.toString());
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.URIConverterImpl#createPlatformResourceInputStream(java.lang.String)
- */
- public InputStream createPlatformResourceInputStream(String platformResourcePath) throws IOException {
- IFile file = WORKSPACE_ROOT.getFile(new Path(platformResourcePath));
- try {
- if (!file.isLocal(IResource.DEPTH_ONE) || !file.isSynchronized(IResource.DEPTH_ONE)) {
- try {
- File iofile = file.getFullPath().toFile();
- if (iofile.exists() || file.exists())
- file.refreshLocal(IResource.DEPTH_ONE, null);
- } catch (CoreException ce) {
- if (ce.getStatus().getCode() != IResourceStatus.WORKSPACE_LOCKED)
- throw ce;
- }
- }
- return file.getContents();
- } catch (CoreException exception) {
- throw new Resource.IOWrappedException(exception);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/nature/EMFNature.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/nature/EMFNature.java
deleted file mode 100644
index a34a2a4..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/emf/workbench/nature/EMFNature.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: EMFNature.java,v $$
- * $$Revision: 1.3 $$ $$Date: 2005/01/26 18:45:51 $$
- */
-package org.eclipse.jem.util.emf.workbench.nature;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMLParserPool;
-import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
-
-import org.eclipse.jem.internal.util.emf.workbench.nature.EMFNatureRegistry;
-import org.eclipse.jem.util.emf.workbench.*;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * The base EMFNature.
- * <p>
- * This is expected to be subclassed by clients, but there are default subclasses available.
- * </p>
- *
- * @since 1.0.0
- */
-public abstract class EMFNature implements IProjectNature, IEMFContextContributor {
-
- protected IProject project;
-
- protected EMFWorkbenchContextBase emfContext;
-
- protected boolean hasConfigured = false;
-
- public static XMLParserPool SHARED_PARSER_POOL = new XMLParserPoolImpl();
-
- public EMFNature() {
- super();
- }
-
- /**
- * Add the nature id to the project.
- *
- * @param proj
- * @param natureId
- * @throws CoreException
- *
- * @since 1.0.0
- */
- protected static void addNatureToProject(IProject proj, String natureId) throws CoreException {
- ProjectUtilities.addNatureToProject(proj, natureId);
- }
-
- /**
- * Configures the project with this nature. This is called by <code>IProject.addNature</code> and should not be called directly by clients. The
- * nature extension id is added to the list of natures on the project by <code>IProject.addNature</code>, and need not be added here.
- *
- * <p>
- * All subtypes must call super. The better way for subtypes is to override primConfigure instead.
- * </p>
- *
- * @throws CoreException
- * @since 1.0.0
- */
- public void configure() throws org.eclipse.core.runtime.CoreException {
- if (!hasConfigured) {
- hasConfigured = true;
- primConfigure();
- }
- }
-
- /**
- * Called from configure the first time configure is called on the nature. Default is do nothing. Subclasses should override and add in their own
- * configuration.
- *
- * @throws org.eclipse.core.runtime.CoreException
- *
- * @since 1.0.0
- */
- protected void primConfigure() throws org.eclipse.core.runtime.CoreException {
-
- }
-
- /**
- * Create an EMF context for the project.
- *
- * @throws CoreException
- *
- * @since 1.0.0
- */
- protected void createEmfContext() throws CoreException {
- WorkbenchResourceHelperBase.createEMFContext(getProject(), this);
- }
-
- /**
- * Create a folder relative to the project based on aProjectRelativePathString.
- *
- * @param aProjectRelativePathString
- * @return
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public IFolder createFolder(String aProjectRelativePathString) throws CoreException {
- if (aProjectRelativePathString != null && aProjectRelativePathString.length() > 0)
- return createFolder(new Path(aProjectRelativePathString));
- return null;
- }
-
- /**
- * Create a folder relative to the project based on aProjectRelativePathString.
- *
- * @param aProjectRelativePath
- * @return
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public IFolder createFolder(IPath aProjectRelativePath) throws CoreException {
- if (aProjectRelativePath != null && !aProjectRelativePath.isEmpty()) {
- IFolder folder = getWorkspace().getRoot().getFolder(getProjectPath().append(aProjectRelativePath));
- if (!folder.exists()) {
- ProjectUtilities.ensureContainerNotReadOnly(folder);
- folder.create(true, true, null);
- }
- return folder;
- }
- return null;
- }
-
- /**
- * Removes this nature from the project, performing any required deconfiguration. This is called by <code>IProject.removeNature</code> and
- * should not be called directly by clients. The nature id is removed from the list of natures on the project by
- * <code>IProject.removeNature</code>, and need not be removed here.
- *
- * @throws CoreException
- * @since 1.0.0
- */
- public void deconfigure() throws org.eclipse.core.runtime.CoreException {
- emfContext = null;
- }
-
- /**
- * Return true if the IFile with the given name exists in this project.
- *
- * @param aFileName
- * filename can be relative to one of the input file paths for the WorkbenchURIConverter.
- * @return <code>true</code> if filename exists in this project
- *
- * @since 1.0.0
- */
- public boolean fileExists(String aFileName) {
- if (aFileName == null)
- return false;
-
- IPath path = new Path(aFileName);
- if (path.isAbsolute())
- return ResourcesPlugin.getWorkspace().getRoot().getFile(path).exists();
- else
- return getWorkbenchURIConverter().canGetUnderlyingResource(aFileName);
- }
-
- /**
- * Get the resource set for the project
- *
- * @return
- *
- * @since 1.0.0
- */
- public ResourceSet getResourceSet() {
- return getEmfContextBase().getResourceSet();
- }
-
- /**
- * Returns the EMF root folder for the project. Defaults to the project. Subclasses can override.
- *
- * @return EMF root folder for the project.
- *
- * @since 1.0.0
- */
- public IContainer getEMFRoot() {
- return getProject();
- }
-
- /**
- * Used for optimizations; answers whether a mof context for this nature has exists yet
- *
- * @deprecated use hasResourceSet();
- * @since 1.0.0
- */
- public boolean hasContext() {
- return hasResourceSet();
- }
-
- /**
- * Is there a resource set yet for the project.
- *
- * @return <code>true</code> if there is a resource set for the project.
- *
- * @since 1.0.0
- */
- public boolean hasResourceSet() {
- return emfContext != null && emfContext.hasResourceSet();
- }
-
- /**
- * Lazy initializer; for migration of existing workspaces where configure will never get called.
- *
- * @return context base for the project.
- *
- * @since 1.0.0
- */
- protected EMFWorkbenchContextBase getEmfContextBase() {
- if (emfContext == null) {
- try {
- createEmfContext();
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- }
- }
- return emfContext;
- }
-
- /**
- * Get the IFile with the given name if it is in this project.
- *
- * @param aFileName
- * filename can be relative to one of the input file paths for the WorkbenchURIConverter.
- * @return file it it is in this project, or <code>null</code> if it doesn't.
- *
- * @since 1.0.0
- */
- public IFile getFile(String aFileName) {
- return getWorkbenchURIConverter().getFile(aFileName);
- }
-
- /**
- * Return the nature's ID.
- *
- * @return nature id
- *
- * @since 1.0.0
- */
- public abstract String getNatureID();
-
- /**
- * Return the ID of the plugin that this nature is contained within.
- *
- * @return
- *
- * @since 1.0.0
- */
- protected abstract String getPluginID();
-
- /**
- * Returns the project to which this project nature applies.
- *
- * @return the project handle
- * @since 1.0.0
- */
- public org.eclipse.core.resources.IProject getProject() {
- return project;
- }
-
- /**
- * Return the full path of the project.
- *
- * @return full project path (relative to workspace)
- * @since 1.0.0
- */
- public IPath getProjectPath() {
- return getProject().getFullPath();
- }
-
- /**
- * Get the server property of the project from the supplied key
- *
- * @param key
- * java.lang.String
- * @deprecated we cannont use persistent properties because they are not stored in the repository
- * @since 1.0.0
- */
- protected String getProjectServerValue(String key) {
- if (key == null)
- return null;
- try {
- QualifiedName wholeName = qualifiedKey(key);
- return getProject().getPersistentProperty(wholeName);
- } catch (CoreException exception) {
- //If we can't find it assume it is null
- exception.printStackTrace();
- return null;
- }
- }
-
- /**
- * Get WorkbenchURIConverter for this project.
- * <p>
- * This method assumes the URIConverter on the ResourceSet is the one that was created for the ResourceSet on behalf of this nature runtime.
- * </p>
- *
- * @return
- *
- * @since 1.0.0
- */
- protected WorkbenchURIConverter getWorkbenchURIConverter() {
- return (WorkbenchURIConverter) getResourceSet().getURIConverter();
- }
-
- public IWorkspace getWorkspace() {
- return getProject().getWorkspace();
- }
-
- /**
- * @deprecated use getResource(URI)
- */
- public Resource getXmiResource(String uri) {
- return getResource(URI.createURI(uri));
- }
-
- /**
- * Get the resource for this uri. It will use the resource set of the project to find it. It will load if not already loaded.
- *
- * @param uri
- * @return resource or <code>null</code> if resource is not found.
- *
- * @since 1.0.0
- */
- public Resource getResource(URI uri) {
- try {
- return getResourceSet().getResource(uri, true);
- } catch (WrappedException ex) {
- if (!WorkbenchResourceHelperBase.isResourceNotFound(ex))
- throw ex;
- }
- return null;
- }
-
- /**
- * @deprecated use getResourceSet()
- */
- public ResourceSet getXmiResourceSet() {
- return getResourceSet();
- }
-
- /**
- * Make sure that all dependent components are initialized before creating the ResourceSet.
- */
- protected void initializeDependentComponents() {
- //com.ibm.etools.java.init.JavaInit.init();
- }
-
- /**
- * @deprecated use createResource(URI)
- */
- public Resource makeXmiResource(String uri) {
- return createResource(URI.createURI(uri));
- }
-
- /**
- * @deprecated use createResource(URI)
- */
- public Resource makeXmiResource(String uri, EList anExtent) {
- Resource res = makeXmiResource(uri);
- if (res != null)
- res.getContents().addAll(anExtent);
- return res;
- }
-
- /**
- * Create the resource for this uri. It will use the resource set of the project to create it.
- *
- * @param uri
- * @return resource
- *
- * @since 1.0.0
- */
- public Resource createResource(URI uri) {
- return getResourceSet().createResource(uri);
- }
-
- /*
- * Return the QualifedValue for key for storage in the repository. The key is qualifed with the package name to avoid collision. @return
- * QualifedName @param key java.lang.String
- */
- private QualifiedName qualifiedKey(String key) {
- return new QualifiedName(getPluginID(), key);
- }
-
- /**
- * Register the given nature id as an EMFNature.
- *
- * @param natureID
- *
- * @since 1.0.0
- */
- public static void registerNatureID(String natureID) {
- EMFNatureRegistry.singleton().REGISTERED_NATURE_IDS.add(natureID);
- }
-
- /**
- * Sets the project to which this nature applies. Used when instantiating this project nature runtime. This is called by
- * <code>IProject.addNature</code> and should not be called directly by clients.
- *
- * @param project
- * the project to which this nature applies
- *
- * @since 1.0.0
- */
- public void setProject(org.eclipse.core.resources.IProject newProject) {
- project = newProject;
- }
-
- /**
- * Set the server property of the project from the supplied value
- *
- * @param key
- * java.lang.String
- * @param value
- * String
- * @deprecated we cannont use persistent properties because they are not stored in the repository
- */
- protected void setProjectServerValue(String key, String value) {
- if (key != null) {
- try {
- QualifiedName wholeName = qualifiedKey(key);
- getProject().setPersistentProperty(wholeName, value);
- } catch (CoreException exception) {
- //If we can't find it assume it is null
- exception.printStackTrace();
- return;
- }
- }
- }
-
- /**
- * Shutdown the EMF nature
- *
- *
- * @since 1.0.0
- */
- public void shutdown() {
- if (getResourceSet() != null)
- ((ProjectResourceSet) getResourceSet()).release();
- }
-
- /**
- * Return a list of EMFNatures based on the natures that have been configured for this project.
- *
- * @return List of EMFNatures
- * @param project
- * @return list of natures configured for the project.
- * @since 1.0.0
- */
- public static List getRegisteredRuntimes(IProject project) {
- List result = null;
- EMFNature nature = null;
- if (project != null && project.isAccessible()) {
- String natureID;
- Iterator it = EMFNatureRegistry.singleton().REGISTERED_NATURE_IDS.iterator();
- while (it.hasNext()) {
- natureID = (String) it.next();
- try {
- nature = (EMFNature) project.getNature(natureID);
- } catch (CoreException e) {
- }
- if (nature != null) {
- if (result == null)
- result = new ArrayList(2);
- result.add(nature);
- }
- }
- }
- return result == null ? Collections.EMPTY_LIST : result;
- }
-
- /**
- * Return a list of nature ids based on the natures that have been configured for this project.
- *
- * @return list of configured nature ids.
- * @param project
- */
- public static List getRegisteredRuntimeIDs(IProject project) {
- List result = null;
- String natureID = null;
- if (project != null && project.isAccessible()) {
- Iterator it = EMFNatureRegistry.singleton().REGISTERED_NATURE_IDS.iterator();
- while (it.hasNext()) {
- natureID = (String) it.next();
- try {
- if (project.hasNature(natureID)) {
- if (result == null)
- result = new ArrayList(2);
- result.add(natureID);
- }
- } catch (CoreException e) {
- }
- }
- }
- return result == null ? Collections.EMPTY_LIST : result;
- }
-
- /**
- * Return if the project has the given nature.
- *
- * @param project
- * @param natureId
- * @return <code>true</code> if project has given nature
- *
- * @since 1.0.0
- */
- public static boolean hasRuntime(IProject project, String natureId) {
- if (project == null || !project.isAccessible())
- return false;
- try {
- return project.hasNature(natureId);
- } catch (CoreException e) {
- return false;
- }
- }
-
- /**
- * Return if the project has any one of the possible given nature ids.
- *
- * @param project
- * @param possibleNatureIds
- * @return <code>true</code> if at least one of the possible natures id is configured for the project.
- *
- * @since 1.0.0
- */
- public static boolean hasRuntime(IProject project, String[] possibleNatureIds) {
- if (project != null) {
- for (int i = 0; i < possibleNatureIds.length; i++) {
- if (hasRuntime(project, possibleNatureIds[i]))
- return true;
- }
- }
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
deleted file mode 100644
index 7d4d752..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/AbstractWorkBenchRenderer.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: AbstractWorkBenchRenderer.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.logger.proxy.*;
-
-
-/**
- * Base log renderer that logs to the workbench.
- *
- * @since 1.1.0
- */
-public abstract class AbstractWorkBenchRenderer implements ILogRenderer2 {
-
- private boolean fTraceMode = false; // will we actually punch trace messaged or not
-
- private boolean fSettingTrace = false;
-
- protected Bundle fMyBundle = null;
-
- protected Logger fMyLogger = null;
-
- protected ILog fWorkBenchLogger = null;
-
- /**
- * Constructer taking a logger.
- *
- * @param logger
- *
- * @since 1.1.0
- */
- public AbstractWorkBenchRenderer(Logger logger) {
- super();
- fMyLogger = logger;
- fTraceMode = fMyLogger.getTraceMode();
-
- String pluginID = fMyLogger.getPluginID();
- fMyBundle = Platform.getBundle(pluginID);
- if (fMyBundle == null)
- throw new RuntimeException("Invalid Plugin ID"); //$NON-NLS-1$
-
- fWorkBenchLogger = Platform.getLog(fMyBundle);
- setTraceMode(fMyLogger.getTraceMode() || isDebugging(fMyBundle));
- fMyLogger.setRenderer(this);
- }
-
- /*
- * This used to come from the Plugin instance. But in new OSGi, there is not necessarily a Plugin instance. So use the same logic they use.
- */
- private boolean isDebugging(Bundle bundle) {
- String symbolicName = bundle.getSymbolicName();
- if (symbolicName != null) {
- String key = symbolicName + "/debug"; //$NON-NLS-1$
- String value = Platform.getDebugOption(key);
- return value == null ? false : value.equalsIgnoreCase("true"); //$NON-NLS-1$
- }
- return false;
- }
-
- /**
- * Is the console log for eclipse turned on to sysout. If true, then we shouldn't log to console anything already logged because Eclipse would of
- * logged it for us. This comes from the -Declipse.consoleLog="true" which is the default when starting eclipse from PDE.
- */
- protected static final boolean consoleLogOn = "true".equals(System.getProperty(EclipseStarter.PROP_CONSOLE_LOG));
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#setTraceMode(boolean)
- */
- public void setTraceMode(boolean flag) {
- if (fSettingTrace)
- return; // Do not allow cycles
-
- fSettingTrace = true;
- fTraceMode = flag;
- fMyLogger.setTraceMode(flag);
- fSettingTrace = false;
- }
-
- // The following methods are for historical renderers in case this has been subclassed outside
- // of util.
-
- /**
- * Log a string to the trace.
- *
- * @param param
- * @return
- *
- * @since 1.0.0
- */
- public abstract String log(String param);
-
- /**
- * Default one that log a string to the trace given a level. Default simply passes it to log(String) so that we don't break old subclasses.
- * <p>
- * If loggedToWorkbench is true, then it shouldn't be logged to console if consoleLogOn is true because workbench already logged to console.
- *
- * @param msg
- * @param l
- *
- * @since 1.0.0
- */
- protected void log(String msg, Level l, boolean loggedToWorkbench) {
- log(msg);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer#log(java.lang.String, int)
- */
- public String log(String msg, int type) {
-
- String target = logWorkBench(msg, type);
- if (fTraceMode || target.equals(NOLOG_DESCRIPTION))
- return log(msg);
- else
- return target;
- }
-
- /**
- * Log to workbench, a string of the given level <code>ILogRenderer.LOG_</code>. levels.
- *
- * @param msg
- * @param type
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @see ILogRenderer#LOG_ERROR and all of the other log types.
- * @see ILogRenderer#CONSOLE_DESCRIPTION
- * @since 1.0.0
- */
- public String logWorkBench(String msg, int type) {
-
- try {
- int ErrCode;
- if (fWorkBenchLogger != null) {
- switch (type) {
- case (ILogRenderer.LOG_ERROR):
- ErrCode = IStatus.ERROR;
- break;
- case (ILogRenderer.LOG_WARNING):
- ErrCode = IStatus.WARNING;
- break;
- case (ILogRenderer.LOG_INFO):
- ErrCode = IStatus.INFO;
- break;
- case (ILogRenderer.LOG_TRACE):
- ErrCode = IStatus.OK;
- break;
- default:
- throw new RuntimeException("Invalid Log Type"); //$NON-NLS-1$
- }
- Status status = new Status(ErrCode, fMyBundle.getSymbolicName(), IStatus.OK, msg, null);
- fWorkBenchLogger.log(status);
- return WORKBENCH_DESCRIPTION;
- } else
- return NOLOG_DESCRIPTION;
- } catch (Throwable t) {
- return NOLOG_DESCRIPTION;
- }
- }
-
- // Default implentation of the ILogRenderer2 interface.
- protected boolean isLogging(Level level) {
- return fTraceMode || fMyLogger.isLoggingLevel(level);
- }
-
- private static final int[] STATUS_LEVEL;
-
- private static final Level[] STATUS_LEVEL_LOOKUP;
-
- private static final Level[] LEVEL_STATUS;
-
- static {
- // Status levels that correspond to the log levels, from finest to none, same indexes as from STATUS_LEVEL_LOOKUP.
- STATUS_LEVEL_LOOKUP = new Level[] { Level.INFO, Level.WARNING, Level.SEVERE};
- STATUS_LEVEL = new int[] { IStatus.INFO, IStatus.WARNING, IStatus.ERROR};
-
- // Levels that correspond to the IStatus levels.
- int maxID = Math.max(IStatus.OK, Math.max(IStatus.INFO, Math.max(IStatus.WARNING, IStatus.ERROR)));
- LEVEL_STATUS = new Level[maxID + 1];
- LEVEL_STATUS[IStatus.OK] = Level.FINE;
- LEVEL_STATUS[IStatus.INFO] = Level.INFO;
- LEVEL_STATUS[IStatus.WARNING] = Level.WARNING;
- LEVEL_STATUS[IStatus.ERROR] = Level.SEVERE;
- }
-
- /**
- * Return the Java Level for the status code from the given IStatus.
- *
- * @param status
- * @return the Java Level
- *
- * @since 1.0.0
- */
- protected Level getLogLevel(IStatus status) {
- return LEVEL_STATUS[status.getSeverity()];
- }
-
- /**
- * Return the IStatus status code for the given Java Level.
- *
- * @param logLevel
- * @return the IStatus status code.
- *
- * @since 1.0.0
- */
- protected int getStatusSeverity(Level logLevel) {
- for (int i = 0; i < STATUS_LEVEL_LOOKUP.length; i++) {
- if (STATUS_LEVEL_LOOKUP[i] == logLevel)
- return STATUS_LEVEL[i];
- }
- return IStatus.OK; // Default to ok.
- }
-
- /**
- * Log the string to the workbench for the given level
- *
- * @param msg
- * @param level
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.1.0
- */
- protected String logWorkbench(String msg, Level level) {
- String result = NOLOG_DESCRIPTION;
- // Test again because we could be here simply due to trace mode, in which case we
- // don't want to workbench log it.
- if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(new Status(getStatusSeverity(level), fMyBundle.getSymbolicName(), 0, msg, null));
- result = WORKBENCH_DESCRIPTION;
- if (fTraceMode)
- log(msg, level, true);
- } else if (fTraceMode)
- log(msg, level, false);
- return result;
- }
-
- private String getStatusMsg(IStatus s, Level l) {
- if (s.getException() != null)
- return fMyLogger.getGenericMsg(s.toString() + fMyLogger.fLineSeperator + fMyLogger.exceptionToString(s.getException()), l);
- else
- return fMyLogger.getGenericMsg(s.toString(), l);
- }
-
- /**
- * Log the IStatus to the workbench at the given level.
- *
- * @param s
- * @param level
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.0.0
- */
- protected String logWorkbench(IStatus s, Level level) {
- if (level == DEFAULT)
- level = getLogLevel(s);
- String result = NOLOG_DESCRIPTION;
- // Test again because we could be here simply due to trace mode, in which case we
- // don't want to workbench log it.
- if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(s);
- result = WORKBENCH_DESCRIPTION;
- if (fTraceMode)
- log(getStatusMsg(s, level), level, true);
- } else if (fTraceMode)
- log(getStatusMsg(s, level), level, false);
- return result;
- }
-
- /**
- * Log to the workbench the Throwable at the given level.
- *
- * @param t
- * @param level
- * @return description of the log's destination e.g., <code>CONSOLE_DESCRIPTION</code>
- *
- * @since 1.0.0
- */
- protected String logWorkbench(Throwable t, Level level) {
- String result = NOLOG_DESCRIPTION;
- // Test again because we could be here simply due to trace mode, in which case we
- // don't want to workbench log it.
- if (fMyLogger.isLoggingLevel(level)) {
- Platform.getLog(fMyBundle).log(new Status(getStatusSeverity(level), fMyBundle.getSymbolicName(), 0, "Exception thrown.", t));
- result = WORKBENCH_DESCRIPTION;
- if (fTraceMode)
- log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level, true);
- } else if (fTraceMode)
- log(fMyLogger.getGenericMsg(fMyLogger.exceptionToString(t), level), level, false);
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(byte, java.util.logging.Level)
- */
- public String log(boolean b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(byte, java.util.logging.Level)
- */
- public String log(byte b, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(b), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(char, java.util.logging.Level)
- */
- public String log(char c, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(c), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(double, java.util.logging.Level)
- */
- public String log(double d, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(d), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(float, java.util.logging.Level)
- */
- public String log(float f, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(f), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(int, java.util.logging.Level)
- */
- public String log(int i, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(i), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(long, java.util.logging.Level)
- */
- public String log(long l, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(l), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Object, java.util.logging.Level)
- */
- public String log(Object o, Level level) {
- if (o instanceof IStatus)
- return logWorkbench((IStatus) o, level);
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(o), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(short, java.util.logging.Level)
- */
- public String log(short s, Level level) {
- if (level == DEFAULT)
- level = Level.FINEST;
- if (isLogging(level))
- return logWorkbench(fMyLogger.getGenericMsg(String.valueOf(s), level), level);
- else
- return NOLOG_DESCRIPTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxy.ILogRenderer2#log(java.lang.Throwable, java.util.logging.Level)
- */
- public String log(Throwable t, Level level) {
- if (t instanceof CoreException)
- return logWorkbench(((CoreException) t).getStatus(), level);
- if (level == DEFAULT)
- level = Level.SEVERE;
- if (isLogging(level)) {
- return logWorkbench(t, level);
- } else
- return NOLOG_DESCRIPTION;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/ConsoleLogRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/ConsoleLogRenderer.java
deleted file mode 100644
index 9c0b0d9..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/ConsoleLogRenderer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: ConsoleLogRenderer.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.util.logging.Level;
-
-import org.eclipse.jem.util.logger.proxy.ILogRenderer;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Log renderer to the console.
- *
- * @since 1.0.0
- */
-public class ConsoleLogRenderer extends AbstractWorkBenchRenderer {
-
- /**
- * Constructor taking a logger.
- *
- * @param logger
- *
- * @since 1.0.0
- */
- public ConsoleLogRenderer(Logger logger) {
- super(logger);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String)
- */
- public String log(String msg) {
-
- System.out.println(msg);
- return ILogRenderer.CONSOLE_DESCRIPTION;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String, java.util.logging.Level, boolean)
- */
- protected void log(String msg, Level l, boolean loggedToWorkbench) {
- if (!loggedToWorkbench || !consoleLogOn) {
- if (l == Level.SEVERE)
- System.err.println(msg);
- else
- System.out.println(msg);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/DefaultPluginTraceRenderer.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/DefaultPluginTraceRenderer.java
deleted file mode 100644
index 9fc927b..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/DefaultPluginTraceRenderer.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: DefaultPluginTraceRenderer.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.io.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Logger that also logs to a trace file in the plugin's metadata area.
- *
- * @since 1.0.0
- */
-public class DefaultPluginTraceRenderer extends AbstractWorkBenchRenderer {
-
- /**
- * Name of the trace file in the metadata area.
- *
- * @since 1.0.0
- */
- public static final String PluginTraceFileName = "/.log"; //$NON-NLS-1$
-
- private String fTraceFile = null;
-
- private PrintWriter traceFile = null;
-
- /**
- * DefaultUILogRenderer constructor.
- *
- * @param logger
- */
- public DefaultPluginTraceRenderer(Logger logger) {
- super(logger);
-
- fTraceFile = Platform.getStateLocation(fMyBundle).toString() + PluginTraceFileName;
- (new File(fTraceFile)).delete(); // Start from fresh ... do not want to leak on disk space
-
- }
-
- private void closeTraceFile() {
- if (traceFile == null)
- return;
- try {
- traceFile.flush();
- traceFile.close();
- } finally {
- traceFile = null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String)
- */
- public String log(String msg) {
-
- System.out.println(msg);
-
- openTraceFile();
- if (traceFile != null) {
- traceFile.println(msg);
- closeTraceFile();
- }
- return fTraceFile;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.logger.proxyrender.AbstractWorkBenchRenderer#log(java.lang.String, java.util.logging.Level, boolean)
- */
- protected void log(String msg, Level l, boolean loggedToWorkbench) {
- if (!loggedToWorkbench || !consoleLogOn) {
- if (l == Level.SEVERE)
- System.err.println(msg);
- else
- System.out.println(msg);
- }
-
- openTraceFile();
- if (traceFile != null) {
- traceFile.println(msg);
- closeTraceFile();
- }
- }
-
- private void openTraceFile() {
- try {
- traceFile = new PrintWriter(new FileOutputStream(fTraceFile, true));
- } catch (IOException e) {
- // there was a problem opening the log file so log to the console
- traceFile = null;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
deleted file mode 100644
index 8161a29..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/EclipseLogger.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: EclipseLogger.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * Get an Eclipse logger. This gets a logger that knows it is for a plugin.
- *
- * For each plugin, the following can be specified in the .option file:
- * {plugin-id}/debug/logTrace
- * The values valid for this are "true", "false", or "default". If true then loggers will be set into
- * trace mode. This means everything logged (even those that are filtered out due to not meeting log level)
- * will be traced out. If the value is "true" they will be traced to the system console.
- * If it is "default" or not set at all, then it will be the value in the "org.eclipse.jem.util/debug/logTrace" .options setting.
- * If not set there, then default value will be false.
- *
- * {plugin-id}/debug/logTraceFile
- * The values valid for this are "true", "false", or "default". If true then loggers will trace to
- * the system console AND to the ".log" file in the plugins work area in the metadata section of the workspace.
- * If "false" then not traced to a trace file.
- * If it is "default" or not set at all, then it will be the value in the "org.eclipse.jem.util/debug/logTraceFile" .options setting.
- * If not set there, then default value will be false.
- *
- * {plugin-id}.debug/logLevel
- * The values valid for this are the names from <code>java.util.logging.Level</code>, and "default". These
- * are the trace cutoff levels to use. For instance, if the level was SEVERE, then only level SEVERE msgs
- * are logged. The rest are skipped. Or if the level was WARNING, then only level SEVERE and WARNING are
- * logged.
- * If it is "default" or not set at all, then it will be the value in the "org.eclipse.jem.util/debug/logLevel" .options setting.
- * If not set there, then default value will be WARNING.
- *
- *
- * @since 1.0.0
- */
-public class EclipseLogger extends Logger {
-
- public static final String DEBUG_TRACE_OPTION = "/debug/logtrace"; //$NON-NLS-1$
- public static final String DEBUG_TRACE_FILE_OPTION = "/debug/logtracefile";
- public static final String DEBUG_LOG_LEVEL_OPTION = "/debug/loglevel"; // The logging level to use when no Hyaedes. (which we don't support at this time).
- public static final String DEFAULT_OPTION = "default"; // If option value is this, then the value from WTP Common plugin options will be used for both logTrace and logLevel.
-
- /**
- * Return a logger based upon the Plugin.
- * @param plugin
- * @return
- *
- * @since 1.0.0
- */
- public static Logger getEclipseLogger(Plugin plugin) {
- return getEclipseLogger(plugin.getBundle());
- }
-
- /**
- * Return a logger based upon the bundle.
- *
- * @param bundle
- * @return
- *
- * @since 1.0.0
- */
- public static Logger getEclipseLogger(Bundle bundle) {
- String id = bundle.getSymbolicName();
- Logger logger = getLoggerIfExists(id);
- if (logger != null)
- return logger;
-
- logger = getLogger(id); // Create one, we will now customize it.
-
- String pluginOption = Platform.getDebugOption(id + DEBUG_TRACE_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption))
- pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_TRACE_OPTION);
- boolean logTrace = "true".equalsIgnoreCase(pluginOption);
-
- pluginOption = Platform.getDebugOption(id + DEBUG_TRACE_FILE_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption))
- pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_TRACE_FILE_OPTION);
- boolean logTraceFile = "true".equalsIgnoreCase(pluginOption);
-
- pluginOption = Platform.getDebugOption(id + DEBUG_LOG_LEVEL_OPTION);
- if (pluginOption == null || "default".equalsIgnoreCase(pluginOption))
- pluginOption = Platform.getDebugOption(JEMUtilPlugin.getDefault().getBundle().getSymbolicName() + DEBUG_LOG_LEVEL_OPTION);
-
- Level logLevel = Level.WARNING;
- if (pluginOption != null) {
- try {
- logLevel = Level.parse(pluginOption);
- } catch (IllegalArgumentException e) {
- }
- }
-
- if (logTrace)
- logger.setTraceMode(true);
- logger.setLevel(logLevel);
- if (!logTraceFile)
- logger.setRenderer(new ConsoleLogRenderer(logger));
- else
- logger.setRenderer(new DefaultPluginTraceRenderer(logger));
-
- return logger;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/IMsgLogger.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/IMsgLogger.java
deleted file mode 100644
index 5f57eba..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/logger/proxyrender/IMsgLogger.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: IMsgLogger.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.jem.util.logger.proxyrender;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Interface for a message logger.
- *
- * @since 1.0.0
- */
-public interface IMsgLogger {
- public Logger getMsgLogger();
-}
diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java
deleted file mode 100644
index 55168d8..0000000
--- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $$RCSfile: JEMUtilPlugin.java,v $$
- * $$Revision: 1.1 $$ $$Date: 2005/01/07 20:19:23 $$
- */
-package org.eclipse.jem.util.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.internal.util.emf.workbench.WorkspaceResourceNotifier;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Plugin for EMFWorkbench utils.
- *
- * @since 1.0.0
- */
-public class JEMUtilPlugin extends Plugin {
-
- public static final String ID = "org.eclipse.jem.util"; //$NON-NLS-1$
-
- /**
- * Plugin id of this plugin.
- *
- * @since 1.0.0
- */
- public static final String PLUGIN_ID = ID;
-
- /**
- * UI Context extension point.
- *
- * @since 1.0.0
- */
- public static final String UI_CONTEXT_EXTENSION_POINT = "uiContextSensitiveClass"; //$NON-NLS-1$
-
- /**
- * UITester element name.
- *
- * @since 1.0.0
- */
- public static final String UI_TESTER_EXTENSION_POINT = "uiTester"; //$NON-NLS-1$
-
- /**
- * Protocol for workspace
- *
- * @since 1.0.0
- */
- public static final String WORKSPACE_PROTOCOL = "workspace"; //$NON-NLS-1$
-
- /**
- * Protocol for platform uri's. i.e. "platform:/..."
- *
- * @since 1.0.0
- *
- */
- public static final String PLATFORM_PROTOCOL = "platform"; //$NON-NLS-1$
-
- /**
- * Resource indication in platform protocol. Indicates url is for a resource in the workspace. i.e. "platform:/resource/projectname/..."
- *
- * @since 1.0.0
- */
- public static final String PLATFORM_RESOURCE = "resource"; //$NON-NLS-1$
-
- /**
- * Plugin indication in platform protocol. Indicates url is for a file/directory in the plugins area. i.e. "platform:/plugin/pluginid/..."
- *
- * @since 1.0.0
- */
- public static final String PLATFORM_PLUGIN = "plugin"; //$NON-NLS-1$
-
- private static WorkspaceResourceNotifier sharedCache;
-
- private static ResourceSet pluginResourceSet;
-
- private static String[] GLOBAL_LOADING_PLUGIN_NAMES;
-
- private static JEMUtilPlugin DEFAULT;
-
- public JEMUtilPlugin() {
- super();
- DEFAULT = this;
- }
-
- /**
- * Get the workspace. Just use ResourcePlugin.getWorkspace() instead.
- *
- * @return
- *
- * @since 1.0.0
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Get the plugin instance.
- *
- * @return plugin instance.
- *
- * @since 1.0.0
- */
- public static JEMUtilPlugin getDefault() {
- return DEFAULT;
- }
-
- /**
- * Gets the sharedCache.
- * <p>
- * This is not meant to be called by clients.
- * </p>
- *
- * @return a WorkspaceResourceNotifier
- * @since 1.0.0
- */
- public static WorkspaceResourceNotifier getSharedCache() {
- if (sharedCache == null)
- sharedCache = new WorkspaceResourceNotifier();
- return sharedCache;
- }
-
- /**
- * Sets the sharedCache.
- * <p>
- * This is not meant to be called by clients.
- * </p>
- *
- * @param sharedCache
- * The sharedCache to set
- * @since 1.0.0
- */
- public static void setSharedCache(WorkspaceResourceNotifier aSharedCache) {
- sharedCache = aSharedCache;
- }
-
- /**
- * @deprecated use createIsolatedResourceSet(IProject)
- */
- public static ResourceSet createIsolatedResourceSet() {
- return null;
- }
-
- /**
- * Add an Adapter. You can use this api to listen for any shared resource being loaded or removed from any ProjectResourceSet in the Workbench
- * instead of trying to listen to each individual ProjectResourceSet.
- *
- * @param adapter
- *
- * @since 1.0.0
- */
- public static void addWorkspaceEMFResourceListener(Adapter adapter) {
- if (adapter != null && !getSharedCache().eAdapters().contains(adapter))
- getSharedCache().eAdapters().add(adapter);
- }
-
- /**
- * Removes the adapter.
- *
- * @param adapter
- *
- * @see #addWorkspaceEMFResourceListener(Adapter)
- * @since 1.0.0
- */
- public static void removeWorkspaceEMFResourceListener(Adapter adapter) {
- if (adapter != null)
- getSharedCache().eAdapters().remove(adapter);
- }
-
- /**
- * Is this plugin active.
- *
- * @return <code>true</code> if active
- *
- * @since 1.0.0
- */
- public static boolean isActivated() {
- Bundle bundle = Platform.getBundle(ID);
- if (bundle != null)
- return bundle.getState() == Bundle.ACTIVE;
- return false;
- }
-
- /**
- * This method will be called when a WorkbenchContext is instantiated on an EMFNature.
- * <p>
- * This not meant to be called by clients.
- * </p>
- *
- * @param aResourceSet
- *
- * @see plugin.xml#ResourceHandlerExtension extension point.
- * @since 1.0.0
- */
- public void addExtendedResourceHandlers(ProjectResourceSet aResourceSet) {
- if (aResourceSet == null)
- return;
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint(getBundle().getSymbolicName(), "ResourceHandlerExtension"); //$NON-NLS-1$
- IExtension[] extension = pct.getExtensions();
- IExtension config;
- for (int l = 0; l < extension.length; ++l) {
- config = extension[l];
- IConfigurationElement[] cElems = config.getConfigurationElements();
- ResourceHandler handler = null;
- for (int i = 0; i < cElems.length; i++) {
- try {
- handler = (ResourceHandler) cElems[i].createExecutableExtension("run"); //$NON-NLS-1$
-
- } catch (Exception ex) {
- handler = null;
- }
- if (handler != null)
- aResourceSet.add(handler);
- }
- }
- }
-
- /**
- * Get the project resource set for the plugin (there is one for the whole system).
- *
- * @return system-wide resource set.
- * @since 1.0.0
- */
- public static ResourceSet getPluginResourceSet() {
- if (pluginResourceSet == null)
- pluginResourceSet = new ProjectResourceSetImpl(null);
- return pluginResourceSet;
- }
-
- /**
- * Set the system-wide resource set.
- *
- * @param set
- * @since 1.0.0
- */
- public static void setPluginResourceSet(ResourceSet set) {
- pluginResourceSet = set;
- }
-
- /**
- * Get the global loading plugin names.
- * <p>
- * This is not meant to be called by clients.
- * </p>
- *
- * @return
- *
- * @since 1.0.0
- */
- public static String[] getGlobalLoadingPluginNames() {
- if (GLOBAL_LOADING_PLUGIN_NAMES == null)
- GLOBAL_LOADING_PLUGIN_NAMES = readGlobalLoadingPluginNames();
- return GLOBAL_LOADING_PLUGIN_NAMES;
- }
-
- /**
- * Get the Logger for this plugin.
- *
- * @return logger for this plugin.
- *
- * @since 1.0.0
- */
- public static Logger getLogger() {
- return Logger.getLogger(ID);
- }
-
- private static String[] readGlobalLoadingPluginNames() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IExtensionPoint exPoint = reg.getExtensionPoint(ID, "globalPluginResourceLoad"); //$NON-NLS-1$
- IExtension[] extensions = exPoint.getExtensions();
- String[] names = new String[extensions.length];
- if (extensions.length > 0) {
- for (int i = 0; i < extensions.length; i++)
- names[i] = extensions[i].getNamespace();
- }
- return names;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.cvsignore b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
deleted file mode 100644
index 5e29c82..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.perfmsr.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
deleted file mode 100644
index 4abaeab..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/about.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>30th March, 2004</p>
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 ("CPL"). A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, "Program" will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL ("Other License"), any modifications, enhancements and/or
-other code and/or documentation ("Modifications") uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License. In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-<p><b>Version:</b> v20040624a
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
deleted file mode 100644
index c06d260..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- *.jar
-source.perfmsr.jar = src/
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
deleted file mode 100644
index 5ad8edc..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Plugin.name=Performance Monitor
-
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
deleted file mode 100644
index 596926d..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.perfmsr.core"
- name="%Plugin.name"
- version="3.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.perfmsr.core.PerfMsrCorePlugin">
-
- <runtime>
- <library name="perfmsr.jar"><export name="*"/></library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-</plugin>
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
deleted file mode 100644
index 15580c5..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/IPerformanceMonitor.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.perfmsr.core;
-
-/**
- * Take snapshots of the various performance counters.
- * ************* This is just a stub of the real interface to get org.eclipse.jem.util
- * to compile. It is not usable by itself. ****************************
- */
-public interface IPerformanceMonitor
-{
- /**
- * These constants control how much information is gathered for a particular snapshot.
- * They are or'ed together and passed into the snapshot method.
- */
- interface Types
- {
- /**
- * 1 - Write out the performance counters from the operating system. These
- * include working set, peak working set, elapsed time, user time, and
- * kernel time.
- */
- int OperatingSystemCounters = 1;
-
- /**
- * 2 - Write out the global performance info. This includes things like the total
- * committed memory for the entire system.
- *
- * This function depends on the GetPerformanceInfo() function being available in
- * the Windows psapi.dll. This is available in XP but is usually not available
- * in Win/2000. If it is not available then this function throws an UnsupportedOperationException.
- */
- int GlobalSystemCounters = 2;
-
- /**
- * 4 - Write out the size of the Java Heap.
- */
- int JavaHeapSize = 4;
-
- /**
- * 8 - Write out how much of the Java heap is being used. This calls the
- * garbage collector so it may skew timing results.
- */
- int JavaHeapUsed = 8;
-
- /**
- * 16 - The plugin startup and size information.
- */
- int PluginInfo = 16;
-
- /** 0xffff - Everything. */
- int All = 0xffff;
- }
-
- /**
- * Add some more "extra" variations.
- *
- * The variations that are in effect are made up of these extra variations plus any variations
- * that may have been set with the setVar() method.
- *
- * @param varList a comma separated list of variations
- */
- public void addVarAppend(String varList);
-
- /**
- * Set the driver name.
- *
- * @param driver a label that identifies the driver that is being tested. If it is a WSAD
- * driver, this will usually be set by the extension.
- */
- public void setDriver(String driver);
-
- /**
- * Set the location of the performance measurement file, that is the place where
- * the measurements are stored.
- *
- * @param logFile the file name of where the log should be written. Usually this is fully qualified
- * path name. For example "x:\logs\timer.xml".
- */
- public void setLogFile(String logFile);
-
- /**
- * Set the performance monitor to be on or off. If it is off then most of the other
- * operations will no-op.
- *
- * The default is for the performance monitor to be off unless it's special environment variable is set.
- * When called from the UI, the UI should call this to make sure that it is on.
- */
- public void setIsOn(boolean isOn);
-
- /**
- * Sets the test case number for this measurement run.
- *
- * @param testd test case identifier
- */
- public void setTestd(int testd);
-
- /**
- * Sets the test case name. If will cause a new test case to be created if it does not already exist.
- *
- * @param testName a simple (short) test case name. In the case of JUnit test cases, it would usually
- * be the JUnit name.
- */
- public void setTestName(String testName);
-
- /**
- * Set the variations that are in effect.
- *
- * @param var a comma delimited string of variation numbers
- */
- public void setVar(String var);
-
- /**
- * Set the upload host
- *
- * @param host DNS name of the upload host
- */
- public void setUploadHost(String host);
-
- /**
- * Set the upload port
- *
- * @param port upload port
- */
- public void setUploadPort(int port);
-
- /**
- * Set the upload userid
- *
- * @param userid
- */
- public void setUploadUserid(String userid);
-
- /**
- * Take a snapshot of some default performance measurements.
- *
- * @param step this identifies the step that the snapshot is for
- */
- void snapshot(int step);
-
- /**
- * Take a snapshot of the selected performance measurements.
- *
- * @param step this identifies the step that the snapshot is for
- *
- * @param types This controls which measurements are selected. It is an or'd together
- * list of the IPerformanceMonitor.Types constants.
- *
- * @see IPerformanceMonitor.Types
- */
- void snapshot(int step, int types);
-
- /**
- * Write the comment to the performance measurement file.
- *
- * @param comment
- */
- void writeComment(String comment);
-
- /**
- * Upload the results to the server. This causes the file to be
- * closed, and the monitor to be placed into the finished state.
- *
- * This method can only be called if the uploadhost, uploadport and uploaduserid
- * have been configured before hand.
- *
- * @param description an optional description (it can be null)
- *
- * @return some status information
- */
-// public Upload.Status upload(String description);
-//
-// /**
-// * Upload the results to the server. This causes the file to be
-// * closed, and the monitor to be placed into the finished state.
-// *
-// * @param host the host name that the file is being sent to
-// * @param port the port on the host
-// * @param userid the userid that is doing the upload
-// * @param description an optional description (it can be null)
-// *
-// * @return some status information
-// */
-// Upload.Status upload(String host, int port, String userid, String description);
-
-
-}
diff --git a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java b/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
deleted file mode 100644
index e234a33..0000000
--- a/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src/org/eclipse/perfmsr/core/PerfMsrCorePlugin.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: PerfMsrCorePlugin.java,v $
- * $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
- */
-package org.eclipse.perfmsr.core;
-
-import org.eclipse.core.runtime.Plugin;
-
-
-/**
- * ************* This is just a stub of the real class to get org.eclipse.jem.util
- * to compile. It is not usable by itself. ****************************
- * @since 1.0.0
- */
-public class PerfMsrCorePlugin extends Plugin {
-
- public static IPerformanceMonitor getPerformanceMonitor(boolean bool) {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.util/plugin.properties b/plugins/org.eclipse.jem.util/plugin.properties
deleted file mode 100644
index 3d68bc7..0000000
--- a/plugins/org.eclipse.jem.util/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/common.move/webtools.common.git/plugins/org.eclipse.jem.util/plugin.properties,v $
-# $Revision: 1.1 $ $Date: 2005/01/07 20:19:23 $
-#
-
-
-pluginName=Java EMF Model Utilities
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.jem.util/plugin.xml b/plugins/org.eclipse.jem.util/plugin.xml
deleted file mode 100644
index 0eef4ea..0000000
--- a/plugins/org.eclipse.jem.util/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jem.util"
- name="%pluginName"
- version="1.1.0"
- provider-name="%providerName"
- class="org.eclipse.jem.util.plugin.JEMUtilPlugin">
-
- <runtime>
- <library name="util.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.jdt.core" optional="true"/>
- <import plugin="org.eclipse.perfmsr.core" optional="true"/>
- </requires>
-
-<!-- Extension point to register ResourceHandlers that will always be added to
- new WorkbenchContexts -->
- <extension-point id="ResourceHandlerExtension" name="ResourceHandlerExtension"/>
- <extension-point id="globalPluginResourceLoad" name="Global Plugin Resource Load"/>
- <extension-point id="nature_registration" name="EMF Nature registration"/>
- <extension-point id="internalWorkbenchContextFactory" name="Internal Workbench Context Factory"/>
- <extension-point id="uiContextSensitiveClass" name="UI Context Sensitive Class" schema="schema/uiContextSensitiveClass.exsd"/>
- <extension-point id="uiTester" name="UI Tester" schema="schema/uiTester.exsd"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties b/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
deleted file mode 100644
index eb62f66..0000000
--- a/plugins/org.eclipse.jem.util/property_files/emfworkbench.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-Cannot_Create_Resource_ERROR_=IWAE0001E Cannot create a resource for \" {0} \"
-Unable_to_save_read-only_f_ERROR_=IWAE0004E Unable to save read-only file: {0}
-The_following_resources_ne_UI_=The following resources need to be saved but are currently shared, do you want to save now?
-An_error_occurred_while_sa_ERROR_=IWAE0002E An error occurred while saving.
-EMFWorkbenchContextBase_ERROR_0=IWAE0003E Method not yet implemented.
-EMFWorkbenchContextBase_ERROR_1=IWAE0005E Project can not be null.
-EMFWorkbenchContextBase_ERROR_2=IWAE0006E Attempt to create resource set with null project
-EMFNatureRegistry_ERROR_0=IWAE0007E Duplicate EMF nature registration for id: {0}
-EMFWorkbenchContextFactory_UI_0=The project should not be null.
-EMFWorkbenchContextFactory_UI_1=The project \"{0}\" is not accessible.
-PleaseMigrateYourCodeError_ERROR_0=IWAE0008E Your source code uses obsolete methods. Please consult \n the design documents for guidelines on how to migrating \n your current source code.
-EMF2DOMAdapterImpl_ERROR_0=IWAE0009E Multiple elements exist where only 1 is expected. Node name: {0};
diff --git a/plugins/org.eclipse.jem.util/schema/uiContextSensitiveClass.exsd b/plugins/org.eclipse.jem.util/schema/uiContextSensitiveClass.exsd
deleted file mode 100644
index 7bcbfeb..0000000
--- a/plugins/org.eclipse.jem.util/schema/uiContextSensitiveClass.exsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.util">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.util" id="uiContextSensitiveClass" name="UI Context Sensitive Class"/>
- </appInfo>
- <documentation>
- Edit models provide a framework for managing a set of EMF resources within a unit of work. For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources. Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor. By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="uiContextSensitiveClass" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="uiContextSensitiveClass">
- <annotation>
- <documentation>
- An extension point that defines an instance of a class and its appropriate context (UI or Headless)
- </documentation>
- </annotation>
- <complexType>
- <attribute name="key" type="string" use="required">
- <annotation>
- <documentation>
- The key that should be used to create an instance of the Context Sensitive super class/interface.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- A concrete implementation for either a UI or Headless context.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="context" use="required">
- <annotation>
- <documentation>
- One of "UI" or "Headless"
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="UI">
- </enumeration>
- <enumeration value="Headless">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <br>
-&nbsp;&nbsp;&nbsp;&lt;extension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id="context.Sensitive.Class.workingCopyManager"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name="Working&nbsp;Copy&nbsp;Manager&nbsp;-&nbsp;UI&nbsp;Context&nbsp;Class"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="com.ibm.wtp.common.ui.ContextSensitiveClass"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;uiContextSensitiveClass<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;context="UI"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key="workingCopyManager"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;className="com.ibm.wtp.common.ui.WTPUIWorkingCopyManager"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/uiContextSensitiveClass&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/extension&gt;<br>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- See <code>org.eclipse.jem.util.UIContextDetermination</code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) IBM 2003.
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.util/schema/uiTester.exsd b/plugins/org.eclipse.jem.util/schema/uiTester.exsd
deleted file mode 100644
index 48d74fc..0000000
--- a/plugins/org.eclipse.jem.util/schema/uiTester.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.util">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.util" id="uiTester" name="UI Tester"/>
- </appInfo>
- <documentation>
- Edit models provide a framework for managing a set of EMF resources within a unit of work. For example, a workspace operation may affect a change to multiple EMF resources. Edit models provide basic services such as loads, saves (when necessary), and validate edit for the managed resources. Edit models are reference counted, therefore a single instance of an edit model can be shared by more than one operation or editor. By declaring an edit model, a plugin provider enables other components to contribute resources to be managed by that edit model.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="uiTester"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="uiTester">
- <annotation>
- <documentation>
- The declaration for an edit model to be used in the workspace.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- A unique identifier for the edit model.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.emf/.classpath b/plugins/org.eclipse.wst.common.emf/.classpath
deleted file mode 100644
index e8d84f8..0000000
--- a/plugins/org.eclipse.wst.common.emf/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="wtpemf/"/>
- <classpathentry kind="src" path="workbench/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.emf/.cvsignore b/plugins/org.eclipse.wst.common.emf/.cvsignore
deleted file mode 100644
index 21c0734..0000000
--- a/plugins/org.eclipse.wst.common.emf/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
diff --git a/plugins/org.eclipse.wst.common.emf/.project b/plugins/org.eclipse.wst.common.emf/.project
deleted file mode 100644
index 5b5f0fe..0000000
--- a/plugins/org.eclipse.wst.common.emf/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.emf</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.emf/build.properties b/plugins/org.eclipse.wst.common.emf/build.properties
deleted file mode 100644
index 3d1eb1a..0000000
--- a/plugins/org.eclipse.wst.common.emf/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-output.runtime/workbench.jar=bin/
-bin.includes=plugin.xml,\
- runtime/workbench.jar,\
- runtime/wtpemf.jar
-source.runtime/workbench.jar=workbench/
-source.runtime/wtpemf.jar=wtpemf/
-output.runtime/wtpemf.jar=bin/
-jars.compile.order=runtime/wtpemf.jar,\
- runtime/workbench.jar
diff --git a/plugins/org.eclipse.wst.common.emf/plugin.xml b/plugins/org.eclipse.wst.common.emf/plugin.xml
deleted file mode 100644
index 872c681..0000000
--- a/plugins/org.eclipse.wst.common.emf/plugin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.emf"
- name="EMF Utilities"
- version="1.0.0"
- provider-name="IBM"
- description="Provides support and utilities for emf integration into the workbench"
- class="org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin">
-
- <runtime>
- <library name="runtime/wtpemf.jar">
- <export name="*"/>
- </library>
- <library name="runtime/workbench.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.core.resources"/>
- </requires>
-
-
- <extension-point id="packageURIMap" name="PackageURIMap"/>
-
-<!-- Need to register the Ecore specific package mappings -->
- <extension
- point="org.eclipse.wst.common.emf.packageURIMap">
- <map
- uri="http://www.eclipse.org/emf/2002/Ecore"
- prefix="ecore">
- </map>
- <map
- uri="http://www.eclipse.org/emf/2002/Mapping"
- prefix="mapping">
- </map>
-<!-- Trick to get Mapping.xmi for MOF5 serialization -->
- <map
- uri="http://www.eclipse.org/emf/2002/Mapping"
- prefix="Mapping">
- </map>
- </extension>
-
- <extension
- point="com.ibm.wtp.common.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- context="Headless"
- key="rendererFactory"
- className="org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory">
- </uiContextSensitiveClass>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.emf/prepareforpii.xml b/plugins/org.eclipse.wst.common.emf/prepareforpii.xml
deleted file mode 100644
index 8007604..0000000
--- a/plugins/org.eclipse.wst.common.emf/prepareforpii.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.emf"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/wtpemf" >
- <fileset dir="${plugindir}/wtpemf">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
deleted file mode 100644
index 3a48551..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/EcoreUtilitiesPlugin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 9, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EcoreUtilitiesPlugin extends Plugin {
- public static final String ID = "org.eclipse.wst.common.emf"; //$NON-NLS-1$
-
- /**
- * @param descriptor
- */
- public EcoreUtilitiesPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#startup()
- */
- public void startup() throws CoreException {
- super.startup();
- RendererFactory.setDefaultHandler(PluginRendererFactoryDefaultHandler.INSTANCE);
- PackageURIMapReader reader = new PackageURIMapReader();
- reader.processExtensions();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PackageURIMapReader.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PackageURIMapReader.java
deleted file mode 100644
index 253ffe3..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PackageURIMapReader.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.plugin;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityPackageMappingRegistry;
-
-/**
- * This reader will read the packageURIMap extension point and populate the
- * CompatibilityPackageMappingRegistry.
- *
- * The packageURIMap will have the following configuration element.
- *
- * <map prefix="somePackagePrefix" uri="somePackageURI"/>
- *
- */
-public class PackageURIMapReader {
- private static final String URI_ATT_NAME = "uri"; //$NON-NLS-1$
- private static final String PREFIX_ATT_NAME = "prefix"; //$NON-NLS-1$
- private static final String EXTENSION_POINT_NAME = "packageURIMap"; //$NON-NLS-1$
-
- /**
- *
- */
- public PackageURIMapReader() {
- super();
- }
-
- private IExtensionPoint getExtensionPoint() {
- IPluginRegistry reg = Platform.getPluginRegistry();
- return reg.getExtensionPoint(EcoreUtilitiesPlugin.ID, EXTENSION_POINT_NAME);
- }
-
- /**
- * Call this method to read and process all of the packageURIMap extensions. *
- */
- public void processExtensions() {
- CompatibilityPackageMappingRegistry reg = CompatibilityPackageMappingRegistry.INSTANCE;
- IExtension[] extensions = getExtensionPoint().getExtensions();
- for (int i = 0; i < extensions.length; i++)
- processExtension(extensions[i], reg);
- }
-
- /**
- * @param extension
- */
- private void processExtension(IExtension extension, CompatibilityPackageMappingRegistry reg) {
- IConfigurationElement[] configs = extension.getConfigurationElements();
- for (int i = 0; i < configs.length; i++)
- processConfiguration(configs[i], reg);
- }
-
- /**
- * @param element
- */
- private void processConfiguration(IConfigurationElement element, CompatibilityPackageMappingRegistry reg) {
- String prefix = element.getAttribute(PREFIX_ATT_NAME);
- String uri = element.getAttribute(URI_ATT_NAME);
- reg.registerPrefixToPackageURI(prefix, uri);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
deleted file mode 100644
index d65fbb4..0000000
--- a/plugins/org.eclipse.wst.common.emf/workbench/org/eclipse/wst/common/internal/emf/plugin/PluginRendererFactoryDefaultHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.plugin;
-
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactoryDefaultHandler;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-import com.ibm.wtp.common.UIContextDetermination;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class PluginRendererFactoryDefaultHandler extends EMF2DOMRendererFactoryDefaultHandler {
-
- static final PluginRendererFactoryDefaultHandler INSTANCE = new PluginRendererFactoryDefaultHandler();
- static final String EXT_POINT_NAME = "rendererFactory"; //$NON-NLS-1$
-
- /**
- *
- */
- protected PluginRendererFactoryDefaultHandler() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.EMF2DOMRendererFactoryDefaultHandler#getDefaultRendererFactory()
- */
- public RendererFactory getDefaultRendererFactory() {
- RendererFactory aFactory = (RendererFactory) UIContextDetermination.createInstance(EXT_POINT_NAME);
- return aFactory == null ? super.getDefaultRendererFactory() : aFactory;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/AdapterFactoryDescriptor.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/AdapterFactoryDescriptor.java
deleted file mode 100644
index 3cf75a4..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/AdapterFactoryDescriptor.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-
-public interface AdapterFactoryDescriptor {
-
- public AdapterFactory createAdapterFactory();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/AdapterFactoryUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/AdapterFactoryUtil.java
deleted file mode 100644
index ea37859..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/AdapterFactoryUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-
-public class AdapterFactoryUtil {
-
- /**
- * Constructor for AdapterFactoryUtil.
- */
- public AdapterFactoryUtil() {
- super();
- }
-
- public static void adaptNew(Notifier newObject, List factories) {
- AdapterFactory fact;
- for (int i = 0; i < factories.size(); i++) {
- fact = (AdapterFactory) factories.get(i);
- fact.adaptNew(newObject, null);
- }
- }
-
- public static void createAdapterFactories(List descriptors, List factories) {
- AdapterFactoryDescriptor desc;
- AdapterFactory adapterFact;
- for (int i = 0; i < descriptors.size(); i++) {
- desc = (AdapterFactoryDescriptor) descriptors.get(i);
- adapterFact = desc.createAdapterFactory();
- if (adapterFact != null)
- factories.add(adapterFact);
- }
- descriptors.clear();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/CommandContext.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/CommandContext.java
deleted file mode 100644
index 95bd6dc..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/CommandContext.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 27, 2004
- */
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-
-
-/**
- * @author John Mourra
- */
-public class CommandContext implements ICommandContext {
-
- private IProgressMonitor monitor;
- private Map properties;
- private ResourceSet resourceSet;
-
- /**
- * @param monitor
- */
- public CommandContext(IProgressMonitor monitor) {
- this(monitor, null, null);
- }
-
- /**
- * @param monitor
- * @param configurationProperties
- * @param resourceSet
- */
- public CommandContext(IProgressMonitor monitor, Map configurationProperties, ResourceSet resourceSet) {
- this.monitor = monitor;
- this.properties = configurationProperties;
- this.resourceSet = resourceSet;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.command.framework.ICommandContext#getProgressMonitor()
- */
- public IProgressMonitor getProgressMonitor() {
- if (monitor == null)
- monitor = new NullProgressMonitor();
- return monitor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.command.framework.ICommandContext#getConfigurationProperties()
- */
- public Map getConfigurationProperties() {
- if (properties == null)
- properties = new HashMap();
- return properties;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.command.framework.ICommandContext#getResourceSet()
- */
- public ResourceSet getResourceSet() {
- if (resourceSet == null)
- resourceSet = new ResourceSetImpl();
- return resourceSet;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/CopyGroup.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/CopyGroup.java
deleted file mode 100644
index ca93f20..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/CopyGroup.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.internal.emf.utilities.Association;
-
-/**
- * This class is used to copy a group of RefObjects and/or Resources. This group will ensure that
- * all non-composite relationships are deferred until all Resources and RefObjects are copied. This
- * allows you to make copies of a group of objects that may have non-composite relationships and
- * ensure that these relationships are pointing to the copied object if it is part of the group
- * (either directly or through a containment relationship). Creation date: (12/17/2000 1:21:17 PM)
- *
- * @author: Administrator
- */
-public class CopyGroup {
- protected String defaultIdSuffix;
- protected ResourceSet copyContext;
- protected List resources;
- protected List refObjects;
- protected List copiedResources;
- protected List copiedRefObjects;
- protected boolean preserveIds = false;
-
- /**
- * CopyGroup constructor comment.
- */
- public CopyGroup() {
- super();
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
- *
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- */
- public boolean add(EObject aRefObject) {
- return add(aRefObject, null);
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
- *
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- */
- public boolean add(EObject aRefObject, String idSuffix) {
- if (aRefObject != null && !containsRefObject(aRefObject)) {
- getRefObjects().add(createAssociation(aRefObject, idSuffix));
- return true;
- }
- return false;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
- *
- * @param aResources
- * org.eclipse.emf.ecore.resource.Resource
- */
- public void add(Resource aResource) {
- add(aResource, null);
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
- *
- * @param aResources
- * org.eclipse.emf.ecore.resource.Resource
- */
- public void add(Resource aResource, String newUri) {
- if (aResource != null)
- getResources().add(createAssociation(aResource, newUri));
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
- *
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- */
- public void addCopied(EObject aRefObject) {
- if (aRefObject != null)
- getCopiedRefObjects().add(aRefObject);
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
- *
- * @param aResources
- * org.eclipse.emf.ecore.resource.Resource
- */
- public void addCopied(Resource aResource) {
- if (aResource != null) {
- getCopiedResources().add(aResource);
- if (getCopyContext() != null)
- getCopyContext().getResources().add(aResource);
- }
- }
-
- protected boolean contains(List associations, Object anObject) {
- if (anObject == null)
- return false;
- int size = associations.size();
- Association assoc;
- for (int i = 0; i < size; i++) {
- assoc = (Association) associations.get(i);
- if (assoc.getKey() == anObject)
- return true;
- }
- return false;
- }
-
- /**
- * Return true if
- *
- * @aRefObject has been added to this group. Creation date: (12/17/2000 1:28:16 PM)
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- */
- public boolean containsRefObject(EObject aRefObject) {
- return contains(getRefObjects(), aRefObject);
- }
-
- /**
- * Return true if
- *
- * @aResource has been added to this group. Creation date: (12/17/2000 1:28:16 PM)
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- */
- public boolean containsResource(Resource aResource) {
- return contains(getResources(), aResource);
- }
-
- private Association createAssociation(Object key, Object value) {
- return new Association(key, value);
- }
-
- /**
- * Returns a List of RefObjects that were copied. Creation date: (12/17/2000 1:25:46 PM)
- *
- * @return java.util.List
- */
- public java.util.List getCopiedRefObjects() {
- if (copiedRefObjects == null)
- copiedRefObjects = new ArrayList();
- return copiedRefObjects;
- }
-
- /**
- * Returns a List of Resources that were copied. Creation date: (12/17/2000 1:25:46 PM)
- *
- * @return java.util.List
- */
- public java.util.List getCopiedResources() {
- if (copiedResources == null)
- copiedResources = new ArrayList();
- return copiedResources;
- }
-
- /**
- * The context to add all copied resources into. Creation date: (12/17/2000 8:09:45 PM)
- *
- * @return org.eclipse.emf.ecore.resource.ResourceSet
- */
- public org.eclipse.emf.ecore.resource.ResourceSet getCopyContext() {
- return copyContext;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:44:43 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getDefaultIdSuffix() {
- return defaultIdSuffix;
- }
-
- /**
- * Should the id be copied in the case where no suffix is specified? Defaults to false
- */
- public boolean getPreserveIds() {
- return preserveIds;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
- *
- * @return java.util.List
- */
- public java.util.List getRefObjects() {
- if (refObjects == null)
- refObjects = new ArrayList();
- return refObjects;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
- *
- * @return java.util.List
- */
- public java.util.List getResources() {
- if (resources == null)
- resources = new ArrayList();
- return resources;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
- *
- * @return java.util.List
- */
- public java.util.List primGetRefObjects() {
- return refObjects;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:25:46 PM)
- *
- * @return java.util.List
- */
- public java.util.List primGetResources() {
- return resources;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:28:16 PM)
- *
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- * @return boolean
- */
- public boolean remove(EObject aRefObject) {
- if (aRefObject != null && primGetRefObjects() != null) {
- Iterator it = primGetRefObjects().iterator();
- Association association;
- while (it.hasNext()) {
- association = (Association) it.next();
- if (association.getKey() == aRefObject)
- return primGetRefObjects().remove(association);
- }
- }
- return false;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 1:27:32 PM)
- *
- * @param aResources
- * org.eclipse.emf.ecore.resource.Resource
- * @return boolean
- */
- public boolean remove(Resource aResource) {
- if (aResource != null && primGetResources() != null) {
- Iterator it = primGetResources().iterator();
- Association association;
- while (it.hasNext()) {
- association = (Association) it.next();
- if (association.getKey() == aResource)
- return primGetResources().remove(association);
- }
- }
- return false;
- }
-
- /**
- * Set the context to add all copied resources into. Creation date: (12/17/2000 8:09:45 PM)
- *
- * @param newCopyContext
- * org.eclipse.emf.ecore.resource.Context
- */
- public void setCopyContext(org.eclipse.emf.ecore.resource.ResourceSet newCopyContext) {
- copyContext = newCopyContext;
- }
-
- /**
- * If an ID suffix is not defined for a EObject that is to be copied, this value will be used.
- * Creation date: (12/17/2000 1:44:43 PM)
- *
- * @param newDefaultIdSuffix
- * java.lang.String
- */
- public void setDefaultIdSuffix(java.lang.String newDefaultIdSuffix) {
- defaultIdSuffix = newDefaultIdSuffix;
- }
-
- /**
- * Should the id be copied in the case where no suffix is specified?
- */
- public void setPreserveIds(boolean value) {
- preserveIds = value;
- }
-
- /**
- * Subclasses should override this method if they require additional processing after the group
- * has been copied.
- *
- * @param copyUtil
- */
- public void postCopy(EtoolsCopyUtility copyUtil) {
- }
-
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/DanglingHREFException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/DanglingHREFException.java
deleted file mode 100644
index ef6a68c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/DanglingHREFException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 12, 2003
- *
- */
-package org.eclipse.wst.common.emf.utilities;
-
-/**
- * Exception thrown when a proxy can not be resolved
- */
-public class DanglingHREFException extends Exception {
-
-
- public DanglingHREFException() {
- super();
- }
-
- /**
- * @param s
- */
- public DanglingHREFException(String s) {
- super(s);
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/DefaultOverridableResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
deleted file mode 100644
index 8e8bd41..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 14, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.emf.utilities;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-
-/**
- * @author DABERG
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DefaultOverridableResourceFactoryRegistry extends ResourceFactoryRegistryImpl {
- protected static Resource.Factory GLOBAL_FACTORY = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI(DEFAULT_EXTENSION));
-
- /**
- *
- */
- public DefaultOverridableResourceFactoryRegistry() {
- super();
- }
-
- public Resource.Factory getFactory(URI uri) {
- Object resourceFactory = null;
- if (resourceFactory == null) {
- String protocol = uri.scheme();
- resourceFactory = protocolToFactoryMap.get(protocol);
- if (resourceFactory == null) {
- String extension = uri.fileExtension();
- resourceFactory = extensionToFactoryMap.get(extension);
- if (resourceFactory == null) {
- resourceFactory = delegatedGetFactory(uri);
- if (resourceFactory == GLOBAL_FACTORY) {
- resourceFactory = (Factory) extensionToFactoryMap.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
- if (resourceFactory == null)
- resourceFactory = GLOBAL_FACTORY;
- }
-
- }
- }
- }
-
- return resourceFactory instanceof Resource.Factory.Descriptor ? ((Resource.Factory.Descriptor) resourceFactory).createFactory() : (Resource.Factory) resourceFactory;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl#delegatedGetFactory(org.eclipse.emf.common.util.URI)
- */
- protected Factory delegatedGetFactory(URI uri) {
- return Resource.Factory.Registry.INSTANCE.getFactory(uri);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/EtoolsCopySession.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/EtoolsCopySession.java
deleted file mode 100644
index 939dd31..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/EtoolsCopySession.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * Insert the type's description here. Creation date: (05/04/01 11:25:59 PM)
- *
- * @author: Administrator
- */
-public class EtoolsCopySession extends EtoolsCopyUtility {
- public static final int RESOURCE_COPIED = 500;
- private EtoolsCopyUtility parentCopyUtility;
- private XMLResource currentResource;
- private XMLResource currentCopyResource;
-
- /**
- * EtoolsCopySession constructor comment.
- */
- public EtoolsCopySession(EtoolsCopyUtility aCopyUtility) {
- parentCopyUtility = aCopyUtility;
- setPreserveIds(aCopyUtility.preserveIds());
- setCopyAdapters(aCopyUtility.isCopyAdapters());
- }
-
- /**
- * Copy all Resources and RefObjects within <code>aGroup</code> and add them to
- * <code>aGroup</code>. Non composite references will be deferred until all objects are
- * copied from <code>aGroup</code>.
- *
- * Copy Resources first and then copy RefObjects.
- */
- public void copy(CopyGroup aGroup) {
- if (aGroup != null) {
- copyResources(aGroup);
- copyRefObjects(aGroup);
- executeDeferredCopyActions();
- aGroup.postCopy(this);
- notifyNewResourcesCopied(aGroup);
- }
- }
-
- /**
- * This method should be used if you are only going to copy <code>aRefObject</code> in this
- * copy execution.
- */
- public EObject copy(EObject aRefObject, String idSuffix) {
- EObject copied = containmentCopy(aRefObject, idSuffix);
- executeDeferredCopyActions();
- return copied;
- }
-
- /**
- * This method should be used if you are only going to copy <code>aRefObject</code> in this
- * copy execution. This method only copies <code>aRefObject</code> attributes.
- */
- public EObject copyObject(EObject aRefObject, String idSuffix) {
- EObject copied = containmentCopyObject(aRefObject, idSuffix);
- executeDeferredCopyActions();
- return copied;
- }
-
- /**
- * This method should be used if you are only going to copy <code>aResource</code> in this
- * copy execution. The copied Resource will have a URI equal to <code>newUri</code>.
- */
- public Resource copy(Resource aResource, String newUri) {
- Resource copied = containmentCopy(aResource, newUri);
- executeDeferredCopyActions();
- copyModificationFlag(aResource, copied);
- notifyNewResourceCopied(copied);
- return copied;
- }
-
- protected void notifyNewResourcesCopied(CopyGroup group) {
- List copied = group.getCopiedResources();
- for (int i = 0; i < copied.size(); i++) {
- notifyNewResourceCopied((Resource) copied.get(i));
- }
- }
-
- protected void notifyNewResourceCopied(Resource copied) {
- copied.eNotify(new NotificationImpl(RESOURCE_COPIED, null, null));
- }
-
- /**
- * @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility#primCopyObject(EObject,
- * String)
- */
- protected EObject primCopyObject(EObject aRefObject, String idSuffix) {
- EObject copy = super.primCopyObject(aRefObject, idSuffix);
- copyIdIfNecessary(aRefObject, copy, idSuffix);
- return copy;
- }
-
- protected void copyIdIfNecessary(EObject obj, EObject copy, String idSuffix) {
- if ((idSuffix == null && !preserveIds) || currentResource == null)
- return;
- String id = currentResource.getID(obj);
- if (id == null)
- return;
- id = idSuffix == null ? id : id + idSuffix;
- currentCopyResource.setID(copy, id);
- }
-
-
- /**
- * Set delivery back on for all the cached objects and push them to the parentCopyUtility.
- */
- public void flush() {
- Iterator it = getCopiedObjects().entrySet().iterator();
- Map parentCopies = getParentCopyUtility().getCopiedObjects();
- Map.Entry entry;
- EObject copy;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- copy = (EObject) entry.getValue();
- copy.eSetDeliver(true);
- parentCopies.put(entry.getKey(), copy);
- }
- copiedObjects = null;
- }
-
- /**
- * Return a cached copy.
- */
- public EObject getCopy(EObject anObject) {
- EObject copied = super.getCopy(anObject);
- if (copied == null)
- copied = getParentCopyUtility().getCopy(anObject);
- return copied;
- }
-
- /**
- * Insert the method's description here. Creation date: (05/04/01 11:28:07 PM)
- *
- * @return com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility
- */
- protected EtoolsCopyUtility getParentCopyUtility() {
- return parentCopyUtility;
- }
-
- /**
- * Return an instance of EObject that is the same type as <code>aRefObject</code>.
- */
- public EObject newInstance(EObject aRefObject) {
- EObject newType = super.newInstance(aRefObject);
- newType.eSetDeliver(false);
- return newType;
- }
-
- /**
- * @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopyUtility#newInstance(Resource, String)
- */
- public Resource newInstance(Resource aResource, String newUri) {
- Resource copy = super.newInstance(aResource, newUri);
- if (aResource instanceof XMLResource) {
- currentResource = (XMLResource) aResource;
- currentCopyResource = (XMLResource) copy;
- } else {
- currentResource = null;
- currentCopyResource = null;
- }
- return copy;
- }
-
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/EtoolsCopyUtility.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/EtoolsCopyUtility.java
deleted file mode 100644
index e23bd9c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/EtoolsCopyUtility.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emf.utilities.Association;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-import org.eclipse.wst.common.internal.emf.utilities.DeferredReferenceUtilityAction;
-
-
-/**
- * Insert the type's description here. Creation date: (12/13/2000 9:10:55 PM)
- *
- * @author: Administrator
- */
-public class EtoolsCopyUtility {
- protected static final String REFENUMLITERAL_TYPE_NAME = "EEnumLiteral"; //$NON-NLS-1$
- private final EcorePackage pkg = EcorePackage.eINSTANCE;
-
- private final ETypedElement METAENAME = pkg.getENamedElement_Name();
-
- protected HashMap copiedObjects;
- protected List deferredReferenceCopies;
- protected boolean preserveIds = false;
- protected boolean copyAdapters = false;
- protected HashMap copiedAdapters;
-
- protected class DeferredSingleReferenceCopyAction extends DeferredReferenceUtilityAction {
- public DeferredSingleReferenceCopyAction(EReference aReference, Object aValue, String aSuffix, EObject aCopyContainer) {
- super(aReference, aValue, aSuffix, aCopyContainer);
- }
-
- public void performAction() {
- EObject value = (EObject) getReferenceValue();
- getCopyContainer().eSet(getReference(), getCopyIfFound(value));
- }
- }
-
- protected class DeferredManyReferenceCopyAction extends DeferredReferenceUtilityAction {
- public DeferredManyReferenceCopyAction(EReference aReference, List aValue, String aSuffix, EObject aCopyContainer) {
- super(aReference, aValue, aSuffix, aCopyContainer);
- }
-
- public void performAction() {
- List copyList = (List) getCopyContainer().eGet(getReference());
- Iterator it = ((List) getReferenceValue()).iterator();
- EObject next;
- while (it.hasNext()) {
- next = (EObject) it.next();
- copyList.add(getCopyIfFound(next));
- }
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (12/13/2000 9:14:26 PM)
- *
- * @param aRefObject
- * org.eclipse.emf.ecore.EObject
- */
- public EtoolsCopyUtility() {
- }
-
- /**
- * Create a <code>DeferredManyReferenceCopyAction</code> and add it to the list of deferred
- * copy actions.
- */
- protected void addDeferredManyReferenceCopy(EReference reference, List aValue, String idSuffix, EObject aCopyContainer) {
- getDeferredReferenceCopies().add(new DeferredManyReferenceCopyAction(reference, aValue, idSuffix, aCopyContainer));
- }
-
- /**
- * Create a <code>DeferredSingleReferenceCopyAction</code> and add it to the list of deferred
- * copy actions.
- */
- protected void addDeferredSingleReferenceCopy(EReference reference, EObject aValue, String idSuffix, EObject aCopyContainer) {
- getDeferredReferenceCopies().add(new DeferredSingleReferenceCopyAction(reference, aValue, idSuffix, aCopyContainer));
- }
-
- /**
- * Check for an already copied object first.
- */
- protected EObject containmentCopy(EObject anObject, String idSuffix) {
- EObject copied = getCopy(anObject);
- if (copied == null)
- copied = primCopy(anObject, idSuffix);
- return copied;
- }
-
- /**
- * Check for an already copied object first.
- */
- protected EObject containmentCopyObject(EObject anObject, String idSuffix) {
- EObject copied = getCopy(anObject);
- if (copied == null)
- copied = primCopyObject(anObject, idSuffix);
- return copied;
- }
-
- protected Resource containmentCopy(Resource aResource, String newUri) {
- /* copied resources are never cached */
- return primCopy(aResource, newUri);
- }
-
- /**
- * Copy all Resources and RefObjects within <code>aGroup</code> and add them to
- * <code>aGroup</code>. Non composite references will be deferred until all objects are
- * copied from <code>aGroup</code>.
- *
- * Copy Resources first and then copy RefObjects.
- */
- public void copy(CopyGroup aGroup) {
- if (aGroup != null) {
- EtoolsCopySession session = new EtoolsCopySession(this);
- session.setPreserveIds(aGroup.getPreserveIds());
- session.copy(aGroup);
- session.flush();
- }
- }
-
- public EObject copy(EObject aRefObject) {
- return copy(aRefObject, null);
- }
-
- /**
- * This method should be used if you are only going to copy <code>aRefObject</code> in this
- * copy execution.
- */
- public EObject copy(EObject aRefObject, String idSuffix) {
- EtoolsCopySession session = new EtoolsCopySession(this);
- EObject copied = session.copy(aRefObject, idSuffix);
- session.flush();
- return copied;
- }
-
- /**
- * This method should be used if you are only going to copy <code>aRefObject</code> in this
- * copy execution. This method only copies <code>aRefObject</code> with its properties, not
- * references.
- */
- public EObject copyObject(EObject aRefObject, String idSuffix) {
- EtoolsCopySession session = new EtoolsCopySession(this);
- EObject copied = session.copyObject(aRefObject, idSuffix);
- session.flush();
- return copied;
- }
-
- /**
- * This method should be used if you are only going to copy <code>aResource</code> in this
- * copy execution. The copied Resource will have a URI equal to <code>newUri</code>.
- */
- public Resource copy(Resource aResource, String newUri) {
- EtoolsCopySession session = new EtoolsCopySession(this);
- Resource copied = session.copy(aResource, newUri);
- session.flush();
- return copied;
- }
-
- /**
- * If an attribute is set and its value is not <code>null</code>, then perform copy
- * <code>attribute</code> value from <code>aRefObject</code> to <code>copyRef</code>.
- * Null is a valid value if the attribute is set.
- */
-
- protected void copyAttribute(EAttribute attribute, EObject aRefObject, String idSuffix, EObject copyRef) {
- if (!attribute.isChangeable())
- return; //ignore
- if (attribute.isMany()) {
- List value = (List) aRefObject.eGet(attribute);
- if (value != null)
- copyManyAttribute(attribute, value, aRefObject, idSuffix, copyRef);
- } else if (aRefObject.eIsSet(attribute)) {
- Object value = aRefObject.eGet(attribute);
- if (value == null)
- copyRef.eSet(attribute, value);
- else
- copySingleAttribute(attribute, value, aRefObject, idSuffix, copyRef);
- } else if (attribute == METAENAME) {
- //set name to the ID (this is computed as a default), only get here if isSetName is
- // false.
- copyRef.eSet(attribute, aRefObject.eGet(attribute));
- }
- }
-
- /**
- * Iterate over the attributes of the receiver and copy each attribute.
- */
- protected void copyCurrentAttributes(EObject aRefObject, String idSuffix, EObject copyRef) {
- List attributes = aRefObject.eClass().getEAllAttributes();
- if (attributes != null) {
- Iterator it = attributes.iterator();
- EAttribute ra;
- while (it.hasNext()) {
- ra = (EAttribute) it.next();
- copyAttribute(ra, aRefObject, idSuffix, copyRef);
- }
- }
- }
-
- /**
- * This method will iterate over the references of the receiver. If a reference's value is not
- * <code>null</code>, then a series of tests are done before setting the value with the
- * copied object, <code>copyRef</code>.
- *
- * Tests: 1. Do nothing if the reference equals the metaEContainer or metaEContains references.
- */
-
- protected void copyCurrentReferences(EObject aRefObject, String idSuffix, EObject copyRef) {
- List references = aRefObject.eClass().getEAllReferences();
- if (references != null) {
- Iterator it = references.iterator();
- EReference rr;
- while (it.hasNext()) {
- rr = (EReference) it.next();
- if (shouldCopyReference(rr))
- copyReference(rr, aRefObject, idSuffix, copyRef);
- }
- }
- }
-
- /**
- * Iterate over <code>anExtent</code> and copy each element to <code>copyExtent</code>.
- */
- protected void copyExtent(EList anExtent, EList copyExtent) {
- Iterator it = anExtent.iterator();
- EObject refObject;
- while (it.hasNext()) {
- refObject = (EObject) it.next();
- copyExtent.add(containmentCopy(refObject, null));
- }
- }
-
- /**
- * Copy a many value attribute which is treated as a many valued reference.
- *
- * Tests:
- *
- * 1. If the type is <bold>not </bold> <code>null</code>, then set the value on
- * <code>copyRef</code> without making a copy. 2. If the type is <code>null</code>, then
- * obtain the list from <code>copyRef</code> and add a copy of each value from the original
- * list to it.
- */
-
- protected void copyManyAttribute(EAttribute attribute, List aValue, EObject aRefObject, String idSuffix, EObject copyRef) {
- if (attribute.getEType() == null)
- copyRef.eSet(attribute, aValue);
- else {
- List copyList = (List) copyRef.eGet(attribute);
- Iterator it = aValue.iterator();
- Object next;
- while (it.hasNext()) {
- next = it.next();
- if (next instanceof EObject)
- copyList.add(containmentCopy((EObject) next, idSuffix));
- else
- copyList.add(next);
- }
- }
- }
-
- /**
- * This method will iterate over the references of the receiver. If a reference's value is not
- * <code>null</code>, then a series of tests are done before setting the value with the
- * copied object, <code>copyRef</code>.
- *
- * Tests: 1. If the reference is many, obtain the list from the receiving object and make a copy
- * of each value if the reference is composite before adding to the list; otherwise, just add
- * each value to the of the <code>copyRef</code>.
- */
-
- protected void copyManyReference(EReference aReference, List aList, EObject aRefObject, String idSuffix, EObject copyRef) {
- if (!aList.isEmpty()) {
- if (aReference.isContainment()) {
- List copyList = (List) copyRef.eGet(aReference);
- Iterator it = aList.iterator();
- EObject targetValue;
- while (it.hasNext()) {
- targetValue = (EObject) it.next();
- copyList.add(containmentCopy(targetValue, idSuffix));
- }
- } else
- addDeferredManyReferenceCopy(aReference, aList, idSuffix, copyRef);
- }
- }
-
- /**
- * This method will iterate over the references of the receiver. If a reference's value is not
- * <code>null</code>, then perform the copy.
- */
-
- protected void copyReference(EReference aReference, EObject aRefObject, String idSuffix, EObject copyRef) {
- if (aReference.isMany()) {
- List value = (List) aRefObject.eGet(aReference);
- if (value != null)
- copyManyReference(aReference, value, aRefObject, idSuffix, copyRef);
- } else if (aRefObject.eIsSet(aReference)) {
- Object value = aRefObject.eGet(aReference);
- copySingleReference(aReference, (EObject) value, aRefObject, idSuffix, copyRef);
- }
- }
-
- /**
- * Copy all RefObjects from <code>aGroup</code> and add the copy back to <code>aGroup</code>.
- */
- protected void copyRefObjects(CopyGroup aGroup) {
- Association association;
- EObject refObject;
- String idSuffix;
- if (aGroup.primGetRefObjects() != null) {
- Iterator it = aGroup.primGetRefObjects().iterator();
- while (it.hasNext()) {
- association = (Association) it.next();
- refObject = (EObject) association.getKey();
- idSuffix = (String) association.getValue();
- if (idSuffix == null)
- idSuffix = aGroup.getDefaultIdSuffix();
- aGroup.addCopied(containmentCopy(refObject, idSuffix));
- }
- }
- }
-
- /**
- * Copy all Resources from <code>aGroup</code> and add the copy back to <code>aGroup</code>.
- */
- protected void copyResources(CopyGroup aGroup) {
- Association association;
- Resource resource;
- String uri;
- if (aGroup.primGetResources() != null) {
- Iterator it = aGroup.primGetResources().iterator();
- while (it.hasNext()) {
- association = (Association) it.next();
- resource = (Resource) association.getKey();
- uri = (String) association.getValue();
- Resource copied = containmentCopy(resource, uri);
- copyModificationFlag(resource, copied);
- aGroup.addCopied(copied);
- }
- }
- }
-
- /**
- * Copy a single value attribute.
- *
- * Tests:
- *
- * 1. If an attribute type is not <code>null</code> then it is an object type and it must be
- * copied. Do not copy the value if the attribute is an Enumeration type. 2. If an attribute
- * type is <bold>not </bold> <code>null</code> then copy the value before setting it on
- * <code>copyRef</code>.
- */
-
- protected void copySingleAttribute(EAttribute attribute, Object aValue, EObject aRefObject, String idSuffix, EObject copyRef) {
- if (attribute.getEType() == null) {
- copyRef.eSet(attribute, aValue);
- } else {
- //MOF108
- // if (attribute.isObjectType())
- if (attribute.getEType() instanceof EClass)
- copyRef.eSet(attribute, containmentCopy((EObject) aValue, idSuffix));
- else
- copyRef.eSet(attribute, aValue);
- }
- }
-
- /**
- * This method will iterate over the references of the receiver. If a reference's value is not
- * <code>null</code>, then a series of tests are done before setting the value with the
- * copied object, <code>copyRef</code>.
- *
- * Tests: 1. If the reference is <bold>not </bold> many, make a copy of the value if the
- * reference is composite before setting the value with <code>copyRef</code>; otherwise, just
- * set the value as is.
- */
-
- protected void copySingleReference(EReference aReference, EObject aValue, EObject aRefObject, String idSuffix, EObject copyRef) {
- //Exceptional case; the relationship is not the container relationship
- //And is not navigable in the other direction; go ahead and copy
- if (aValue != aRefObject.eContainer() || aReference.getEOpposite() == null) {
- if (aReference.isContainment())
- copyRef.eSet(aReference, containmentCopy(aValue, idSuffix));
- else
- addDeferredSingleReferenceCopy(aReference, aValue, idSuffix, copyRef);
- }
- }
-
- /**
- * Copy all Resources and RefObjects within <code>aGroup</code> and add them to
- * <code>aGroup</code>. Non composite references will be deferred until all objects are
- * copied from <code>aGroup</code>.
- *
- * Copy Resources first and then copy RefObjects.
- */
- public static void createCopy(CopyGroup aGroup) {
- EtoolsCopyUtility utility = new EtoolsCopyUtility();
- utility.copy(aGroup);
- }
-
- /**
- * Copies attributes
- */
- public static void createAttributeCopy(EObject aRefObject, EObject copyObject) {
- EtoolsCopyUtility utility = new EtoolsCopyUtility();
- utility.copyCurrentAttributes(aRefObject, null, copyObject);
- }
-
- /**
- * Copies all set attributes and references based on containment. Thus, it will copy the entire
- * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
- * IDs of copied objects.
- */
- public static EObject createCopy(EObject aRefObject) {
- return createCopy(aRefObject, null);
- }
-
- /**
- * Copies all set attributes and references based on containment. Thus, it will copy the entire
- * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
- * IDs of copied objects.
- */
- public static EObject createCopy(EObject aRefObject, String idSuffix) {
- EtoolsCopyUtility utility = new EtoolsCopyUtility();
- return utility.copy(aRefObject, idSuffix);
- }
-
- /**
- * Copy <code>aResource</code> using <code>newUri</code> for the URI.
- */
- public static Resource createCopy(Resource aResource, String newUri) {
- EtoolsCopyUtility utility = new EtoolsCopyUtility();
- return utility.copy(aResource, newUri);
- }
-
- protected void executeDeferredCopyActions() {
- if (primGetDeferredReferenceCopies() != null) {
- Iterator it = primGetDeferredReferenceCopies().iterator();
- DeferredReferenceUtilityAction action;
- while (it.hasNext()) {
- action = (DeferredReferenceUtilityAction) it.next();
- action.performAction();
- }
- primGetDeferredReferenceCopies().clear();
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (12/13/2000 9:17:35 PM)
- *
- * @return java.util.HashMap
- */
- protected java.util.HashMap getCopiedObjects() {
- if (copiedObjects == null)
- copiedObjects = new HashMap(200);
- return copiedObjects;
- }
-
- protected java.util.HashMap getCopiedAdapters() {
- if (copiedAdapters == null)
- copiedAdapters = new HashMap(200);
- return copiedAdapters;
- }
-
- /**
- * Return a cached copy.
- */
- public EObject getCopy(EObject anObject) {
- if (anObject == null)
- return null;
- return (EObject) getCopiedObjects().get(anObject);
- }
-
- /**
- * Return a cached copy, if none, return the argument.
- */
- public EObject getCopyIfFound(EObject anObject) {
- EObject copied = getCopy(anObject);
- return copied == null ? anObject : copied;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/16/2000 9:11:32 AM)
- *
- * @return java.util.List
- */
- protected java.util.List getDeferredReferenceCopies() {
- if (deferredReferenceCopies == null)
- deferredReferenceCopies = new ArrayList(100);
- return deferredReferenceCopies;
- }
-
- /**
- * Return an instance of EObject that is the same type as <code>aRefObject</code>.
- */
- public EObject newInstance(EObject aRefObject) {
- if (aRefObject == null)
- return null;
- EPackage epkg = (EPackage) aRefObject.eClass().eContainer();
- EFactory factory = epkg.getEFactoryInstance();
- EClass refObj = aRefObject.eClass();
- return factory.create(refObj);
- }
-
- /**
- * Return an instance of Resource that uses the same ResourceFactory as the one used by
- * <code>aResource</code>. If <code>newUri</code> is <code>null</code> then use the URI
- * from <code>aResource</code>.
- */
- public Resource newInstance(Resource aResource, String newUri) {
- if (aResource == null)
- return null;
- Resource newResource;
- String originalUri = aResource.getURI().toString();
- newUri = newUri == null ? originalUri : newUri;
-
- Resource.Factory factory = null;
- if (aResource.getResourceSet() == null)
- factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI(originalUri));
- else
- factory = aResource.getResourceSet().getResourceFactoryRegistry().getFactory(URI.createURI(originalUri));
-
-
- newResource = factory.createResource(URI.createURI(newUri));
- return newResource;
- }
-
- /**
- * Should the id be copied in the case where no suffix is specified? Defaults to false
- */
- public boolean preserveIds() {
- return preserveIds;
- }
-
- /**
- * Copies all set attributes and references based on containment. Thus, it will copy the entire
- * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
- * IDs of copied objects. If an idSuffix does not exist, do not set an id on the copied object.
- */
- protected EObject primCopy(EObject aRefObject, String idSuffix) {
- if (aRefObject == null)
- return null;
- EObject copyRef = primCopyObject(aRefObject, idSuffix);
-
- copyCurrentReferences(aRefObject, idSuffix, copyRef);
- return copyRef;
- }
-
- /**
- * Copies all set attributes based on containment. Thus, it will copy the entire containment
- * tree. Use the idSuffix to define the suffix that will be appended to the existing IDs of
- * copied objects. If an idSuffix does not exist, do not set an id on the copied object.
- */
- protected EObject primCopyObject(EObject aRefObject, String idSuffix) {
- if (aRefObject == null)
- return null;
- EObject copyRef = newInstance(aRefObject);
-
- recordCopy(aRefObject, copyRef);
- copyCurrentAttributes(aRefObject, idSuffix, copyRef);
- if (isCopyAdapters())
- copyAdapters(aRefObject, copyRef);
- return copyRef;
- }
-
- protected void copyAdapters(EObject aRefObject, EObject copyRef) {
- List adapters = aRefObject.eAdapters();
- for (int i = 0; i < adapters.size(); i++) {
- Adapter adapter = (Adapter) adapters.get(i);
- copyAdapter(aRefObject, copyRef, adapter);
-
- }
- }
-
- protected void copyAdapter(EObject aRefObject, EObject copyRef, Adapter adapter) {
- if (!(adapter instanceof CloneablePublic))
- return;
- CloneablePublic copyAdapter = (CloneablePublic) getCopiedAdapters().get(adapter);
- if (copyAdapter == null) {
- copyAdapter = (CloneablePublic) ((CloneablePublic) adapter).clone();
- getCopiedAdapters().put(adapter, copyAdapter);
- }
- if (copyAdapter != null)
- copyRef.eAdapters().add(copyAdapter);
- }
-
- /**
- * Copies all set attributes and references based on containment. Thus, it will copy the entire
- * containment tree. Use the idSuffix to define the suffix that will be appended to the existing
- * IDs of copied objects.
- */
- protected Resource primCopy(Resource aResource, String newUri) {
- if (aResource == null)
- return null;
- Resource copyResource = newInstance(aResource, newUri);
- copyExtent(aResource.getContents(), copyResource.getContents());
- return copyResource;
- }
-
- protected void copyModificationFlag(Resource aResource, Resource copied) {
- if (aResource.isModified())
- copied.setModified(true);
- }
-
- /**
- * Insert the method's description here. Creation date: (12/16/2000 9:11:32 AM)
- *
- * @return java.util.List
- */
- private java.util.List primGetDeferredReferenceCopies() {
- return deferredReferenceCopies;
- }
-
- public void recordCopy(EObject aSource, EObject aCopy) {
- getCopiedObjects().put(aSource, aCopy);
- }
-
- public void recordCopy(Adapter aSource, Adapter aCopy) {
- getCopiedAdapters().put(aSource, aCopy);
- }
-
- /**
- * Should the id be copied in the case where no suffix is specified?
- */
- public void setPreserveIds(boolean value) {
- preserveIds = value;
- }
-
- protected boolean shouldCopyReference(EReference aReference) {
- return aReference.isChangeable();
- }
-
- /**
- * @return
- */
- public boolean isCopyAdapters() {
- return copyAdapters;
- }
-
- /**
- * Flag used to indicate whether adapters should be copied as well. In order for an adapter to
- * be copied, it must implement the {@link CloneablePublic}interface.
- */
- public void setCopyAdapters(boolean b) {
- copyAdapters = b;
- }
-
-}
-
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ExceptionHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ExceptionHelper.java
deleted file mode 100644
index dfc8592..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ExceptionHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.IWFTWrappedException;
-
-
-
-/**
- * Utility class to factor common code for implementers of IArchiveWrappedException
- */
-public class ExceptionHelper {
-
- /**
- * Utility class; cannot be instantiated
- */
- private ExceptionHelper() {
- super();
- }
-
- /**
- * Return the messages from
- *
- * @exception and
- * all nested exceptions, in order from outermost to innermost
- */
- public static java.lang.String[] getAllMessages(IWFTWrappedException exception) {
- List messages = new ArrayList(4);
- messages.add(exception.getMessage());
- Exception nested = exception.getNestedException();
- while (nested != null) {
- messages.add(nested.getMessage());
- if (nested instanceof IWFTWrappedException)
- nested = ((IWFTWrappedException) nested).getNestedException();
- else
- nested = null;
- }
- return (String[]) messages.toArray(new String[messages.size()]);
- }
-
- /**
- * Return the messages from
- *
- * @exception and
- * all nested exceptions, in order from outermost to innermost, concatenated as
- * one
- */
- public static String getConcatenatedMessages(IWFTWrappedException exception) {
- String[] messages = getAllMessages(exception);
- StringBuffer sb = new StringBuffer(256);
- for (int i = 0; i < messages.length; i++) {
- sb.append(messages[i]);
- if (i < messages.length - 1)
- sb.append('\n');
- }
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ExtendedEcoreUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ExtendedEcoreUtil.java
deleted file mode 100644
index ca61265..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ExtendedEcoreUtil.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.io.FileNotFoundException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.wst.common.internal.emf.utilities.IsLoadingDetector;
-import org.eclipse.wst.common.internal.emf.utilities.IsLoadingProxyAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.WFTUtilsResourceHandler;
-
-
-
-public class ExtendedEcoreUtil extends EcoreUtil {
- private static FileNotFoundDetector FILE_NOT_FOUND_DETECTOR;
- private static String NAME_ATTRIBUTE_STRING = "name"; //$NON-NLS-1$
-
-
- public interface FileNotFoundDetector {
- boolean isFileNotFound(WrappedException wrappedEx);
- }
-
- public static void setFileNotFoundDetector(FileNotFoundDetector detector) {
- FILE_NOT_FOUND_DETECTOR = detector;
- }
-
- public static FileNotFoundDetector getFileNotFoundDetector() {
- if (FILE_NOT_FOUND_DETECTOR == null) {
- FILE_NOT_FOUND_DETECTOR = new FileNotFoundDetector() {
- public boolean isFileNotFound(WrappedException wrappedEx) {
- if (getInnerFileNotFoundException(wrappedEx) != null)
- return true;
- return false;
- }
- };
- }
- return FILE_NOT_FOUND_DETECTOR;
- }
-
- public static FileNotFoundException getInnerFileNotFoundException(WrappedException wrappedEx) {
- if (wrappedEx.exception() instanceof java.io.FileNotFoundException) {
- return (FileNotFoundException) wrappedEx.exception();
- } else if (wrappedEx.exception() instanceof WrappedException) {
- return getInnerFileNotFoundException((WrappedException) wrappedEx.exception());
- }
- return null;
- }
-
- public static void eSetOrAdd(EObject obj, EStructuralFeature feature, Object value) {
- eSetOrAdd(obj, feature, value, 0);
- }
-
- public static void eSetOrAdd(EObject obj, EStructuralFeature feature, Object value, int newIndex) {
- if (feature.isMany() && value != null) {
- if (newIndex >= 0)
- ((List) obj.eGet(feature)).add(newIndex, value);
- else
- ((List) obj.eGet(feature)).add(value);
- } else {
- obj.eSet(feature, value);
- }
- }
-
- public static void eUnsetOrRemove(EObject obj, EStructuralFeature feature, Object value) {
- if (feature == null || feature.isMany())
- ((List) obj.eGet(feature)).remove(value);
- else
- obj.eUnset(feature);
- }
-
- public static boolean endsWith(URI sourceUri, URI testUri) {
- //TODO Waiting on new emf URI API
- String[] sourceSegments = sourceUri.segments();
- String[] testSegments = testUri.segments();
- int i = testSegments.length;
- int j = sourceSegments.length;
- if (j >= i) {
- boolean test = true;
-
- while (test && i > 0) {
- i--;
- j--;
- test = testSegments[i].equals(sourceSegments[j]);
- }
- return test;
- }
- return false;
- }
-
- public static String getName(EObject obj) {
- if (obj == null)
- return null;
- if (obj instanceof ENamedElement)
- return ((ENamedElement) obj).getName();
- List allAtts = obj.eClass().getEAllAttributes();
- int size = allAtts.size();
- EAttribute att, nameAttribute = null;
- for (int i = 0; i < size; i++) {
- att = (EAttribute) allAtts.get(i);
- if (NAME_ATTRIBUTE_STRING.equals(att.getName())) {
- nameAttribute = att;
- break;
- }
- }
- if (nameAttribute != null)
- return (String) obj.eGet(nameAttribute);
- return null;
- }
-
- public static void addLoadingTag(Resource resource) {
- resource.eAdapters().add(IsLoadingDetector.INSTANCE);
- }
-
- public static void removeLoadingTag(Resource resource) {
- resource.eAdapters().remove(IsLoadingDetector.INSTANCE);
- }
-
- /**
- * Return true if the resource is currently being loaded. This is determined by checking for the
- * IsLoadingDector in the list of eAdapters on the resource.
- *
- * @param resource
- * @return boolean
- *
- * @see addLoadingTag(Resource)
- * @see removeLoadingTag(Resource)
- *
- */
- public static boolean isLoading(Resource resource) {
- if (resource != null) {
- return resource.eAdapters().contains(IsLoadingDetector.INSTANCE);
- }
- return false;
- }
-
- public static Adapter createAdapterForLoading(Adapter targetAdapter, EObject targetObject) {
- Resource res = targetObject.eResource();
- if (res == null || isLoading(res))
- return new IsLoadingProxyAdapter(targetAdapter, targetObject);
- return targetAdapter;
- }
-
- public static void preRegisterPackage(String nsPrefix, EPackage.Descriptor descriptor) {
- if (!EPackage.Registry.INSTANCE.containsKey(nsPrefix))
- EPackage.Registry.INSTANCE.put(nsPrefix, descriptor);
- }
-
- /**
- * Remove this object from it's container, and make it and all it's children proxies
- */
- public static void unload(EObject root) {
- Resource res = root.eResource();
- EObject container = root.eContainer();
- if (container == null)
- if (res != null)
- res.getContents().remove(root);
- else {
- EStructuralFeature feature = root.eContainmentFeature();
- if (feature != null)
- eUnsetOrRemove(container, feature, root);
- }
- if (root != null && res != null)
- becomeProxy(root, res);
- }
-
- /**
- * Turns this object and all it's children to proxies, and removes adapters precondition: The
- * object has been removed from it's container
- */
- public static void becomeProxy(EObject root, Resource res) {
- Iterator iter = root.eAllContents();
- while (iter.hasNext()) {
- doBecomeProxy((InternalEObject) iter.next(), res);
- }
- doBecomeProxy((InternalEObject) root, res);
- }
-
- protected static void doBecomeProxy(InternalEObject p, Resource res) {
- String id = res.getURIFragment(p);
- p.eSetProxyURI(res.getURI().appendFragment(id));
- if (res instanceof XMLResource) {
- ((XMLResource) res).getIDToEObjectMap().remove(id);
- ((XMLResource) res).getEObjectToIDMap().remove(p);
- }
- p.eAdapters().clear();
- }
-
- public static void removeProxy(EObject root, Resource res) {
- Iterator iter = root.eAllContents();
- while (iter.hasNext()) {
- doRemoveProxy((InternalEObject) iter.next(), res);
- }
- doRemoveProxy((InternalEObject) root, res);
- }
-
- protected static void doRemoveProxy(InternalEObject p, Resource res) {
- String id = p.eProxyURI().fragment();
- if (res instanceof XMLResource) {
- ((XMLResource) res).setID(p, id);
- }
- p.eSetProxyURI(null);
- }
-
-
- /**
- * Ensures the passed object is not a proxy; if it is, throws an exception indicating the bad
- * HREF. If the object is null, does nothing.
- *
- * @param object
- * @throws DanglingHREFException
- */
- public static void checkProxy(EObject object) throws DanglingHREFException {
- if (object == null || !object.eIsProxy())
- return;
- String msg = WFTUtilsResourceHandler.getString("DANGLING_HREF_ERROR_", new Object[]{((InternalEObject) object).eProxyURI()}); //$NON-NLS-1$
- throw new DanglingHREFException(msg);
- }
-
- /**
- * Return true if o1 and o2 are not the same values. This implementation takes into account that
- * either parameter can be null.
- *
- * @param o1
- * @param o2
- * @return
- */
- public static boolean valueChanged(Object o1, Object o2) {
- return (o1 == null ^ o2 == null) || (o1 == null || !o1.equals(o2));
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ICommand.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ICommand.java
deleted file mode 100644
index fd031d4..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ICommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author John Mourra
- */
-public interface ICommand {
-
- /*
- * This will contain the multi-selection of objects to deploy. This selection could be used to
- * filter elements within a Module. Any other setup code should be done here...
- */
- void init(Object[] selection);
-
- /**
- * @param resource
- * @param delta
- * @param context
- * @return
- * @throws CoreException
- */
- public boolean execute(IResource resource, IResourceDelta delta, ICommandContext context) throws CoreException;
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ICommandContext.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ICommandContext.java
deleted file mode 100644
index fc7df03..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/ICommandContext.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * @author John Mourra
- */
-public interface ICommandContext {
-
- /**
- * @return
- */
- public IProgressMonitor getProgressMonitor();
-
- /**
- * @return
- */
- public Map getConfigurationProperties();
-
- /**
- * @return
- */
- public ResourceSet getResourceSet();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/IDUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/IDUtil.java
deleted file mode 100644
index e3259c4..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/IDUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-public class IDUtil {
-
- /**
- * This method is invoked to assign a unique ID to the object. The object must be contained in a
- * resource.
- */
- public static void assignID(EObject object) {
- Resource aResource = object.eResource();
- if (aResource instanceof XMLResource)
- assignID(object, (XMLResource) aResource);
-
- }
-
- public static String getOrAssignID(EObject object) {
- Resource aResource = object.eResource();
- if (aResource instanceof XMLResource)
- return getOrAssignID(object, (XMLResource) aResource);
- return null;
- }
-
- public static String getOrAssignID(EObject object, XMLResource aResource) {
- String id = aResource.getID(object);
- if (id == null)
- return assignID(object, aResource);
- return id;
- }
-
- public static String assignID(EObject object, XMLResource aResource) {
- String name = getBaseIDForAssignment(object);
- if (name == null)
- return null;
- String id = ensureUniqueID(aResource, name);
- aResource.setID(object, id);
- return id;
- }
-
- protected static String ensureUniqueID(XMLResource aResource, String baseIDName) {
- baseIDName += "_"; //$NON-NLS-1$
- //Change to use the current time instead of incremental numbers to help
- //support team development.
- long currentTime = System.currentTimeMillis();
- String id = baseIDName + currentTime;
- Map idMap = aResource.getIDToEObjectMap();
- while (idMap.get(id) != null) {
- ++currentTime;
- id = baseIDName + currentTime;
- }
- return id;
- }
-
- protected static String getBaseIDForAssignment(EObject object) {
- EClass metaO = object.eClass();
- return metaO.getName();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/NamespaceAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/NamespaceAdapter.java
deleted file mode 100644
index ca17103..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/emf/utilities/NamespaceAdapter.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.emf.utilities;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-import org.eclipse.wst.common.internal.emf.utilities.Namespace;
-
-
-/**
- * Internal class used to hold namespaces parsed from an XML file using the xmlns:prefix="aURI"
- * syntax
- */
-public class NamespaceAdapter extends AdapterImpl implements CloneablePublic {
-
- protected final static String ADAPTER_TYPE = NamespaceAdapter.class.getName();
- protected Map prefixesToNS;
- protected List namespaces;
-
- public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
- };
-
- private static class Notification extends NotificationImpl {
-
- /**
- * @param eventType
- * @param oldValue
- * @param newValue
- */
- public Notification(int eventType, Object oldValue, Object newValue) {
- super(eventType, oldValue, newValue);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.NotificationImpl#getFeature()
- */
- public Object getFeature() {
- return NOTIFICATION_FEATURE;
- }
- }
-
- protected NamespaceAdapter() {
- super();
- }
-
- public static void addNamespace(String prefix, String uri, EObject obj) {
- if (obj == null)
- return;
- NamespaceAdapter adapter = getAdapter(obj);
- if (adapter != null)
- adapter.addNamespace(prefix, uri);
- }
-
- public static void removeNamespace(String prefix, EObject obj) {
- if (obj == null)
- return;
- NamespaceAdapter adapter = retrieveExistingAdapter(obj);
- if (adapter != null)
- adapter.removeNamespace(prefix);
- }
-
- /**
- * Facade method for resolving prefixes to an actual namespace URI. Used for objects contained
- * by instances of {@link com.ibm.etools.emf2xml.TranslatorResource}. Walks up the object
- * containment path until a namespace is found, or returns null.
- */
- public static String getResolvedNamespaceURI(String prefix, EObject obj) {
- if (prefix == null || obj == null)
- return null;
- EObject container = obj;
- String nsURI;
- while (container != null) {
- nsURI = getNamespaceURIAtThisLevel(prefix, container);
- if (nsURI != null)
- return nsURI;
- container = container.eContainer();
- }
- return null;
- }
-
- public static String getNamespaceURIAtThisLevel(String prefix, EObject obj) {
- if (obj == null)
- return null;
- NamespaceAdapter adapter = retrieveExistingAdapter(obj);
- return adapter == null ? null : adapter.getNamespaceURI(prefix);
- }
-
- public static List getNamespaces(EObject obj) {
- if (obj == null)
- return Collections.EMPTY_LIST;
- NamespaceAdapter adapter = retrieveExistingAdapter(obj);
- return adapter == null ? null : adapter.getNamespaces();
-
- }
-
- protected static NamespaceAdapter retrieveExistingAdapter(EObject obj) {
- return (NamespaceAdapter) EcoreUtil.getExistingAdapter(obj, ADAPTER_TYPE);
- }
-
- protected static NamespaceAdapter getAdapter(EObject obj) {
- NamespaceAdapter adapter = retrieveExistingAdapter(obj);
- return adapter == null ? createAdapter(obj) : adapter;
- }
-
- protected static NamespaceAdapter createAdapter(EObject obj) {
- NamespaceAdapter adapter = new NamespaceAdapter();
- adapter.setTarget(obj);
- obj.eAdapters().add(adapter);
- return adapter;
- }
-
- protected void addNamespace(String prefix, String uri) {
- Namespace ns = new Namespace(prefix, uri);
- if (namespaces == null)
- namespaces = new ArrayList();
- if (prefixesToNS == null)
- prefixesToNS = new HashMap();
-
- prefixesToNS.put(prefix, ns);
- namespaces.add(ns);
- fireNotification(Notification.ADD, null, ns);
-
- }
-
- protected void removeNamespace(String prefix) {
- Namespace ns = null;
- if (prefixesToNS != null)
- ns = (Namespace) prefixesToNS.get(prefix);
-
- if (ns != null)
- namespaces.remove(ns);
- fireNotification(Notification.REMOVE, ns, null);
- }
-
- protected String getNamespaceURI(String prefix) {
- if (prefixesToNS == null)
- return null;
- Namespace ns = (Namespace) prefixesToNS.get(prefix);
- if (ns != null)
- return ns.getNsURI();
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return ADAPTER_TYPE.equals(type);
- }
-
- public List getNamespaces() {
- return namespaces == null ? Collections.EMPTY_LIST : Collections.unmodifiableList(namespaces);
- }
-
- protected void fireNotification(int type, Object oldValue, Object newValue) {
- if (target != null)
- target.eNotify(new Notification(type, oldValue, newValue));
- }
-
- public boolean hasNamespaces() {
- return namespaces != null && !namespaces.isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf.ecore.utilities.CloneablePublic#clone()
- */
- public Object clone() {
- NamespaceAdapter result = new NamespaceAdapter();
- if (hasNamespaces()) {
- for (int i = 0; i < namespaces.size(); i++) {
- Namespace ns = (Namespace) namespaces.get(i);
- result.addNamespace(ns.getPrefix(), ns.getNsURI());
- }
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
deleted file mode 100644
index 03b6992..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public abstract class AbstractRendererImpl implements Renderer {
-
-
- protected TranslatorResource resource;
- private int versionId;
- private boolean validating = true;
-
- /**
- * Constructor for AbstractRendererImpl.
- */
- public AbstractRendererImpl() {
- super();
- }
-
- /**
- * @see com.ibm.etools.emf2xml.Renderer#setResource(TranslatorResource)
- */
- public void setResource(TranslatorResource aResource) {
- resource = aResource;
- }
-
- /**
- * @see com.ibm.etools.emf2xml.Renderer#getResource()
- */
- public TranslatorResource getResource() {
- return resource;
- }
-
- public int getVersionId() {
- return this.versionId;
- }
-
- public void setVersionId(int versionId) {
- this.versionId = versionId;
- }
-
- /**
- * @return
- */
- public boolean isValidating() {
- return validating;
- }
-
- /**
- * @param b
- */
- public void setValidating(boolean b) {
- validating = b;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#accessForRead()
- */
- public void accessForRead() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#accessForWrite()
- */
- public void accessForWrite() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#isModified()
- */
- public boolean isModified() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#isShared()
- */
- public boolean isShared() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#isSharedForWrite()
- */
- public boolean isSharedForWrite() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#preDelete()
- */
- public void preDelete() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#preUnload()
- */
- public void preUnload() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#releaseFromRead()
- */
- public void releaseFromRead() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#releaseFromWrite()
- */
- public void releaseFromWrite() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#setBatchMode(boolean)
- */
- public void setBatchMode(boolean isBatch) {
- }
-
- public boolean useStreamsForIO() {
- return true;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
deleted file mode 100644
index b0d0869..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AttributeTranslatorFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Sep 21, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public final class AttributeTranslatorFilter extends TranslatorFilter {
-
- public AttributeTranslatorFilter() {
- super(null, -1);
- }
-
- public AttributeTranslatorFilter(Translator trans, int version) {
- super(trans, version);
- }
-
- public final int scanNextTranslator(Translator[] children, int start) {
- int found = start + 1;
- for (; found < children.length; ++found) {
- if (children[found].isDOMAttribute())
- break;
- }
- found = (found < children.length) ? found : -1;
- return found;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
deleted file mode 100644
index e575833..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventNode.java
+++ /dev/null
@@ -1,585 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.xml.sax.Attributes;
-
-
-/**
- * CacheEventNodes (CENOs) store information collected from SAX Events. This information can then be
- * used once all necessary SAX Events have been generated to create and/or set values on EMF model
- * objects.
- *
- * CacheEventNodes (CENOs) have a simple lifecycle: initialize, collect data, commit, discard. When
- * initialized, CENOs will attempt to find the appropriate translator for a given XML element name,
- * and also create/set any necessary EMF model values. Data is collected as SAX character() events
- * are generated. On the SAX endElement event, the CENO is committed(), which is where it will
- * complete its processing to create EMF model features. In those cases where it cannot complete its
- * processing, it will defer its processing to the updateEMF() method of its parent. Defered
- * processing is necessary to handle EMF features that require read ahead cues from the XML. CENOs
- * will add themselves to their parents as children in a tree data structure. When an CENO
- * determines it is the golden piece of information required to instantiate its parent feature, it
- * will trigger its parent CENO to process the rest of the cached CENO tree. As mentioned, the
- * building of a CENO tree will only occur for nodes with read ahead cues.
- *
- * discard() is invoked by init() to ensure that no junk state is left from a previous use of the
- * CENO. commit() will call discard as needed. Because of the use of discard, CENOs can be pooled
- * and reused. If a CENO determines that it is contained in a pool, it will manage its own release
- * from that pool. Self- management is necessary because of the way in which CENOs might cache
- * certain children while waiting to create the parent EMF feature.
- *
- * @author mdelder
- */
-public class CacheEventNode {
-
- public static final String ROOT_NODE = "EMF_ROOT_NODE"; //$NON-NLS-1$
-
- private String nodeName = null;
- private Translator translator = null;
- private Notifier emfOwner = null;
- private StringBuffer buffer = null;
- private List children = null;
- private int versionID;
-
- /*
- * The internal data structure used to store the attributes is a String[]. The choice was made
- * to use an array to avoid the creation of another object (probably a Hashtable) and to exploit
- * array-access times to get the name and value of the attributes (opposed to full fledged
- * method invocations).
- *
- */
- private String[] attributes = null;
- private CacheEventNode parent = null;
- private CacheEventPool containingPool = null;
- private Boolean ignorable = null;
-
- public CacheEventNode(CacheEventPool containingPool) {
- this.containingPool = containingPool;
- }
-
- /**
- * Lifecycle method. init(TranslatorResource) will configure this Adapter as a ROOT node.
- *
- * This method will invoke discard() before completing its tasks.
- */
- public void init(TranslatorResource resource) {
- this.discard();
- this.setEmfOwner(resource);
- this.setTranslator(resource.getRootTranslator());
- this.setVersionID(resource.getVersionID());
- this.nodeName = CacheEventNode.ROOT_NODE;
- }
-
- /**
- * Lifecycle method. init(CacheEventNode, String, Attributes) will configure this Adapter to be
- * a non-ROOT node of the Adapter data structure
- *
- * This method will invoke discard() before completing its tasks.
- */
- public void init(CacheEventNode parentArg, String nodeNameArg, Attributes attributesArg) {
- this.discard();
- this.nodeName = nodeNameArg;
- init(parentArg, attributesArg);
- }
-
- private void init(CacheEventNode parentRecord, Attributes attributesArg) {
- setParent(parentRecord);
-
- setAttributes(attributesArg);
- if (parent != null) {
- /* I am not the root */
-
- /*
- * If the parent is part of the DOM Path, then we ignore it and interact with the grand
- * parent
- */
- if (parent.translator != null && parent.isInDOMPath()) {
- setParent(parent.getParent());
- }
-
- setVersionID(parent.getVersionID());
- if (parent.getEmfOwner() != null && parent.getTranslator() != null) {
-
- /* My parent had enough information to create themself */
-
- if (parent.getParent() != null) {
- setTranslator(parent.getTranslator().findChild(nodeName, parent.getEmfOwner(), getVersionID()));
-
- } else {
- setTranslator(parent.getTranslator());
- }
-
- if (this.translator == null) {
- /* Our translator is null! Ahh! Run! */
- throw new IllegalStateException("Parent Translator (" + parent.getTranslator() + //$NON-NLS-1$
- ") did not find a Child Translator for \"" + //$NON-NLS-1$
- nodeName + "\"."); //$NON-NLS-1$
- }
-
- if (this.translator.getReadAheadHelper(nodeName) == null && !this.translator.isManagedByParent()) {
- /*
- * I do not require a read ahead cue, and I am not managed by my parent so I can
- * create an instance of my EMF object
- */
-
- Notifier myEmfOwner = this.translator.createEMFObject(getNodeName(), null);
- setEmfOwner(myEmfOwner);
- this.translator.setMOFValue(parent.getEmfOwner(), myEmfOwner);
- }
- /*
- * Else I require a read ahead value or I am being managed by my parent, so I have
- * no need to create an EMF object
- */
- }
- /*
- * Else I am not mapped to the EMF stack (XML Elements found in the DOMPath are ignored)
- */
- }
- /* processAttributes is guarded and will not execute unless ready */
- processAttributes();
-
- }
-
- /**
- * commit() is invoked only if the CacheEventNode (CENO) has all the information they need and
- * should be able to determine what to do to the EMF feature.
- *
- * The commit() method will invoke discard() when it has completed its tasks, if needed. Thus,
- * after invoking this method, the CENO may have no meaningful state. If discard() is invoked,
- * all previously held reference will be released in order to be made eligible for Garbage
- * Collection.
- *
- */
- public void commit() {
-
- if (parent == null || this.isIgnorable()) {
- discard();
- releaseFromContainingPool();
- return;
- }
-
- ReadAheadHelper helper = null;
- Translator activeTranslator = getTranslator();
- Translator parentTranslator = getParent().getTranslator();
-
- if (parent != null && parent.getEmfOwner() == null) {
-
- /*
- * Not enough information yet, add the CacheEventNode to the DOM Cache tree
- */
-
- parent.appendToBuffer(this);
- if ((helper = getParent().getReadAheadHelper()) != null) {
- /*
- * If the parentRecord's emfOwner is null, then it must not be initialized therefore
- * it or one of its ancestors must require read ahead clues
- *
- * The following if statement checks if the parent is the node waiting for a
- * readAhead cue
- */
- EObject parentOwner = null;
- if (helper.nodeValueIsReadAheadName(getNodeName())) {
- /* The readAheadName is the value of the qName child node */
-
- /* We have enough information to create the EmfOwner in the parent! */
- parentOwner = parentTranslator.createEMFObject(getParent().getNodeName(), getBuffer());
-
- /*
- * Now we need to parse the cached DOM tree and update the emfOwner of the
- * parent
- */
- getParent().updateEMF(parentOwner);
-
- } else if (helper.nodeNameIsReadAheadName(getNodeName())) {
- /* The readAheadName is the actual name of the child node (qName) */
-
- /* We have enough information to create the EmfOwner in the parent! */
- parentOwner = parentTranslator.createEMFObject(getParent().getNodeName(), getNodeName());
-
- /*
- * Now we need to parse the cached DOM tree and update the emfOwner of the
- * parent
- */
- getParent().updateEMF(parentOwner);
- }
-
- } /* Else an ancestor of the parent is waiting */
-
- } else {
- if (activeTranslator != null) {
- if (activeTranslator.isManagedByParent()) {
-
- Object value = activeTranslator.convertStringToValue(getNodeName(), null, getBuffer(), getParent().getEmfOwner());
- activeTranslator.setMOFValue(getParent().getEmfOwner(), value);
- processAttributes();
- } else {
-
- activeTranslator.setTextValueIfNecessary(getBuffer(), getEmfOwner(), getVersionID());
- }
-
- }
- discard();
- releaseFromContainingPool();
- }
- }
-
- /**
- * Instruct the CacheEventNode to discard all references to make everything eligible for garbage
- * collection. This should ONLY be called after commit has succeeded. In the case of EMF
- * features that require a readAheadName, process not be completed in commit(), but rather will
- * be defered to the updateEMF() method. This method was made private specifically because it
- * could erase all information contained in the CacheEventNode before it has been processed.
- *
- */
- private void discard() {
- translator = null;
- emfOwner = null;
- buffer = null;
- if (children != null)
- children.clear();
- children = null;
- attributes = null;
- parent = null;
- }
-
- private void releaseFromContainingPool() {
- if (containingPool != null)
- containingPool.releaseNode(this);
- }
-
- public boolean isIgnorable() {
- if (ignorable == null) {
- boolean result = false;
- if (this.translator != null) {
- if (this.translator.isEmptyContentSignificant()) {
- result = false;
- } else {
- String domPath = this.translator.getDOMPath();
- result = (domPath != null) ? domPath.indexOf(this.nodeName) >= 0 : false;
- }
- }
- ignorable = result ? Boolean.TRUE : Boolean.FALSE;
- }
- return ignorable.booleanValue();
- }
-
- /**
- * Determines if a given child has a translator.
- *
- * @param childNodeName
- * the name of the current XML child node
- * @return true only if the childNodeName can be ignored (e.g. it is part of the DOM Path)
- */
- public boolean isChildIgnorable(String childNodeName) {
- boolean result = false;
-
- Translator childTranslator = null;
- if (this.getTranslator() != null) {
- childTranslator = this.getTranslator().findChild(childNodeName, this.getEmfOwner(), this.getVersionID());
-
- if (childTranslator != null) {
- if (childTranslator.isEmptyContentSignificant()) {
- result = false;
- } else {
- String temp = null;
- result = ((temp = childTranslator.getDOMPath()) != null) ? temp.indexOf(childNodeName) >= 0 : false;
- }
- }
- }
-
- return result;
- }
-
- public boolean isInDOMPath() {
- boolean result = false;
-
- if (this.getTranslator() != null) {
-
- result = this.getNodeName().equals(this.getTranslator().getDOMPath());
- }
-
- return result;
- }
-
- public String toString() {
- StringBuffer output = new StringBuffer("CacheEventNode[");//$NON-NLS-1$
- output.append("nodeName=");//$NON-NLS-1$
- output.append(nodeName);
- output.append("; translator=");//$NON-NLS-1$
- output.append(translator);
- output.append("; emfOwner=");//$NON-NLS-1$
- try {
- output.append(emfOwner);
- } catch (RuntimeException re) {
- output.append("Could not render as string!");//$NON-NLS-1$
- }
- output.append("; buffer=");//$NON-NLS-1$
- output.append(this.buffer);
- output.append("; hasChildren=");//$NON-NLS-1$
- output.append((children != null && children.size() > 0));
- if (children != null) {
- for (int i = 0; i < this.children.size(); i++) {
- output.append("\n\tchildren(");//$NON-NLS-1$
- output.append(i);
- output.append("): ");//$NON-NLS-1$
- output.append(this.children.get(i));
- }
- }
- output.append("]");//$NON-NLS-1$
- return output.toString();
- }
-
- /**
- * Updates the EMF model by creating EMF Features as necessary from the DOM Tree Cache
- *
- * @param owner
- */
- public void updateEMF(EObject owner) {
- this.setEmfOwner(owner);
- if (this.parent != null) {
- this.translator.setMOFValue((EObject) this.parent.getEmfOwner(), owner);
- this.processAttributes();
- }
-
- this.updateEMF();
- }
-
- /**
- * The translator and the owner of the parent CENO passed to this method should be nonnull
- */
- public void updateEMF() {
- if (this.children == null)
- return;
-
- CacheEventNode child = null;
- Translator childTranslator = null;
- Object value = null;
- if (this.getEmfOwner() != null) {
- Notifier parentOwner = this.getEmfOwner();
- Translator parentTranslator = this.getTranslator();
- for (int i = 0; i < this.children.size(); i++) {
-
- child = (CacheEventNode) this.children.get(i); /* Create the EMF feature */
- if (this.isChildIgnorable(child.getNodeName())) {
- this.addChildren(child.getChildren());
- } else {
- childTranslator = parentTranslator.findChild(child.getNodeName(), parentOwner, child.getVersionID());
- child.setTranslator(childTranslator);
-
- value = childTranslator.convertStringToValue(child.getNodeName(), null, child.getBuffer(), parentOwner);
- childTranslator.setMOFValue(parentOwner, value);
-
- if (childTranslator.isObjectMap()) {
- child.setEmfOwner((Notifier) value);
- childTranslator.setTextValueIfNecessary(child.getBuffer(), child.getEmfOwner(), getVersionID());
- }
-
- child.processAttributes();
- child.updateEMF(); /* update the EMF of the child */
-
- }
- child.discard();
- child.releaseFromContainingPool();
- }
- this.children = null;
- }
- }
-
- public void addChild(CacheEventNode child) {
- if (this.children == null) {
- this.children = new ArrayList();
- }
- if (parent != null && this.isIgnorable()) {
- parent.addChild(child);
- } else {
- this.children.add(child);
- }
- }
-
- protected void addChildren(List childrenArg) {
- if (this.children == null) {
- this.children = new ArrayList();
- }
- this.children.addAll(childrenArg);
- }
-
- public boolean removeChild(CacheEventNode child) {
- if (this.children == null) {
- return false;
- }
- return this.children.remove(child);
- }
-
- public List getChildren() {
- return this.children;
- }
-
- public ReadAheadHelper getReadAheadHelper() {
- if (this.translator != null && this.translator.hasReadAheadNames()) {
- return translator.getReadAheadHelper(nodeName);
- }
- return null;
- }
-
-
- /* See the documentation for the attributes field for info on how it is structured */
- public void setAttributes(Attributes attr) {
-
- /*
- * The attributes returned from the parser may be stored by reference, so we must copy them
- * over to a local data store
- */
- if (attr != null && attr.getLength() > 0) {
-
- if (this.attributes == null) {
- this.attributes = new String[attr.getLength() * 2];
- }
- for (int i = 0; i < attr.getLength(); i++) {
- this.attributes[i] = attr.getQName(i);
- this.attributes[i + attr.getLength()] = attr.getValue(i);
- }
-
- }
- }
-
- /**
- * processAttributes may be invoked multiple times. It is configured to only carry out the
- * processing one time. After it successfully completes the construction of Translators and
- * values it will discard the value of the attributes field by setting it to null.
- *
- */
- public void processAttributes() {
- /* See the documentation for the attributes field for info on how it is structured */
- if (this.attributes != null && this.attributes.length > 0) {
-
- if (this.emfOwner != null && this.translator != null) {
- Translator attrTranslator = null;
- final int limit = this.attributes.length / 2;
- Object value = null;
- for (int i = 0; i < limit; i++) {
-
- /* Find the attribute translator by using the attribute name (attributes[i]) */
- attrTranslator = this.translator.findChild(this.attributes[i], this.emfOwner, this.versionID);
-
- if (attrTranslator != null) {
-
- /*
- * Convert the value of corresponding attribute value (attributes[i+limit])
- * to a meaningful value
- */
- value = attrTranslator.convertStringToValue(this.attributes[i + limit], (EObject) this.emfOwner);
- attrTranslator.setMOFValue((EObject) this.emfOwner, value);
- }
- }
-
- /* Forget the attributes so we do not process them again */
- this.attributes = null;
- }
- }
- }
-
- /**
- * Appends data to the buffer stored by this CENO. Text will be extracted from the data array
- * begining at positiong <i>start </i> and ending at position <i>start+length </i>.
- *
- * @param data
- * @param start
- * @param length
- */
- public void appendToBuffer(char[] data, int start, int length) {
-
- if (parent != null && this.isIgnorable()) {
- parent.appendToBuffer(data, start, length);
- return;
- }
-
- if (buffer == null) {
- this.buffer = new StringBuffer();
- }
-
- /*
- * acts as a more efficient form of "append". Using this method avoids the need to copy the
- * data into its own data structure (e.g. String) before being added to the buffer
- */
- this.buffer.insert(buffer.length(), data, start, length);
-
- }
-
- /**
- * Add the given CENO as a child of this CENO.
- *
- * @param record
- */
- public void appendToBuffer(CacheEventNode record) {
-
- this.addChild(record);
- }
-
- public String getBuffer() {
- if (this.buffer == null) {
- return null;
- }
- return this.buffer.toString();
- }
-
- public Notifier getEmfOwner() {
- return emfOwner;
- }
-
- public CacheEventNode getParent() {
- return parent;
- }
-
- private void setParent(CacheEventNode record) {
- this.parent = record;
- }
-
- public Translator getTranslator() {
- return this.translator;
- }
-
- public void setEmfOwner(Notifier notifier) {
-
- this.emfOwner = notifier;
- }
-
- public void setTranslator(Translator translator) {
- this.translator = translator;
- }
-
- public String getNodeName() {
- return nodeName;
- }
-
- public int getVersionID() {
-
- if (this.parent == null) {
- try {
- return ((TranslatorResource) this.getEmfOwner()).getVersionID();
-
- } catch (RuntimeException re) {
- }
- }
- return this.versionID;
- }
-
- public void setVersionID(int i) {
- versionID = i;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventPool.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventPool.java
deleted file mode 100644
index 55799e2..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventPool.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.xml.sax.Attributes;
-
-/**
- * Provides an instance pool of reusable CacheEventNodes. The pool will default to 10 live
- * instances. When its available instances reach five times its initial capacity, it will shrink
- * itself down to the initial capacity.
- *
- * @author mdelder
- */
-public class CacheEventPool {
-
- public static final int DEFAULT_CAPACITY = 10;
- public static final int DEFAULT_CAPACITY_INCREMENT = 25;
-
- private int poolCapacity = DEFAULT_CAPACITY;
- private CacheEventStack availablePool = null;
- private Collection inusePool = null;
-
- public CacheEventPool() {
- this(DEFAULT_CAPACITY);
- }
-
- /**
- * Create a CacheEventPOol with the given initial capacity
- *
- * @param initialCapacity
- * The number of available instances to create.
- */
- public CacheEventPool(int initialCapacity) {
- poolCapacity = (initialCapacity > 0) ? initialCapacity : DEFAULT_CAPACITY;
- availablePool = new CacheEventStack();
- inusePool = new ArrayList(poolCapacity);
- }
-
- /**
- * Create a CacheEventNode (CENO) initialized to use the given resource as its EMF Owner.
- *
- * THIS METHOD SHOULD ONLY BE USED TO CREATE ROOT NODES.
- *
- * @param resource
- * the resource that will be populated
- * @return a CacheEventNode to serve as the root.
- */
- public CacheEventNode createCacheEventNode(TranslatorResource resource) {
- CacheEventNode adapter = fetchFreeNode();
- adapter.init(resource);
- return adapter;
- }
-
- /**
- * Create child CacheEventNodes (CENOs) that will branch from the given parent.
- *
- * @param parent
- * the containing CENO
- * @param nodeName
- * The value of the XML element node name
- * @param attributes
- * The attributes that were part of the given XML element
- * @return A CENO that has been properly initialized.
- */
- public CacheEventNode createCacheEventNode(CacheEventNode parent, String nodeName, Attributes attributes) {
- CacheEventNode adapter = fetchFreeNode();
- adapter.init(parent, nodeName, attributes);
- return adapter;
- }
-
- /**
- * Release the CacheEventNode CENO back to the pool of availabe instances. This method should
- * not be invoked directly. CENOs which are acquired from a given pool will automatically
- * release themselves when necessary.
- *
- * @param adapter
- */
- public void releaseNode(CacheEventNode adapter) {
- freeNode(adapter);
- }
-
- /**
- * freezePool() should be invoked to free any unused resources. After freezePool has been
- * invoked, warmPool() will need to be invoked before the pool can be used again.
- *
- */
- public void freezePool() {
- availablePool.clear();
- availablePool = null;
- }
-
- /**
- * warmPool() must be invoked to notify the pool it is about to be used. This should occur only
- * once per document rendering. Until the pool is in use, it contains no available
- * CacheEventNodes (CENOs) in order to limit the size of the in-memory footprint of the
- * EMF2SAXWriter.
- *
- */
- public void warmPool() {
- ensureMinimumCapacity();
- }
-
- private CacheEventNode fetchFreeNode() {
- CacheEventNode result = null;
-
- if (availablePool == null || availablePool.isEmpty())
- warmPool();
-
- result = availablePool.pop();
- inusePool.add(result);
-
- return result;
- }
-
- private void freeNode(CacheEventNode adapter) {
- if (inusePool.remove(adapter))
- availablePool.push(adapter);
- //else
- // throw new IllegalStateException("Adapter not contained in pool!");
- if (availablePool.size() > (5 * poolCapacity)) {
- availablePool.clear();
- ensureMinimumCapacity();
- }
- }
-
- private void ensureMinimumCapacity() {
- if (availablePool == null) {
- availablePool = new CacheEventStack();
- }
- if (availablePool.size() < poolCapacity) {
- final int minimumCapacity = poolCapacity - availablePool.size();
- for (int i = 0; i < minimumCapacity; i++)
- availablePool.push(new CacheEventNode(this));
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
deleted file mode 100644
index 03f4198..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CacheEventStack.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 24, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.ArrayList;
-import java.util.EmptyStackException;
-
-/**
- * An unsynchronized implementation of a Stack (LIFO) data structure. No casting is required when
- * using this data structure.
- *
- * @author mdelder
- */
-public class CacheEventStack extends ArrayList {
-
- /**
- *
- * @return the top of the stack without removing it
- */
- public CacheEventNode peek() {
- if (size() == 0)
- throw new EmptyStackException();
-
- return (CacheEventNode) get(size() - 1);
- }
-
- /**
- *
- * @return the top of the stack and removing it
- */
- public CacheEventNode pop() {
- if (size() == 0)
- throw new EmptyStackException();
-
- return (CacheEventNode) remove(size() - 1);
- }
-
- /**
- *
- * @param adapter
- * A CENO to push onto the top of the stack
- */
- public void push(CacheEventNode adapter) {
- add(adapter);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityPackageMappingRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityPackageMappingRegistry.java
deleted file mode 100644
index 25367c8..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityPackageMappingRegistry.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class is used to register mappings for a package prefix to its current namespace URI. Also,
- * this registry is used to map the package
- */
-public class CompatibilityPackageMappingRegistry {
- public static CompatibilityPackageMappingRegistry INSTANCE = new CompatibilityPackageMappingRegistry();
- private Map prefixToPackageURIs = new HashMap();
- private Map packageURIsToPrefixes = new HashMap();
-
- /**
- *
- */
- private CompatibilityPackageMappingRegistry() {
- super();
- }
-
- /**
- * @return
- */
- public Map getPackageURIsToPrefixes() {
- return packageURIsToPrefixes;
- }
-
- /**
- * @return
- */
- public Map getPrefixToPackageURIs() {
- return prefixToPackageURIs;
- }
-
- public void registerPrefixToPackageURI(String prefix, String uri) {
- if (prefix != null && uri != null) {
- prefixToPackageURIs.put(prefix, uri);
- packageURIsToPrefixes.put(uri, prefix);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
deleted file mode 100644
index f824de3..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityResourceFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 23, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CompatibilityResourceFactory extends XMIResourceFactoryImpl {
- /**
- *
- */
- public CompatibilityResourceFactory() {
- super();
- }
-
- protected Map prefixToPackageURIs;
-
- protected Map packageURIsToPrefixes;
-
- public Map getPrefixToPackageURI() {
- return CompatibilityPackageMappingRegistry.INSTANCE.getPrefixToPackageURIs();
- }
-
- public Map getPackageURIsToPrefixes() {
- return CompatibilityPackageMappingRegistry.INSTANCE.getPackageURIsToPrefixes();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl#createResource(org.eclipse.emf.common.util.URI)
- */
- public Resource createResource(URI uri) {
- return new CompatibilityXMIResourceImpl(uri);
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
deleted file mode 100644
index ee6ff3e..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilitySAXXMIHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 30, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMIHandler;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CompatibilitySAXXMIHandler extends SAXXMIHandler {
- protected final static String NULL_ATTRIB = XMLResource.XSI_NS + ":null"; //$NON-NLS-1$
-
- /**
- * @param xmiResource
- * @param helper
- * @param options
- */
- public CompatibilitySAXXMIHandler(XMLResource xmiResource, XMLHelper helper, Map options) {
- super(xmiResource, helper, options);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#isNull()
- */
- protected boolean isNull() {
- boolean isnull = super.isNull();
- if (!isnull)
- isnull = attribs.getValue(NULL_ATTRIB) != null;
- return isnull;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
deleted file mode 100644
index ba135f5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityURIConverter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.URIConverter;
-
-public interface CompatibilityURIConverter extends URIConverter {
- URI deNormalize(URI uri);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
deleted file mode 100644
index 5f17a46..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMILoadImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 30, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.impl.SAXWrapper;
-import org.eclipse.emf.ecore.xmi.impl.XMILoadImpl;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class CompatibilityXMILoadImpl extends XMILoadImpl {
-
- /**
- * @param helper
- */
- public CompatibilityXMILoadImpl(XMLHelper helper) {
- super(helper);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl#makeDefaultHandler()
- */
- protected DefaultHandler makeDefaultHandler() {
- return new SAXWrapper(new CompatibilitySAXXMIHandler(resource, helper, options));
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
deleted file mode 100644
index a954f5f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-public interface CompatibilityXMIResource extends XMIResource {
- int FORMAT_EMF1 = 0;
- /**
- * format for MOF5 compatibility; note that this can NOT be used with resources usings the
- * "platform:/plugin" protocol"
- */
- int FORMAT_MOF5 = 1;
-
- void addOriginalPackageURI(String packageUri, String originalUri);
-
- int getFormat();
-
- /**
- * Set the serialization format. By default it is FORMAT_EMF1.
- *
- * @see CompatibilityXMIResource#FORMAT_EMF1
- * @see CompatibilityXMIResource#FORMAT_MOF5
- */
- void setFormat(int format);
-
- boolean usesDefaultFormat();
-
- /**
- * @param rootObject
- */
- void removePreservingIds(EObject rootObject);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
deleted file mode 100644
index 061f18c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.wst.common.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.emf.utilities.IDUtil;
-
-
-public class CompatibilityXMIResourceImpl extends XMIResourceImpl implements CompatibilityXMIResource {
- protected static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
- protected int format = FORMAT_EMF1;
- protected Map originalPackageURIs = new HashMap();
- private boolean preserveIDs = false;
-
- private static final String PLATFORM_PROTOCOL = "platform"; //$NON-NLS-1$
- private static final String PLATFORM_PLUGIN = "plugin"; //$NON-NLS-1$
-
- /**
- * Constructor for MappableXMIResourceImpl.
- */
- public CompatibilityXMIResourceImpl() {
- super();
- initDefaultSaveOptions();
- }
-
- public CompatibilityXMIResourceImpl(URI uri) {
- super(uri);
- initDefaultSaveOptions();
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLHelper()
- */
- protected final XMLHelper createXMLHelper() {
- MappedXMIHelper helper = doCreateXMLHelper();
- helper.setPackageURIsToPrefixes(getPackageURIsToPrefixes());
- return helper;
- }
-
- protected MappedXMIHelper doCreateXMLHelper() {
- return new MappedXMIHelper(this, getPrefixToPackageURIs());
- }
-
- /**
- * Subclasses should not need to override this method.
- *
- * @see CompatibilityPackageMappingRegistry#getPrefixToPackageURIs()
- */
- protected Map getPrefixToPackageURIs() {
- return CompatibilityPackageMappingRegistry.INSTANCE.getPrefixToPackageURIs();
- }
-
- /**
- * Subclasses should not need to override this method.
- *
- * @see CompatibilityPackageMappingRegistry#getPrefixToPackageURIs()
- */
- protected Map getPackageURIsToPrefixes() {
- return CompatibilityPackageMappingRegistry.INSTANCE.getPackageURIsToPrefixes();
- }
-
- public void addOriginalPackageURI(String packageUri, String originalUri) {
- originalPackageURIs.put(packageUri, originalUri);
- }
-
- public int getFormat() {
- return format;
- }
-
- public void setFormat(int format) {
- if (!isPlatformPluginResourceURI())
- this.format = format;
- }
-
- private boolean isPlatformPluginResourceURI() {
- URI aURI = getURI();
-
- return aURI != null && PLATFORM_PROTOCOL.equals(uri.scheme()) && PLATFORM_PLUGIN.equals(uri.segment(0));
- }
-
- /**
- * @see org.eclipse.emf.ecore.resource.Resource#getURIFragment(EObject)
- */
- public String getURIFragment(EObject eObject) {
- if (usesDefaultFormat())
- return super.getURIFragment(eObject);
- return IDUtil.getOrAssignID(eObject, this);
- }
-
- public boolean usesDefaultFormat() {
- return format == CompatibilityXMIResource.FORMAT_EMF1;
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLSave()
- */
- protected XMLSave createXMLSave() {
- if (usesDefaultFormat())
- return super.createXMLSave();
- return new CompatibilityXMISaveImpl(createXMLHelper());
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doSave(OutputStream, Map)
- */
- public void doSave(OutputStream outputStream, Map options) throws IOException {
- super.doSave(outputStream, options);
- }
-
- /**
- * Method initDefaultOptions.
- */
- protected void initDefaultSaveOptions() {
- if (defaultSaveOptions == null) {
- getDefaultSaveOptions();
- }
- }
-
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceImpl#getEObjectByID(String)
- */
- protected EObject getEObjectByID(String id) {
- if (idToEObjectMap != null) {
- EObject eObject = (EObject) idToEObjectMap.get(id);
- if (eObject != null) {
- return eObject;
- }
- }
- return null;
- }
-
- /**
- * Called when the object is unloaded. This implementation
- * {@link InternalEObject#eSetProxyURI sets}the object to be a proxy and clears the
- * {@link #eAdapters adapters}.
- */
- protected void unloaded(InternalEObject internalEObject) {
- //overridden from the super class; call super.getURIFragment instead of the implementation
- //at this level, to avoid ID generation during unload
- //internalEObject.eSetProxyURI(uri.appendFragment(getURIFragment(internalEObject)));
- internalEObject.eSetProxyURI(uri.appendFragment(super.getURIFragment(internalEObject)));
- internalEObject.eAdapters().clear();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doLoad(java.io.InputStream,
- * java.util.Map)
- */
- public final void doLoad(InputStream inputStream, Map options) throws IOException {
- ExtendedEcoreUtil.addLoadingTag(this);
- try {
- basicDoLoad(inputStream, options);
- } finally {
- ExtendedEcoreUtil.removeLoadingTag(this);
- }
- }
-
- protected void basicDoLoad(InputStream inputStream, Map options) throws IOException {
- super.doLoad(inputStream, options);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#init()
- */
- protected void init() {
- super.init();
- setEncoding(DEFAULT_ENCODING);
- }
-
- protected XMLLoad createXMLLoad() {
- return new CompatibilityXMILoadImpl(createXMLHelper());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource#removePreservingIds(org.eclipse.emf.ecore.EObject)
- */
- public void removePreservingIds(EObject rootObject) {
- setPreserveIDs(true);
- getContents().remove(rootObject);
- }
-
- /**
- * @return Returns the preserveIDs.
- */
- public boolean isPreserveIDs() {
- return preserveIDs;
- }
-
- /**
- * @param preserveIDs
- * The preserveIDs to set.
- */
- public void setPreserveIDs(boolean preserveIDs) {
- this.preserveIDs = preserveIDs;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#detachedHelper(org.eclipse.emf.ecore.EObject)
- */
- protected void detachedHelper(EObject eObject) {
- if (modificationTrackingAdapter != null) {
- eObject.eAdapters().remove(modificationTrackingAdapter);
- }
-
- if (useUUIDs()) {
- DETACHED_EOBJECT_TO_ID_MAP.put(eObject, getID(eObject));
- }
-
- if (!isPreserveIDs() && idToEObjectMap != null && eObjectToIDMap != null) {
- idToEObjectMap.remove(eObjectToIDMap.remove(eObject));
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
deleted file mode 100644
index c1a7bf2..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMISaveImpl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-
-public class CompatibilityXMISaveImpl extends XMISaveImpl {
-
- /**
- * Constructor for CompatibilityXMISaveImpl.
- *
- * @param helper
- */
- public CompatibilityXMISaveImpl(XMLHelper helper) {
- super(helper);
- }
-
- /**
- * Constructor for CompatibilityXMISaveImpl.
- *
- * @param options
- * @param helper
- * @param encoding
- */
- public CompatibilityXMISaveImpl(Map options, XMLHelper helper, String encoding) {
- super(options, helper, encoding);
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#init(XMLResource, Map)
- */
- protected void init(XMLResource resource, Map options) {
- super.init(resource, options);
- xmiType = true;
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMISaveImpl#addNamespaceDeclarations()
- */
- public void addNamespaceDeclarations() {
- doc.addAttribute(XMI_VER_NS, XMIResource.VERSION_VALUE);
- doc.addAttribute(XMI_XMLNS, XMIResource.XMI_URI);
- EPackage[] packages = helper.packages();
- StringBuffer xsiSchemaLocation = null;
- if (declareSchemaLocation) {
- for (int i = 0; i < packages.length; i++) {
- EPackage ePackage = packages[i];
-
- EObject root = EcoreUtil.getRootContainer(ePackage);
- if (root instanceof EPackage) {
- EPackage rootEPackage = (EPackage) root;
- Resource resource = rootEPackage.eResource();
- if (resource != null) {
- URI uri = resource.getURI();
- String rootNsURI = rootEPackage.getNsURI();
- if (uri == null ? rootNsURI != null : !uri.toString().equals(rootNsURI)) {
- declareXSI = true;
- if (xsiSchemaLocation == null) {
- xsiSchemaLocation = new StringBuffer();
- } else {
- xsiSchemaLocation.append(' ');
- }
- xsiSchemaLocation.append(rootNsURI);
- xsiSchemaLocation.append(' ');
- xsiSchemaLocation.append(helper.getHREF(rootEPackage));
- }
- }
- }
- }
- }
-
- if (declareXSI) {
- doc.addAttribute(XSI_XMLNS, XMLResource.XSI_URI);
- }
-
- for (int i = 0; i < packages.length; i++) {
- EPackage ePackage = packages[i];
- //Modified from superclass - dispatch back to helper for compatibility
- //String nsURI = ePackage.getNsURI();
- //String nsPrefix = ePackage.getNsPrefix();
- String[] nsInfo = ((MappedXMIHelper) helper).getNSInfo(ePackage);
- doc.addAttributeNS(XMLResource.XML_NS, nsInfo[0], nsInfo[1]);
- }
-
- if (xsiSchemaLocation != null) {
- doc.addAttribute(XSI_SCHEMA_LOCATION, xsiSchemaLocation.toString());
- }
- }
-
- protected void saveHref(EObject remote, EStructuralFeature f) {
- String name = helper.getQName(f);
- String href = helper.getHREF(remote);
- if (href != null) {
- doc.startElement(name);
- EClass eClass = remote.eClass();
-
- EClass expectedType = (EClass) f.getEType();
- //Changed next line to always write type if expectedType
- //is different from eClass
- if (eClass != expectedType) {
- saveTypeAttribute(eClass);
- }
-
- doc.addAttribute(XMLResource.HREF, href);
- doc.endEmptyElement();
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
deleted file mode 100644
index 356f102..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ConstantAttributeTranslator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 15, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author schacher
- */
-public class ConstantAttributeTranslator extends Translator {
-
- protected String attributeValue;
-
- /**
- * @param domNameAndPath
- * @param eClass
- */
- public ConstantAttributeTranslator(String domNameAndPath, String attributeValue) {
- super(domNameAndPath, null, DOM_ATTRIBUTE);
- this.attributeValue = attributeValue;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public Object getMOFValue(EObject mofObject) {
- return attributeValue;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public boolean isSetMOFValue(EObject emfObject) {
- return true;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
deleted file mode 100644
index 110a323..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.emf.utilities.NamespaceAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.Namespace;
-
-
-/**
- * @author schacher
- */
-public class DefaultTranslatorFactory implements VariableTranslatorFactory {
-
- public static final String XMLNS = "xmlns:"; //$NON-NLS-1$
- public static final DefaultTranslatorFactory INSTANCE = new DefaultTranslatorFactory();
-
- public DefaultTranslatorFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#accepts(java.lang.String)
- */
- public boolean accepts(String domName) {
- return domName != null && domName.startsWith(XMLNS);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#accepts(org.eclipse.emf.common.notify.Notification)
- */
- public boolean accepts(Notification notif) {
- return notif.getFeature() == NamespaceAdapter.NOTIFICATION_FEATURE;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(java.lang.String)
- */
- public Translator create(String domName) {
- return new NamespaceTranslator(domName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(org.eclipse.emf.ecore.EObject)
- */
- public List create(Notifier target) {
- if (!(target instanceof EObject))
- return null;
- List namespaces = NamespaceAdapter.getNamespaces((EObject) target);
- if (namespaces == null || namespaces.isEmpty())
- return null;
- List result = new ArrayList(namespaces.size());
- for (int i = 0; i < namespaces.size(); i++) {
- result.add(create((Namespace) namespaces.get(i)));
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(org.eclipse.emf.common.notify.Notification)
- */
- public Translator create(Notification notif) {
- Namespace ns = (Namespace) notif.getNewValue();
- return create(ns);
- }
-
- private Translator create(Namespace ns) {
- return new NamespaceTranslator(XMLNS + ns.getPrefix());
- }
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
deleted file mode 100644
index c7d1c62..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DependencyTranslator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author schacher
- */
-public class DependencyTranslator extends Translator {
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public DependencyTranslator(String domNameAndPath, EStructuralFeature aFeature, EStructuralFeature aDependentFeature) {
- super(domNameAndPath, aFeature);
- dependencyFeature = aDependentFeature;
- }
-
- public EObject getChild(EObject parent) {
- EObject child = basicGetDependencyObject(parent);
- if (child == null)
- return createChild(parent);
- return child;
- }
-
-
- protected EObject createChild(EObject parent) {
- EObject child = createEMFObject(dependencyFeature);
- parent.eSet(dependencyFeature, child);
- return child;
- }
-
- public List getMOFChildren(EObject mofObject) {
- //return super.getMOFChildren(getChild(mofObject));
- return super.getMOFChildren(mofObject);
- }
-
- public Object getMOFValue(EObject mofObject) {
- return super.getMOFValue(getChild(mofObject));
- }
-
- public void setMOFValue(EObject emfObject, Object value) {
- //super.setMOFValue(getChild(emfObject), value);
- super.setMOFValue(getChild(emfObject), value, -1);
- }
-
- public void setMOFValue(Notifier owner, Object value, int newIndex) {
- super.setMOFValue(getChild((EObject) owner), value, newIndex);
- }
-
- public void removeMOFValue(Notifier owner, Object value) {
- super.removeMOFValue(getChild((EObject) owner), value);
- }
-
- public boolean isSetMOFValue(EObject emfObject) {
- return super.isSetMOFValue(getChild(emfObject));
- }
-
- public void unSetMOFValue(EObject emfObject) {
- super.unSetMOFValue(getChild(emfObject));
- }
-
-
- public boolean isDependencyChild() {
- return true;
- }
-
- public boolean featureExists(EObject emfObject) {
- return super.featureExists(getChild(emfObject));
- }
-
- public void clearList(EObject mofObject) {
- super.clearList(getChild(mofObject));
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
deleted file mode 100644
index 9782ea1..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.w3c.dom.Node;
-
-public interface EMF2DOMAdapter extends Adapter {
-
-
- Class ADAPTER_CLASS = EMF2DOMAdapter.class;
-
- /**
- * Return the DOM node that the target of this adapter maps to. If the target MOF object maps to
- * more than one DOM node, this node is the top-most node.
- */
- Node getNode();
-
- void setNode(Node aNode);
-
- /**
- * Set to false and notification of changes from both the DOM node and the MOF object will be
- * ignored.
- */
- boolean isNotificationEnabled();
-
- /**
- * Set to false and notification of changes from both the DOM node and the MOF object will be
- * ignored.
- */
- void setNotificationEnabled(boolean isEnabled);
-
- /**
- * Updates the DOM tree for this adapter from the current values of the MOF Object. This method
- * updates ALL the DOM nodes from all the MOF attributes.
- */
- void updateDOM();
-
- /**
- * Updates the MOF Object from the DOM tree. All the children of the DOM tree are updated into
- * the MOF object.
- */
- void updateMOF();
-
- public void updateDOMFeature(Translator map, Node node, EObject mofObject);
-
- public void updateMOFFeature(Translator map, Node node, EObject mofObject);
-
- EObject getEObject();
-
- /**
- * Return true if MOF object is a proxy.
- */
- boolean isMOFProxy();
-
- /**
- * Remove the DOM adapters from the node AND all its child nodes, recursively.
- */
- void removeAdapters(Node node);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
deleted file mode 100644
index 0321a1e..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
+++ /dev/null
@@ -1,1740 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.emf.utilities.EtoolsCopySession;
-import org.eclipse.wst.common.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emf.utilities.FeatureValueConversionException;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-import org.eclipse.wst.common.internal.emf.utilities.WFTUtilsResourceHandler;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-
-public class EMF2DOMAdapterImpl extends AdapterImpl implements EMF2DOMAdapter {
-
- final protected static boolean fDebug = false;
-
- protected boolean fNotificationEnabled = true;
-
- protected Node fNode;
-
- protected Translator fTranslator;
-
- protected EMF2DOMRenderer fRenderer;
-
- protected Translator[] childTranslators;
-
- protected boolean isRoot = false;
-
- private class DependencyAdapter extends org.eclipse.emf.common.notify.impl.AdapterImpl {
-
- static final String KEY = "EMF2DOMDependencyAdapter"; //$NON-NLS-1$
-
- public void notifyChanged(Notification msg) {
- EMF2DOMAdapterImpl.this.notifyChanged(msg);
- }
-
- /**
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(Object)
- */
- public boolean isAdapterForType(Object type) {
- return KEY.equals(type);
- }
- }
-
- /**
- * Constructor for root adapters.
- */
- public EMF2DOMAdapterImpl(TranslatorResource resource, Document document, EMF2DOMRenderer renderer, Translator translator) {
- this((Notifier) resource, (Node) document, renderer, translator);
- isRoot = true;
- }
-
- /**
- * Construct an Adapter given an EObject and a node
- */
- public EMF2DOMAdapterImpl(Notifier object, Node node, EMF2DOMRenderer renderer, Translator translator) {
- super();
- setTarget(object);
- fNode = node;
- fRenderer = renderer;
- fTranslator = translator;
- initChildTranslators();
- addEMFAdapter();
- addDOMAdapter();
- addDependencyAdapterIfNecessary();
- }
-
- /**
- * Construct an adapter from a DOM Node. The EObject will be created
- */
- public EMF2DOMAdapterImpl(Node node, EMF2DOMRenderer renderer, Translator translator) {
- fNode = node;
- fRenderer = renderer;
- fTranslator = translator;
- setTargetFromNode();
- initChildTranslators();
- addEMFAdapter();
- addDOMAdapter();
- addDependencyAdapterIfNecessary();
-
- }
-
- protected void addDependencyAdapterIfNecessary() {
- if (!fTranslator.isDependencyParent())
- return;
- EObject child = fTranslator.basicGetDependencyObject(getEObject());
- if (child != null)
- addDependencyAdapter(child);
- }
-
- protected void initChildTranslators() {
-
- List children = new ArrayList();
- // TODO come up with translator extension mechanism
- //children.add(AnnotationsTranslator.INSTANCE);
- children.addAll(Arrays.asList(fTranslator.getChildren(getTarget(), fRenderer.getVersionID())));
-
- VariableTranslatorFactory factory = fTranslator.getVariableTranslatorFactory();
- if (factory != null) {
- String domName = null;
- NamedNodeMap map = fNode.getAttributes();
-
- if (map != null) {
- int length = map.getLength();
- for (int i = 0; i < length; i++) {
- Node attrNode = map.item(i);
- domName = attrNode.getNodeName();
- //Handle variable translators
- Translator t = fTranslator.findChild(domName, getTarget(), fRenderer.getVersionID());
- if (t != null && !children.contains(t))
- children.add(t);
- }
- }
- List childrenFromEMF = factory.create(getTarget());
- if (childrenFromEMF != null)
- children.addAll(childrenFromEMF);
- }
-
- childTranslators = (Translator[]) children.toArray(new Translator[children.size()]);
- }
-
- /**
- * Set to false and notification of changes from both the DOM node and the MOF object will be
- * ignored.
- */
- public boolean isNotificationEnabled() {
- return fNotificationEnabled;
- }
-
- /**
- * Set to false and notification of changes from both the DOM node and the MOF object will be
- * ignored.
- */
- public void setNotificationEnabled(boolean isEnabled) {
- fNotificationEnabled = isEnabled;
- }
-
- public boolean isAdapterForType(Object type) {
- return EMF2DOMAdapter.ADAPTER_CLASS == type;
- }
-
- protected void addEMFAdapter() {
- target.eAdapters().add(this);
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer();
- sb.append(shortClassName(this));
- sb.append('(');
- sb.append(getNode().getNodeName());
- sb.append(',');
- sb.append(shortClassName(getTarget()));
- sb.append(')');
- return sb.toString();
- }
-
- protected String shortClassName(Object o) {
- String cn = o.getClass().getName();
- int i = cn.lastIndexOf('.');
- return cn.substring(i + 1, cn.length());
- }
-
- /*
- * Prints out a MOF notification for debugging
- */
- protected void debugMOFNotify(Notification msg) {
- if (fDebug) {
- String notifType = ""; //$NON-NLS-1$
- switch (msg.getEventType()) {
- case Notification.ADD :
- notifType = "ADD"; //$NON-NLS-1$
- break;
- case Notification.REMOVE :
- notifType = "REMOVE"; //$NON-NLS-1$
- break;
- case Notification.ADD_MANY :
- notifType = "ADD_MANY"; //$NON-NLS-1$
- break;
- case Notification.REMOVE_MANY :
- notifType = "REMOVE_MANY"; //$NON-NLS-1$
- break;
- case Notification.SET : {
- if (msg.getPosition() == Notification.NO_INDEX)
- notifType = "REPLACE"; //$NON-NLS-1$
- else
- notifType = "SET"; //$NON-NLS-1$
- break;
- }
- case Notification.UNSET :
- notifType = "UNSET"; //$NON-NLS-1$
- break;
- }
-
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("MOF Change: " + notifType); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tnotifier : " + msg.getNotifier()); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tchangedFeature: " + msg.getFeature()); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\toldValue : " + msg.getOldValue()); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tnewValue : " + msg.getNewValue()); //$NON-NLS-1$
- }
- }
-
- /*
- * Override this method to create the feature maps for the adapter.
- */
- protected Translator[] getChildTranslators() {
- return childTranslators;
- }
-
- protected Translator findTranslator(Notification not) {
- if (not.getFeature() == null)
- return null;
- Translator[] maps = getChildTranslators();
- for (int i = 0; i < maps.length; i++) {
- if (maps[i].isMapFor(not.getFeature(), not.getOldValue(), not.getNewValue()))
- return maps[i];
- }
- return null;
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
- * attribute name to the DOM node name
- */
- protected void primUpdateDOMMultiFeature(Translator map, Node node, List mofChildren, List domChildren, Notifier owner) {
-
- //Used for inserting primitives
- List inorderDOMChildren = null;
- if (!map.isObjectMap() || map.isManagedByParent()) {
- inorderDOMChildren = new ArrayList();
- inorderDOMChildren.addAll(domChildren);
- }
- Node parent = findDOMPath(node, map, false);
-
- // Go though the MOF children checking to see if the corresponding
- // MOF Adapter children exists. If not, create the adapter.
- // Also handles reordering children that have moved.
- int i = 0;
- for (; i < mofChildren.size(); i++) {
- Object child = mofChildren.get(i);
- EObject mofChild = null;
-
- EMF2DOMAdapter adapter = null;
-
- // Check to see if the child is a MOF Object.
- if (!map.isManagedByParent() && child instanceof EObject) {
- mofChild = (EObject) mofChildren.get(i);
- adapter = getExistingAdapter(mofChild);
- }
-
- if (adapter != null && i < domChildren.size() && domChildren.get(i) == adapter.getNode())
- continue;
- if (adapter != null) {
- if (domChildren.isEmpty())
- continue;
- // A node has been reordered in the list
- Node reorderNode = adapter.getNode();
- Node insertBeforeNode = (Node) domChildren.get(i);
- domChildren.remove(reorderNode);
- domChildren.add(i, reorderNode);
- if (reorderNode != insertBeforeNode) {
- reorderDOMChild(parent, reorderNode, insertBeforeNode, map);
- }
- } else {
- // A new node has been added, create it
- parent = createDOMPath(node, map);
- if (mofChild != null) {
- adapter = createAdapter(mofChild, map);
- Node newNode = adapter.getNode();
- Node insertBeforeNode = findInsertBeforeNode(parent, map, mofChildren, i, domChildren);
- DOMUtilities.insertBeforeNodeAndWhitespace(parent, newNode, insertBeforeNode);
- domChildren.add(i, newNode);
- boolean notificationFlag = adapter.isNotificationEnabled();
- adapter.setNotificationEnabled(false);
- try {
- indent(newNode, map);
- } finally {
- adapter.setNotificationEnabled(notificationFlag);
- }
- adapter.updateDOM();
- } else {
- // The mof feature is a collection of primitives.
- // create a new dom node and listen to it.
- Element newNode = createNewNode(null, map);
- Node insertBeforeNode = findInsertBeforeNode(parent, map, mofChildren, i, inorderDOMChildren);
- DOMUtilities.insertBeforeNodeAndWhitespace(parent, newNode, insertBeforeNode);
- indent(newNode, map);
- addDOMAdapter(newNode); // Hook up listeners
- domChildren.add(i, newNode);
- inorderDOMChildren.add(newNode);
- Text newText = parent.getOwnerDocument().createTextNode(map.convertValueToString(child, (EObject) owner));
- DOMUtilities.insertBeforeNode(newNode, newText, null);
- }
- }
- }
-
- // Remove any remaining adapters.
- for (; i < domChildren.size(); i++) {
- removeDOMChild(parent, (Element) domChildren.get(i));
- }
-
- // If there are no MOF children, remove any unnecessary DOM node paths
- if (mofChildren.size() == 0 && map.hasDOMPath()) {
- if (map.shouldRenderEmptyDOMPath((EObject) owner))
- createDOMPath(node, map);
- else
- removeDOMPath(node, map);
- }
-
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
- * attribute name to the DOM node name
- */
- protected void primUpdateMOFMultiFeature(Translator map, Node node, List mofChildren, List domChilren) {
-
- Hashtable nodeToAdapter = new Hashtable();
-
- for (int i = 0; i < mofChildren.size(); i++) {
- EMF2DOMAdapter adapter = getExistingAdapter((EObject) mofChildren.get(i));
- if (adapter != null)
- nodeToAdapter.put(adapter.getNode(), adapter);
- }
-
- // Go though the DOM children checking to see if the corresponding
- // MOF Adapter children exists. If not, create the adapter.
- // Also handles reordering children that have moved.
- int i = 0;
- int mofIndex = 0;
- List adaptersToUpdate = new ArrayList();
- for (; i < domChilren.size(); i++) {
- Element childNode = (Element) domChilren.get(i);
- EMF2DOMAdapter adapter = i < mofChildren.size() ? getExistingAdapter((EObject) mofChildren.get(i)) : null;
- if (adapter != null && !adapter.isMOFProxy() && adapter.getNode() == childNode) {
- // Because the adapter is processing STRUCTURE_CHANGED from the
- // DOM, we
- // must update all the way down the tree since anything under
- // the notifying
- // DOM node could have changed.
- adapter.updateMOF();
- mofIndex++;
- continue;
- }
-
- adapter = (EMF2DOMAdapter) nodeToAdapter.get(childNode);
- if (adapter != null) {
- reorderIfNecessary((EList) mofChildren, adapter.getEObject(), mofIndex);
- mofIndex++;
- } else {
- adapter = createAdapter(childNode, map);
- if (adapter != null) {
- try {
- //We don't want to push anything back to the child dom
- adapter.setNotificationEnabled(false);
- map.setMOFValue(getTarget(), adapter.getTarget(), mofIndex);
- } finally {
- adapter.setNotificationEnabled(true);
- }
-
- adaptersToUpdate.add(adapter);
- mofIndex++;
- }
- }
- }
-
- // Remove any remaining adapters.
- for (; i < mofChildren.size();) {
- removeMOFValue((EObject) mofChildren.get(i), map);
- }
-
- // The adapters cannot be updated as they created. We must wait until
- // all of the adapters are created and removed before updating,
- // otherwise
- // we can get in a state where there are adapters fighting with
- // eachother
- // (one for the old node and one for the new node).
- for (int j = 0; j < adaptersToUpdate.size(); j++) {
- ((EMF2DOMAdapter) adaptersToUpdate.get(j)).updateMOF();
- }
- }
-
- /**
- * Removes a feature's value.
- *
- * @param childAdapter
- * com.ibm.etools.mof2dom.EMF2DOMAdapter The child to remove
- * @param mofAttributeName
- * String The name of the mofAttribute to remove the child from.
- */
- protected void removeMOFValue(EObject value, Translator translator) {
-
- if (value == null)
- return;
-
- EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(value, EMF2DOMAdapter.ADAPTER_CLASS);
- if (adapter != null) {
- // Remove the adapter from BOTH the MOF Object and the DOM Nodes
- value.eAdapters().remove(adapter);
- removeAdapters(adapter.getNode());
- }
-
- EStructuralFeature feature = translator.getFeature();
- boolean doUnload = feature == null || (translator.isObjectMap() && ((EReference) feature).isContainment());
-
- // translator.removeMOFValue() was here originally
-
- // Unload the objects.
- if (doUnload)
- ExtendedEcoreUtil.unload(value);
-
- // Remove the MOF value
- translator.removeMOFValue(getTarget(), value);
- }
-
- protected void reorderIfNecessary(EList emfChildren, EObject eObj, int emfIndex) {
- int currIndex = emfChildren.indexOf(eObj);
- if (currIndex > -1 && currIndex != emfIndex)
- emfChildren.move(emfIndex, eObj);
- }
-
- /**
- * default is to do nothing; subclasses can override
- */
- protected void indent(Node newNode, Translator map) {
-
- }
-
- protected Node findInsertBeforeNode(Node parentNode, Translator map, List mofList, int mofInx, List domList) {
- Node insertBeforeNode = null;
-
- // If there are no current dom children for this map, find the initial
- // insert pos.
- if (domList.size() == 0)
- return findInitialInsertBeforeNode(parentNode, map);
-
- // If some dom nodes then find the correct one to insert before.
- int i = mofInx + 1;
- while (i < mofList.size() && insertBeforeNode == null) {
- // Start at the mofInx passed in and look forward for the first
- // adapted
- // MOF object. Use that node as the insert before node.
- Object o = mofList.get(i);
- if (!map.isObjectMap() || map.isManagedByParent())
- break;
- EObject tMOFObject = (EObject) o;
- EMF2DOMAdapter tAdapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(tMOFObject, EMF2DOMAdapter.ADAPTER_CLASS);
- if (tAdapter != null) {
- insertBeforeNode = tAdapter.getNode();
- }
- i++;
- }
-
- // Handle inserting at the end of the list
- if (insertBeforeNode == null)
- insertBeforeNode = DOMUtilities.getNextNodeSibling((Node) domList.get(domList.size() - 1));
- if (insertBeforeNode == null)
- insertBeforeNode = ((Node) domList.get(domList.size() - 1)).getNextSibling();
-
- return insertBeforeNode;
- }
-
- protected Node findInitialInsertBeforeNode(Node parentNode, Translator mapNode) {
- Translator[] maps = getChildTranslators();
-
- // First, skip past all the maps in the ordered collection
- // of maps. We want to begin the search with this node.
- int i = 0;
- for (; i < maps.length; i++) {
- if (maps[i] == mapNode)
- break;
- }
-
- // Now search go through each map node until a child node matching
- // its DOM name is found.
- Node insertBeforeNode = null;
- for (int j = i; j < maps.length && insertBeforeNode == null; j++) {
- NodeList childNodes = parentNode.getChildNodes();
- Translator nodeToFindMap = maps[j];
- for (int k = 0; k < childNodes.getLength(); k++) {
- Node node = childNodes.item(k);
- if (nodeToFindMap.isMapFor(node.getNodeName())) {
- insertBeforeNode = node;
- break;
- }
- }
- }
- return insertBeforeNode;
- }
-
- /*
- * Traverses the path that <map> specifies. Returns the last node of the path that was able to
- * be traversed or null if the path could not be traversed. The <addAdapters> boolean is used to
- * determine if the receiver is added as an adapter to every node found on the path.
- */
- protected Node findDOMPath(Node parent, Translator map, boolean addAdapters) {
-
- String path = map.getDOMPath();
- Node curNode = parent;
- Iterator iter = DOMUtilities.createPathIterator(path);
-
- while (curNode != null && iter.hasNext()) {
- String nodeName = (String) iter.next();
- curNode = DOMUtilities.getNodeChild(curNode, nodeName);
- if (addAdapters && curNode != null) {
- addDOMAdapter(curNode);
- }
- }
- return curNode;
- }
-
- /**
- * Return the list of DOM node children that currently exist with the specified tagname.
- */
- protected List getDOMChildren(Node node, Translator map) {
- Node parent = findDOMPath(node, map, true);
- if (parent != null)
- return DOMUtilities.getNodeChildren(parent, map.getDOMNames());
- return new ArrayList();
- }
-
- protected EMF2DOMAdapter getExistingAdapter(EObject refObject) {
- EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(refObject, EMF2DOMAdapter.ADAPTER_CLASS);
- if (adapter != null && adapter.isMOFProxy()) {
- refObject.eAdapters().remove(adapter);
- removeDOMAdapter(adapter.getNode(), adapter);
- adapter = null;
- }
- return adapter;
- }
-
- protected void primAddDOMAdapter(Node aNode, EMF2DOMAdapter anAdapter) {
- fRenderer.registerDOMAdapter(aNode, anAdapter);
- }
-
- protected EMF2DOMAdapter primGetExistingAdapter(Node aNode) {
- return fRenderer.getExistingDOMAdapter(aNode);
- }
-
- protected void removeDOMAdapter(Node aNode, EMF2DOMAdapter anAdapter) {
- fRenderer.removeDOMAdapter(aNode, anAdapter);
- }
-
- protected void addDOMAdapter(Node childNode) {
-
- // Only add the adapter if this is an child node that will not be
- // adapted. For instance a subtree that maps to a MOF attribute
- // setting.
- if (childNode.getNodeType() == Node.ELEMENT_NODE) {
- EMF2DOMAdapter attrAdapter = primGetExistingAdapter(childNode);
-
- if (attrAdapter == null || attrAdapter.getNode() != getNode()) {
- // If the node is adapted, but not by this adapter then remove
- // it. This happens to non-object children when the parent tag
- // name is changed.
- removeDOMAdapter(childNode, attrAdapter);
-
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tCHILD: Adding DOM adapter: " + this); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\t\tto: " + childNode); //$NON-NLS-1$
- }
- primAddDOMAdapter(childNode, this);
- }
- }
- }
-
- /**
- * Reorder a child before a given node
- */
- protected void reorderDOMChild(Node parentNode, Node childNode, Node insertBeforeNode, Translator map) {
- removeDOMChild(parentNode, childNode, false);
- parentNode.insertBefore(childNode, insertBeforeNode);
- }
-
- protected String getNewlineString(Node node) {
- return DOMUtilities.NEWLINE_STRING;
- }
-
- protected String primGetIndentString(Node node) {
- return DOMUtilities.getIndentString(node);
- }
-
- /**
- * Remove a child node
- */
- protected void removeDOMChild(Node parentNode, Node childNode) {
- removeDOMChild(parentNode, childNode, true);
- }
-
- /**
- * Remove a child node
- */
- protected void removeDOMChild(Node parentNode, Node childNode, boolean removeAdapter) {
- if (childNode == null)
- return;
-
- // Look for any whitespace preceeding the node being
- // removed and remove it as well.
- Text prevText = DOMUtilities.getPreviousTextSibling(childNode);
- if (prevText != null && DOMUtilities.isWhitespace(prevText)) {
- parentNode.removeChild(prevText);
- }
-
- // Remove the node.
- if (removeAdapter)
- removeAdapters(childNode);
-
- parentNode.removeChild(childNode);
- }
-
- /**
- * Remove the DOM adapters from the node AND all its child nodes, recursively.
- */
- public void removeAdapters(Node node) {
- EMF2DOMAdapter adapter = primGetExistingAdapter(node);
- if (adapter != null) {
- // Remove the adapter from both the DOM node and the MOF Object.
- removeDOMAdapter(node, adapter);
- if (adapter.getNode() == node) {
- Notifier localTarget = adapter.getTarget();
- if (localTarget != null)
- localTarget.eAdapters().remove(adapter);
- }
- }
-
- NodeList nl = node.getChildNodes();
- for (int i = 0; i < nl.getLength(); i++) {
- Node n = nl.item(i);
- removeAdapters(n);
- }
- }
-
- /**
- * Creates the path specified by <map>under <node>. Only the portion of the path that does not
- * exist (if any) is created
- *
- * @param node
- * org.w3c.dom.Node
- * @param map
- * com.ibm.etools.mof2dom.Translator
- */
- protected Node createDOMPath(Node node, Translator map) {
- Iterator i = DOMUtilities.createPathIterator(map.getDOMPath());
- Node curNode = node;
- while (i.hasNext()) {
- String nodeName = (String) i.next();
- curNode = findOrCreateNode(node, map, nodeName);
- }
- return curNode;
- }
-
- protected Element findOrCreateNode(Node parent, Translator map, String segment) {
- Node node = DOMUtilities.getNodeChild(parent, segment);
- if (node == null) {
- // The node did not already exist, create it.
- Document doc = parent.getOwnerDocument();
- node = doc.createElement(segment);
- if (map.isEmptyTag())
- setEmptyTag((Element) node);
-
- Node insertBeforeNode = findInitialInsertBeforeNode(parent, map);
- DOMUtilities.insertBeforeNodeAndWhitespace(parent, node, insertBeforeNode);
- indent(node, map);
- addDOMAdapter(node); // Hook up listeners
- }
- return (Element) node;
- }
-
- /**
- * Remove the node passed in if it has only whitespace nodes as children
- *
- * @param node
- * org.w3c.dom.Node The node to check
- */
- protected void removeIfEmpty(Node node) {
- NodeList nl = node.getChildNodes();
-
- // Run through all the nodes children. If a non-whitespace node
- // pis found, bail.
- for (int i = 0; i < nl.getLength(); i++) {
- Node childNode = nl.item(i);
- if (!DOMUtilities.isWhitespace(childNode))
- return;
- }
-
- // We only get here if there are no non-whitespace chars, so
- // simply remove the node.
- removeDOMChild(node.getParentNode(), node);
- }
-
- /**
- * Remove the DOM path specified by <map>from <node>
- */
- protected void removeDOMPath(Node node, Translator map) {
- Node childNode = findDOMPath(node, map, false);
- while (childNode != null && childNode != node) {
- removeIfEmpty(childNode);
- childNode = childNode.getParentNode();
- }
- }
-
- /**
- * Create an adapter for a child DOM node
- *
- * @param node
- * org.w3c.dom.Node The node to create the adapter for.
- */
- protected EMF2DOMAdapter createAdapter(EObject mofObject, Translator childMap) {
- // Assert.isNotNull(childMap.getChildAdapterClass());
- Assert.isNotNull(mofObject);
-
- EMF2DOMAdapter adapter = (EMF2DOMAdapter) EcoreUtil.getAdapter(mofObject.eAdapters(), EMF2DOMAdapter.ADAPTER_CLASS);
-
- if (adapter != null && adapter.isMOFProxy()) {
- mofObject.eAdapters().remove(adapter);
- removeAdapters(adapter.getNode());
- adapter = null;
- }
- if (adapter == null)
- adapter = primCreateAdapter(mofObject, childMap);
- return adapter;
- }
-
- /**
- * Create an adapter for a child DOM node
- *
- * @param node
- * org.w3c.dom.Node The node to create the adapter for.
- */
- protected EMF2DOMAdapter primCreateAdapter(EObject mofObject, Translator childMap) {
-
- Element newNode = createNewNode(mofObject, childMap);
- return new EMF2DOMAdapterImpl(mofObject, newNode, fRenderer, childMap);
- }
-
- /**
- * Create an adapter for a child DOM node
- *
- * @param node
- * org.w3c.dom.Node The node to create the adapter for.
- */
- protected EMF2DOMAdapter primCreateAdapter(Node node, Translator childMap) {
- return new EMF2DOMAdapterImpl(node, fRenderer, childMap);
- }
-
- /**
- * Create an adapter for a child DOM node
- *
- * @param node
- * org.w3c.dom.Node The node to create the adapter for.
- */
- protected EMF2DOMAdapter createAdapter(Node node, Translator childMap) {
-
- //Assert.isNotNull(childMap.getChildAdapterClass());
- Assert.isNotNull(node);
-
- EMF2DOMAdapter adapter = primGetExistingAdapter(node);
-
- if (adapter != null && adapter.isMOFProxy()) {
- removeDOMAdapter(node, adapter);
- adapter.getTarget().eAdapters().remove(adapter);
- adapter = null;
- }
-
- if (adapter == null) {
- adapter = primCreateAdapter(node, childMap);
- }
- return adapter;
- }
-
- protected Element createNewNode(EObject mofObject, Translator childMap) {
- Node node = getNode();
- Document doc = (node instanceof Document) ? (Document) node : node.getOwnerDocument();
-
- Element element = doc.createElement(childMap.getDOMName(mofObject));
- if (childMap.isEmptyTag())
- setEmptyTag(element);
-
- return element;
- }
-
- protected void setEmptyTag(Element element) {
- Revisit.toDo();
- //Need to figure out how to do this with pure DOM apis, if it is
- // possible
- }
-
- /*
- * Return true if MOF object is a proxy.
- */
- public boolean isMOFProxy() {
- if (isRoot || target == null)
- return false;
- return ((InternalEObject) target).eIsProxy();
- }
-
- public EObject getEObject() {
- if (isRoot)
- return null;
- return (EObject) target;
- }
-
- /**
- * Return the DOM node that the target of this adapter maps to. If the target MOF object maps to
- * more than one DOM node, this node is the top-most node.
- */
- public Node getNode() {
- return fNode;
- }
-
- public void setNode(Node aNode) {
- fNode = aNode;
- }
-
- public void updateDOM() {
- if (!isNotificationEnabled())
- return;
- primUpdateDOM();
- }
-
- public void updateMOF() {
- if (!isNotificationEnabled())
- return;
- primUpdateMOF();
- }
-
- protected void primUpdateDOM() {
- if (isRoot)
- updateDOMRootFeature();
- else {
- Translator[] maps = getChildTranslators();
- for (int i = 0; i < maps.length; i++) {
- updateDOMFeature(maps[i], getNode(), getEObject());
- }
- }
- }
-
- public void primUpdateMOF() {
- if (isRoot)
- updateMOFRootFeature();
- else {
- Translator[] maps = getChildTranslators();
- for (int i = 0; i < maps.length; i++) {
- updateMOFFeature(maps[i], getNode(), getEObject());
- }
- }
- }
-
- protected void updateDOMRootFeature() {
- boolean notificationFlag = isNotificationEnabled();
- try {
- setNotificationEnabled(false);
- primUpdateDOMMultiFeature(fTranslator, fNode, getResourceContents(), getDOMChildren(fNode, fTranslator), null);
- updateDOMDocumentType();
- } finally {
- setNotificationEnabled(notificationFlag);
- }
- }
-
- protected void updateMOFRootFeature() {
- boolean notificationFlag = isNotificationEnabled();
- try {
- setNotificationEnabled(false);
- updateMOFDocumentType();
- primUpdateMOFMultiFeature(fTranslator, fNode, getResourceContents(), getDOMChildren(fNode, fTranslator));
- } finally {
- setNotificationEnabled(notificationFlag);
- }
- }
-
- protected DocumentType getDocumentType() {
- return ((Document) fNode).getDoctype();
- }
-
- protected TranslatorResource getResource() {
- return (TranslatorResource) getTarget();
- }
-
- protected EList getResourceContents() {
- if (!isRoot)
- throw new IllegalStateException();
- return ((Resource) getTarget()).getContents();
- }
-
- protected void updateDOMDocumentType() {
-
- DocumentType docType = getDocumentType();
- String publicId = null, systemId = null, oldPublicId, oldSystemId;
- oldPublicId = docType == null ? null : docType.getPublicId();
- oldSystemId = docType == null ? null : docType.getSystemId();
- TranslatorResource resource = getResource();
- if (resource != null) {
- publicId = resource.getPublicId();
- systemId = resource.getSystemId();
- }
- if (!(StringUtil.stringsEqual(publicId, oldPublicId) && StringUtil.stringsEqual(systemId, oldSystemId)))
- fRenderer.replaceDocumentType(resource.getDoctype(), publicId, systemId);
- }
-
- protected void updateDOMDocumentType(Notification msg) {
- if (msg.getFeature() == TranslatorResource.DOC_TYPE_FEATURE)
- updateDOMDocumentType();
- }
-
- protected void updateMOFDocumentType() {
-
- TranslatorResource resource = getResource();
- if (resource == null)
- return;
-
- String publicId = null, systemId = null;
- DocumentType docType = getDocumentType();
-
- if (docType != null) {
- publicId = docType.getPublicId();
- systemId = docType.getSystemId();
- }
- if (!(StringUtil.stringsEqual(publicId, resource.getPublicId()) && StringUtil.stringsEqual(systemId, resource.getSystemId())))
- resource.setDoctypeValues(publicId, systemId);
- }
-
- public void notifyChanged(Notification msg) {
-
- if (isRoot) {
- notifyChangedForRoot(msg);
- return;
- }
- if (isDependencyFeature(msg))
- handleDependencyFeature(msg);
-
- if (!isNotificationEnabled())
- return;
-
- debugMOFNotify(msg);
-
- switch (msg.getEventType()) {
- case Notification.ADD :
- case Notification.REMOVE :
- case Notification.ADD_MANY :
- case Notification.REMOVE_MANY :
- case Notification.SET :
- case Notification.UNSET :
- case Notification.MOVE :
- Translator translator = findTranslator(msg);
- if (translator == null)
- translator = addVariableTranslatorIfNecessary(msg);
- if (translator != null)
- updateDOMFeature(translator, getNode(), getEObject());
- break;
- }
- }
-
- protected void notifyChangedForRoot(Notification msg) {
- if (!isNotificationEnabled())
- return;
-
- debugMOFNotify(msg);
-
- switch (msg.getEventType()) {
- case Notification.ADD :
- case Notification.REMOVE :
- case Notification.ADD_MANY :
- case Notification.REMOVE_MANY :
- primUpdateDOM();
- break;
- case Notification.SET :
- updateDOMDocumentType(msg);
- break;
- case EtoolsCopySession.RESOURCE_COPIED :
- updateDOM();
- break;
- }
- }
-
- protected void addDependencyAdapter(EObject child) {
- Adapter existing = EcoreUtil.getExistingAdapter(child, DependencyAdapter.KEY);
- if (existing != null)
- return;
- DependencyAdapter forwarder = new DependencyAdapter();
- child.eAdapters().add(forwarder);
- forwarder.setTarget(child);
- }
-
- protected void addDOMAdapter() {
-
- primAddDOMAdapter(fNode, this);
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Adding DOM adapter: " + this); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tto: " + fNode); //$NON-NLS-1$
- }
-
- // Go through the maps. All of the DOM nodes that are not listened
- // to by another DOM Node adapter, must be listened to by this adapter.
- NodeList childNodes = fNode.getChildNodes();
- for (int j = 0; j < childNodes.getLength(); j++) {
- Node childNode = childNodes.item(j);
- int nodeType = childNode.getNodeType();
- if (!DOMUtilities.isTextNode(childNode) && nodeType != Node.COMMENT_NODE) {
- Translator map = findTranslator(childNode.getNodeName(), false);
- if (map != null && map.isManagedByParent())
- addDOMAdapter(childNode);
- }
- }
- }
-
- protected Translator addVariableTranslatorIfNecessary(Notification msg) {
- VariableTranslatorFactory fact = fTranslator.getVariableTranslatorFactory();
- Translator trans = null;
- if (fact != null && fact.accepts(msg)) {
- trans = fact.create(msg);
- if (trans != null)
- childTranslators = (Translator[]) Translator.concat(childTranslators, trans);
- }
- return trans;
- }
-
- protected Text createTextNode(Document doc, Translator map, String text) {
- String nonnulltext = (text != null) ? text : ""; //$NON-NLS-1$
- return map.isCDATAContent() ? doc.createCDATASection(nonnulltext) : doc.createTextNode(nonnulltext);
- }
-
- protected String extractReadAheadName() {
- if (!fTranslator.hasReadAheadNames())
- return null;
- String readAheadName = null;
-
- ReadAheadHelper helper = fTranslator.getReadAheadHelper(fNode.getNodeName());
- if (helper == null)
- return null;
-
- Node child = null;
- String[] names = helper.getValues();
- if (helper.getChildDOMName() == null) {
- for (int i = 0; i < names.length; i++) {
- child = DOMUtilities.getNodeChild(fNode, names[i]);
- if (child != null) {
- readAheadName = names[i];
- break;
- }
- }
- } else {
- child = DOMUtilities.getNodeChild(fNode, helper.getChildDOMName());
- if (child != null)
- readAheadName = DOMUtilities.getChildText(child);
- }
- if (readAheadName == null)
- readAheadName = names[0];
- return readAheadName;
- }
-
- /**
- * Extracts the text from <node>and converts it to an object suitable for setting into <feature>
- */
- protected Object extractValue(Node node, Translator map, EObject emfObject) {
-
- // Extract the value from the text child
- Node textNode = DOMUtilities.getChildTextNode(node);
- String trimmedValue = null;
- if (textNode != null)
- trimmedValue = textNode.getNodeValue();
- try {
- return map.convertStringToValue(trimmedValue, emfObject);
- } catch (FeatureValueConversionException ex) {
- handleFeatureValueConversionException(ex);
- return null;
- }
- }
-
- /**
- * @param ex
- */
- protected void handleFeatureValueConversionException(FeatureValueConversionException ex) {
- throw ex;
-
- }
-
- /*
- * Finds the child node that <map> specifies. If there is more than one child that satisfies
- * <map> then the first one is returned.
- *
- * This method traverses past the domPath if one is specified in the <map>.
- */
- protected Node findDOMNode(Node parent, Translator map) {
- return findDOMNode(parent, map, false);
- }
-
- /*
- * Finds the child node that <map> specifies. If there is more than one child that satisfies
- * <map> then the first one is returned. The <addAdapters> boolean is used to determine if the
- * receiver is added as an adapter to every node found on the path.
- *
- * This method traverses past the domPath if one is specified in the <map>.
- */
- protected Node findDOMNode(Node parent, Translator map, boolean addAdapters) {
-
- // First, trace down the path
- Node curNode = findDOMPath(parent, map, addAdapters);
- if (map.isDOMTextValue() || map.isDOMAttribute() || curNode == null)
- return curNode;
-
- // Now look for the first DOM name we can find
- String[] domNames = map.getDOMNames();
- Node node = null;
- for (int i = 0; i < domNames.length; i++) {
- String nodeName = domNames[i];
- List nodes = DOMUtilities.getNodeChildren(curNode, nodeName);
- if (nodes != null && !nodes.isEmpty()) {
- if (nodes.size() > 1)
- handleInvalidMultiNodes(nodeName);
- node = (Node) nodes.get(0);
- if (node != null) {
- if (addAdapters && (map != null || map.isManagedByParent()))
- addDOMAdapter(curNode);
- break;
- }
- }
- }
- return node;
- }
-
- protected void handleInvalidMultiNodes(String nodeName) {
- throw new IllegalStateException(WFTUtilsResourceHandler.getString("EMF2DOMAdapterImpl_ERROR_0", new Object[]{nodeName})); //$NON-NLS-1$
- }
-
- /**
- * Creates the path specified by <map>under <node>. Only the portion of the path that does not
- * exist (if any) is created
- *
- * @param node
- * org.w3c.dom.Node
- * @param map
- * com.ibm.etools.mof2dom.Translator
- */
- protected Text findOrCreateTextNode(Node parent, Translator map, String text) {
- Text textNode = DOMUtilities.getChildTextNode(parent);
- if (textNode != null) {
- textNode.setData(text);
- } else {
- if (!isEmptyTag((Element) parent)) {
- Text newNode = createTextNode(parent.getOwnerDocument(), map, text);
- DOMUtilities.insertBeforeNode(parent, newNode, null);
- return newNode;
- }
- }
- return textNode;
- }
-
- protected Translator findTranslator(String tagName, boolean attributeMap) {
- Translator[] maps = getChildTranslators();
- for (int i = 0; i < maps.length; i++) {
- Translator map = maps[i];
- if (map.isMapFor(tagName) && attributeMap == map.isDOMAttribute())
- return maps[i];
- }
-
- return null;
- }
-
- protected EMF2DOMAdapter getExistingAdapter(Node aNode) {
- EMF2DOMAdapter adapter = primGetExistingAdapter(aNode);
- if (adapter != null && adapter.isMOFProxy()) {
- removeDOMAdapter(aNode, adapter);
- adapter.getTarget().eAdapters().remove(adapter);
- adapter = null;
- }
- return adapter;
- }
-
- protected void handleDependencyFeature(Notification msg) {
- if (msg.getOldValue() != null)
- removeDependencyAdapter((EObject) msg.getOldValue());
- if (msg.getNewValue() != null)
- addDependencyAdapter((EObject) msg.getNewValue());
- }
-
- protected boolean isDependencyFeature(Notification msg) {
- switch (msg.getEventType()) {
- case Notification.SET :
- return fTranslator.isDependencyParent() && fTranslator.getDependencyFeature() == msg.getFeature();
- default :
- return false;
- }
- }
-
- protected boolean isEmptyTag(Element parent) {
- Revisit.toDo();
- //Determine how to implement this with pure DOM apis, if possible.
- return false;
- }
-
- protected void postUpdateDOMFeature(Translator map, Node node, EObject mofObject) {
- }
-
- protected void preUpdateDOMFeature(Translator map, Node node, EObject mofObject) {
- }
-
- /**
- * Update an attribute of the target DOM object from with the values currently stored in the MOF
- * object. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator
- */
- protected void primUpdateDOMFeature(Translator map, Node node, EObject mofObject) {
- Object attrValue = null;
- boolean isSet = false;
- if (map.isIDMap()) {
- try {
- attrValue = map.getMOFValue(mofObject);
- } catch (IDTranslator.NoResourceException ex) {
- //If the object has been removed from the resource,
- //No need to update
- return;
- }
- isSet = attrValue != null;
- } else {
- attrValue = map.getMOFValue(mofObject);
- isSet = map.isSetMOFValue(mofObject);
- }
-
- if (map.isDOMAttribute()) {
- // An attribute of the MOF object maps to an attribute of the
- // DOM node. Get the value of the MOF attribute and set it
- // into DOM node.
- Element e = (Element) createDOMPath(node, map);
- if (attrValue != null && isSet)
- e.setAttribute(map.getDOMName(mofObject), map.convertValueToString(attrValue, mofObject));
- else
- e.removeAttribute(map.getDOMName(mofObject));
- } else {
- updateDOMSubtree(map, node, mofObject, attrValue);
- }
- }
-
- /**
- * Update an attribute of the target DOM object from with the values currently stored in the MOF
- * object. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- */
- protected void primUpdateDOMLinkFeature(Translator map, Node node, EObject mofObject) {
- LinkUpdaterTarget.INSTANCE.updateDOM(map, node, mofObject);
-
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map.
- */
- protected void primUpdateDOMMultiFeature(Translator map, Node node, EObject mofObject) {
-
- List mofChildren = map.getMOFChildren(mofObject);
- List domChildren = getDOMChildren(node, map);
-
- primUpdateDOMMultiFeature(map, node, mofChildren, domChildren, mofObject);
- }
-
- /**
- * Update an attribute of the target MOF object from the DOM node subtree. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- */
- protected boolean primUpdateMOFFeature(Translator map, Node node, EObject mofObject) {
- if (!map.featureExists(mofObject))
- return false;
- Object domValue = null;
- boolean updateMOFAttAdapter = false;
- boolean isUnset = false;
- EMF2DOMAdapter attrAdapter = null;
-
- Node child = findDOMNode(node, map, true);
-
- if (map.isDOMAttribute() && child != null) {
- // An attribute of the MOF object maps to an attribute of the
- // DOM node. Get the value of the DOM attribute and set it
- // into the MOF object.
-
- Attr domAttr = (Attr) child.getAttributes().getNamedItem(map.getDOMName(mofObject));
- if (domAttr != null) {
- domValue = domAttr.getValue();
- domValue = map.convertStringToValue((String) domValue, mofObject);
- } else
- isUnset = true;
- } else {
- // An attribute of the MOF object is actually a sub-element
- // of the DOM node. Search for the first sub-element with
- // the correct name to use as an attribute.
- if (child != null) {
- // Check to see if this is a single valued attribute that has
- // a MOF object as its value
- if (!map.isManagedByParent()) {
- attrAdapter = createAdapter(child, map);
- updateMOFAttAdapter = true;
- domValue = attrAdapter.getTarget();
- } else {
- // Check to make sure the child is adapted. If not, adapt
- // it.
- addDOMAdapter(child);
-
- // Extract the value from the text child
- domValue = extractValue(child, map, mofObject);
- }
- } else
- isUnset = true;
- }
-
- // Set the attribute extracted from the DOM to the MOF object.
- boolean hasChanged = true;
- try {
- if (map.isIDMap())
- map.setMOFValue(mofObject, domValue);
- else {
- Object oldValue = null;
- oldValue = map.getMOFValue(mofObject);
- boolean isSet = map.isSetMOFValue(mofObject);
- //In the case of enums with default values, we need to trip
- // the attribute from
- //default to a set value
- if (oldValue == domValue) {
- if (oldValue == null || isSet)
- hasChanged = false;
- } else if (domValue == null && !isSet)
- //If the domValue is null and the feature is not set, then
- // we don't need
- //to do anything
- hasChanged = false;
- else if (oldValue != null && oldValue.equals(domValue) && isSet)
- hasChanged = false;
- if (oldValue == null && domValue == null && map.isSetMOFValue(mofObject) == isUnset)
- hasChanged = true;
- if (hasChanged) {
- if (!(map.isDataType()) && !map.isShared())
- removeMOFValue((EObject) oldValue, map);
- if (domValue == null)
- map.unSetMOFValue(mofObject);
- else
- map.setMOFValue(mofObject, domValue);
-
- if ((domValue == null && !(map.isEnumFeature())) || isUnset)
- map.unSetMOFValue(mofObject); //unset
- // null
- // for
- // non
- // enum
- // features
-
- if (updateMOFAttAdapter)
- attrAdapter.updateMOF();
- }
- }
- } catch (FeatureValueConversionException ex) {
- handleFeatureValueConversionException(ex);
- map.unSetMOFValue(mofObject);
- }
- return hasChanged;
- }
-
- /**
- * Update an attribute of the target MOF object from the DOM node subtree. This method is only
- * called if the DOM node changes and the map is an object link map. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator
- * @return Return true if the MOF feature was updated, false if no update was done.
- */
- protected void primUpdateMOFLinkFeature(Translator map, Node node, EObject mofObject) {
- LinkUpdaterTarget.INSTANCE.updateMOF(map, node, mofObject);
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
- * attribute name to the DOM node name
- */
- protected void primUpdateMOFMultiFeature(Translator map, Node node, EObject mofObject) {
- // If the feature is a collection of strings or ints, call a special
- // method
- // that handles this.
- if (map.isManagedByParent()) {
- updateMOFMultiPrimitiveFeature(map, node, mofObject);
- return;
- }
-
- List nodeChildren = getDOMChildren(node, map);
- List mofChildren = map.getMOFChildren(mofObject);
-
- primUpdateMOFMultiFeature(map, node, mofChildren, nodeChildren);
- }
-
- protected void removeDependencyAdapter(EObject obj) {
- Adapter existing = EcoreUtil.getExistingAdapter(obj, DependencyAdapter.KEY);
- if (existing != null)
- obj.eAdapters().remove(existing);
- }
-
- /**
- * Removes all the DOM children from <parent>that are represented by <map>.
- */
- protected void removeDOMChildren(Node parent, Translator map) {
- String[] domNames = map.getDOMNames();
- HashSet domNamesSet = new HashSet(domNames.length);
- for (int i = 0; i < domNames.length; i++)
- domNamesSet.add(domNames[i]);
-
- // Walk through all the children and find any that match the map.
- NodeList nl = parent.getChildNodes();
- List toRemove = new ArrayList();
- for (int i = 0; i < nl.getLength(); i++) {
- Node childNode = nl.item(i);
- if (domNamesSet.contains(childNode.getNodeName()))
- toRemove.add(childNode);
- }
-
- // Remove any children that were found.
- for (int i = 0; i < toRemove.size(); i++) {
- Node childNode = (Node) toRemove.get(i);
- removeDOMChild(parent, childNode, true);
- }
- }
-
- protected void setTargetFromNode() {
- setTarget(fTranslator.createEMFObject(fNode.getNodeName(), extractReadAheadName()));
- }
-
- /**
- * Update an attribute of the target DOM object from with the values currently stored in the MOF
- * object. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator
- */
- final public void updateDOMFeature(Translator map, Node node, EObject mofObject) {
- if (!isNotificationEnabled())
- return;
- try {
- preUpdateDOMFeature(map, node, mofObject);
- if (map.isMultiValued()) {
- updateDOMMultiFeature(map, node, mofObject);
- return;
- }
-
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Updating DOM Node: " + node); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tfrom: " + mofObject); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
- }
- boolean notificationFlag = isNotificationEnabled();
- try {
- setNotificationEnabled(false);
- primUpdateDOMFeature(map, node, mofObject);
- } finally {
- setNotificationEnabled(notificationFlag);
- }
-
- if (map.isTargetLinkMap()) {
- updateDOMLinkFeature(map, node, mofObject);
- }
- } finally {
- postUpdateDOMFeature(map, node, mofObject);
- }
- }
-
- /**
- * Update an attribute of the target DOM object from the values currently stored in the MOF
- * object. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator
- */
- final protected void updateDOMLinkFeature(Translator map, Node node, EObject mofObject) {
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Updating DOM Node (link): " + node); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tfrom: " + mofObject); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
- }
- primUpdateDOMLinkFeature(map, node, mofObject);
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
- * attribute name to the DOM node name
- */
- final protected void updateDOMMultiFeature(Translator map, Node node, EObject mofObject) {
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Updating DOM Node (multi): " + node); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tfrom: " + mofObject); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
- }
- boolean notificationFlag = isNotificationEnabled();
- try {
- setNotificationEnabled(false);
- primUpdateDOMMultiFeature(map, node, mofObject);
- } finally {
- setNotificationEnabled(notificationFlag);
- }
- }
-
- /**
- * Update a DOM subtree to reflect the mofObject and map passed in. The subtree is of <node>is
- * updated.
- */
- protected void updateDOMSubtree(Translator map, Node node, EObject mofObject, Object attrValue) {
-
- if (map.featureExists(mofObject)) {
- if ((map.isEnumFeature() || map.isBooleanFeature()) && (map.isUnsettable() && !map.isSetMOFValue(mofObject)))
- attrValue = null;
- } else
- attrValue = map.extractStringValue(mofObject);
-
- // Create and/or update the DOM subtree
- if (attrValue != null) {
- Node parent = createDOMPath(node, map);
- if (map.isManagedByParent()) {
- // Handle the case where the mof value is not another
- // mof object (primitive)
- if (map.getDOMName(mofObject) != null && map.getDOMName(mofObject).startsWith("#")) //$NON-NLS-1$
- return;
-
- Element child = map.isDOMTextValue() ? (Element) parent : findOrCreateNode(parent, map, map.getDOMName(mofObject));
-
- findOrCreateTextNode(child, map, map.convertValueToString(attrValue, mofObject));
- } else {
- // Handle the case were the mof value is a mof object.
- EObject mofValue = (EObject) attrValue;
- EMF2DOMAdapter valueAdapter = (EMF2DOMAdapter) EcoreUtil.getExistingAdapter(mofValue, EMF2DOMAdapter.ADAPTER_CLASS);
- if (valueAdapter != null)
- valueAdapter.updateDOM();
- else {
- removeDOMChildren(parent, map);
- EMF2DOMAdapter adapter = createAdapter(mofValue, map);
- List mofChildren = map.getMOFChildren(mofObject);
- List domChildren = getDOMChildren(parent, map);
-
- Node insertBeforeNode = findInsertBeforeNode(parent, map, mofChildren, 0, domChildren);
- DOMUtilities.insertBeforeNodeAndWhitespace(parent, adapter.getNode(), insertBeforeNode);
- boolean notificationFlag = adapter.isNotificationEnabled();
- adapter.setNotificationEnabled(false);
- try {
- indent(adapter.getNode(), map);
- } finally {
- adapter.setNotificationEnabled(notificationFlag);
- }
- adapter.updateDOM();
- }
- }
- } else {
- // The attribute value was set to null or unset. Remove any
- // existing DOM nodes.
- Node child = findDOMNode(node, map);
- if (child != null)
- removeDOMChild(child.getParentNode(), child);
- }
- }
-
- /**
- * Update a feature that is set by linking to another existing object. This method is called
- * when the MOF object is updated in order to update DOM nodes.
- */
- final protected void updateMOFLinkFeature(Translator map, Node node, EObject mofObject) {
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Updating MOFObject (link): " + mofObject); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tfrom: " + node); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
- }
- boolean notificationFlag = isNotificationEnabled();
- try {
- setNotificationEnabled(false);
- primUpdateMOFLinkFeature(map, node, mofObject);
- } finally {
- setNotificationEnabled(notificationFlag);
- }
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator Describes the mapping from the MOF
- * attribute name to the DOM node name
- */
- final protected void updateMOFMultiFeature(Translator map, Node node, EObject mofObject) {
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Updating MOFObject (multi): " + mofObject); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tfrom: " + node); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
- }
- boolean notificationFlag = isNotificationEnabled();
- try {
- setNotificationEnabled(false);
- primUpdateMOFMultiFeature(map, node, mofObject);
- } finally {
- setNotificationEnabled(notificationFlag);
- }
- }
-
- /**
- * Update all the children of the target MOF object in the relationship described by
- *
- * @map. The relationship MUST BE a collection of string for this method to work.
- */
- protected void updateMOFMultiPrimitiveFeature(Translator map, Node node, EObject mofObject) {
- List nodeChildren = getDOMChildren(node, map);
-
- map.clearList(mofObject);
-
- // Go through the list of nodes and update the MOF collection
- for (int i = 0; i < nodeChildren.size(); i++) {
- Node child = (Node) nodeChildren.get(i);
- Object attributeValue = extractValue(child, map, mofObject);
- if (attributeValue != null)
- map.setMOFValue(mofObject, attributeValue, i);
-
- // Adapt the node so update will occur.
- addDOMAdapter(child);
- }
- if (map.hasDOMPath() && nodeChildren.isEmpty() && findDOMPath(node, map, false) != null)
- map.setMOFValueFromEmptyDOMPath(mofObject);
- }
-
- /**
- * Update an attribute of the target MOF object from the DOM node subtree. The
- *
- * @map specifies the name of the MOF attribute to update and the name of the DOM node.
- *
- * @param map
- * com.ibm.etools.mof2dom.AttributeTranslator
- */
- public void updateMOFFeature(Translator map, Node node, EObject mofObject) {
- if (!isNotificationEnabled())
- return;
- if (map.isMultiValued()) {
- updateMOFMultiFeature(map, node, mofObject);
- return;
- } else if (map.isComment()) {
- updateMOFCommentFeature(map, node, mofObject);
- return;
- }
-
- // TODO MDE Add a map.isComment() and updateMOFCommentFeature(map, node, mofObject);
-
- if (fDebug) {
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("Updating MOFObject: " + mofObject); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tfrom: " + node); //$NON-NLS-1$
- com.ibm.wtp.common.logger.proxy.Logger.getLogger().logError("\tmap : " + map); //$NON-NLS-1$
- }
- boolean notificationFlag = isNotificationEnabled();
- boolean hasChanged = false;
- try {
- setNotificationEnabled(false);
- hasChanged = primUpdateMOFFeature(map, node, mofObject);
- } finally {
- setNotificationEnabled(notificationFlag);
- }
-
- if (map.isTargetLinkMap() && hasChanged)
- updateMOFLinkFeature(map, node, mofObject);
- }
-
- /**
- * @param map
- * @param node
- * @param mofObject
- */
- public void updateMOFCommentFeature(Translator map, Node node, EObject mofObject) {
- Node commentNode = node;
- /* scan up the dom to find the first comment node before this node */
- while ((commentNode = commentNode.getPreviousSibling()) != null && commentNode.getNodeType() != Node.COMMENT_NODE) {
- /* no comment available */
- if (commentNode.getNodeType() == Node.ELEMENT_NODE)
- return;
- }
- if (commentNode != null)
- map.setMOFValue(mofObject, commentNode.getNodeValue());
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
deleted file mode 100644
index 0b02a9b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.wst.common.internal.emf.utilities.DOMLoadOptions;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-
-
-public class EMF2DOMRenderer extends AbstractRendererImpl implements Renderer {
-
- protected Map domAdapterRegistry;
- protected boolean needsToCreateDOM = true;
- protected Document document;
-
- /**
- * Constructor for DOMRendererImpl.
- */
- public EMF2DOMRenderer() {
- super();
- if (managesDOMAdapters())
- initDOMAdapterRegistry();
- }
-
- /**
- * @see com.ibm.etools.emf2xml.Renderer#doLoad(InputStream, Map)
- */
- public void doLoad(InputStream in, Map options) throws IOException {
- if ((in != null) || !useStreamsForIO()) {
- loadDocument(in, options);
- EMF2DOMAdapter adapter = createRootDOMAdapter();
- adapter.updateMOF();
- }
- }
-
- protected void loadDocument(InputStream in, Map options) throws IOException {
- try {
- DOMLoadOptions domOpts = new DOMLoadOptions();
- domOpts.setAllowJavaEncodings(true);
- domOpts.setExpandEntityRefererences(true);
- domOpts.setValidate(isValidating());
- document = DOMUtilities.loadDocument(in, domOpts, getResource().getEntityResolver());
- needsToCreateDOM = false;
- } catch (RuntimeException t_rex) {
- throw t_rex;
- } catch (IOException iox) {
- throw iox;
- } catch (Exception ex) {
- throw new WrappedException(ex);
- }
- }
-
-
- /**
- * @see com.ibm.etools.emf2xml.Renderer#doSave(OutputStream, Map)
- */
- public void doSave(OutputStream outputStream, Map options) throws IOException {
- createDOMTreeIfNecessary();
- serializeDocument(outputStream);
- }
-
- /**
- * Subclasses should override if adapters are not cached within this renderer, e.g., they are
- * stored in notifying Nodes
- */
- protected boolean managesDOMAdapters() {
- return true;
- }
-
- protected void initDOMAdapterRegistry() {
- if (domAdapterRegistry == null)
- domAdapterRegistry = new HashMap();
- }
-
- public void registerDOMAdapter(Node node, EMF2DOMAdapter adapter) {
- domAdapterRegistry.put(node, adapter);
- }
-
- public EMF2DOMAdapter getExistingDOMAdapter(Node node) {
- return (EMF2DOMAdapter) domAdapterRegistry.get(node);
- }
-
- public void removeDOMAdapter(Node aNode, EMF2DOMAdapter anAdapter) {
- domAdapterRegistry.remove(aNode);
- }
-
- /**
- * @see com.ibm.etools.emf2xml.Renderer#prepareToAddContents()
- */
- public void prepareToAddContents() {
- //createDOMTreeIfNecessary();
- }
-
- protected Node createDOMTree() {
- createDocument();
- EMF2DOMAdapter adapter = createRootDOMAdapter();
- adapter.updateDOM();
- needsToCreateDOM = false;
- return document;
- }
-
-
- protected EMF2DOMAdapter createRootDOMAdapter() {
- EMF2DOMAdapter root = new EMF2DOMAdapterImpl(getResource(), document, this, getResource().getRootTranslator());
- registerDOMAdapter(document, root);
- return root;
- }
-
-
- protected void createDOMTreeIfNecessary() {
- if (needsToCreateDOM)
- createDOMTree();
- }
-
- /**
- * Create a new Document given
- *
- * @aResource.
- */
- protected void createDocument() {
- TranslatorResource res = getResource();
- res.setDefaults();
- try {
- document = DOMUtilities.createNewDocument(res.getDoctype(), res.getPublicId(), res.getSystemId());
- } catch (ParserConfigurationException e) {
- throw new WrappedException(e);
- } catch (SAXException e) {
- throw new WrappedException(e);
- } catch (IOException e) {
- throw new WrappedException(e);
- }
- }
-
- public void serializeDocument(OutputStream out) throws IOException {
- /*
- * OutputFormat format = createOutputFormat(); Serializer serializer =
- * SerializerFactory.getSerializerFactory(Method.XML).makeSerializer(out, format);
- * serializer.asDOMSerializer().serialize(document);
- */
- try {
- TransformerFactory factory = TransformerFactory.newInstance();
- /*
- * try { factory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA); } catch
- * (IllegalArgumentException x) { }
- */
- Transformer transformer = factory.newTransformer();
-
- transformer.setOutputProperty(OutputKeys.ENCODING, getResource().getEncoding());
- transformer.setOutputProperty(OutputKeys.VERSION, getResource().getXMLVersion());
- transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no"); //$NON-NLS-1$
- if (getResource().getPublicId() != null)
- transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, getResource().getPublicId());
- if (getResource().getSystemId() != null)
- transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, getResource().getSystemId());
- transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
- DOMSource source = new DOMSource(document.getDocumentElement());
- /* source.setSystemId(getResource().getSystemId()); */
- transformer.transform(source, new StreamResult(out));
- } catch (TransformerConfigurationException e) {
- Logger.getLogger().logError(e);
- } catch (TransformerFactoryConfigurationError e) {
- Logger.getLogger().logError(e);
- } catch (TransformerException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- /*
- * protected OutputFormat createOutputFormat() { OutputFormat format = new OutputFormat();
- * format.setIndenting(true); format.setLineSeparator(DOMUtilities.NEWLINE_STRING);
- * //$NON-NLS-1$ format.setEncoding(getResource().getEncoding());
- * format.setVersion(getResource().getXMLVersion()); return format; }
- */
-
- public void replaceDocumentType(String docTypeName, String publicId, String systemId) {
- Revisit.revisit();
- Document newDoc = null;
- //Need be able to update the doctype directly on the existing document; right now can't
- // because
- // of limitations on parser neutral apis
-
- try {
- newDoc = DOMUtilities.createNewDocument(docTypeName, publicId, systemId);
- } catch (ParserConfigurationException e) {
- throw new WrappedException(e);
- } catch (SAXException e) {
- throw new WrappedException(e);
- } catch (IOException e) {
- throw new WrappedException(e);
- }
-
-
- replaceNode(document.getDocumentElement(), newDoc, newDoc);
- readapt(document, newDoc);
- document = newDoc;
- }
-
- protected void replaceNode(Node oldChild, Node newParent, Document newDoc) {
- Node newChild = newDoc.importNode(oldChild, false);
- newParent.appendChild(newChild);
- readapt(oldChild, newChild);
- NodeList children = oldChild.getChildNodes();
- int length = children.getLength();
- for (int i = 0; i < length; i++) {
- replaceNode(children.item(i), newChild, newDoc);
- }
- }
-
- protected void readapt(Node oldChild, Node newChild) {
- EMF2DOMAdapter adapter = getExistingDOMAdapter(oldChild);
- if (adapter != null) {
- registerDOMAdapter(newChild, adapter);
- //Some nodes are managed by the parent and thus the
- //node should not be set on the parent adapter
- if (adapter.getNode() == oldChild)
- adapter.setNode(newChild);
- }
- }
-
- public int getVersionID() {
- return getResource().getVersionID();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
deleted file mode 100644
index fce5603..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public class EMF2DOMRendererFactory extends RendererFactory {
-
- public static final EMF2DOMRendererFactory INSTANCE = new EMF2DOMRendererFactory();
-
- public EMF2DOMRendererFactory() {
- super();
- }
-
- /**
- * @see com.ibm.etools.emf2xml.RendererFactory#createRenderer()
- */
- public Renderer createRenderer() {
- EMF2DOMRenderer renderer = new EMF2DOMRenderer();
- renderer.setValidating(isValidating());
- return renderer;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
deleted file mode 100644
index 1257a06..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EMF2DOMRendererFactoryDefaultHandler implements RendererFactoryDefaultHandler {
-
- public static final EMF2DOMRendererFactoryDefaultHandler INSTANCE = new EMF2DOMRendererFactoryDefaultHandler();
-
- /**
- *
- */
- protected EMF2DOMRendererFactoryDefaultHandler() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.RendererFactoryDefaultHandler#getDefaultRendererFactory()
- */
- public RendererFactory getDefaultRendererFactory() {
- return EMF2DOMRendererFactory.INSTANCE;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
deleted file mode 100644
index fd7d9e8..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXDocumentHandler.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.io.IOException;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * The EMF2SAXDocumentHandler is utilized by the SAX parser to announce XML Events, such as
- * beginning and end of XML elements and the contents of those elements.
- *
- * @author mdelder
- */
-public class EMF2SAXDocumentHandler extends DefaultHandler {
-
- private TranslatorResource resource = null;
- private final CacheEventStack eventStack = new CacheEventStack();
- private CacheEventPool availableEventPool = new CacheEventPool();
-
- /**
- * Create an EMF2SAXDocumentHandler to populate the given resource.
- *
- */
- public EMF2SAXDocumentHandler(TranslatorResource resource) {
- this.resource = resource;
- }
-
- /**
- * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String, java.lang.String)
- */
- public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
- InputSource result = null;
- this.resource.setDoctypeValues(publicId, systemId);
-
- try {
- EntityResolver entityResolver = this.resource.getEntityResolver();
-
- if (entityResolver != null)
- result = entityResolver.resolveEntity(publicId, systemId);
- else
- result = super.resolveEntity(publicId, systemId);
- } catch (IOException ioe) {
- throw new SAXException(ioe);
- }
-
- return result;
- }
-
- /**
- * @see org.xml.sax.ContentHandler#startDocument()
- */
- public void startDocument() throws SAXException {
- /*
- * The endDocument() method should have frozen the pool, or it may not be warmed yet. In
- * either case, this method call will do as little work as necessary
- */
- availableEventPool.warmPool();
-
- /* This line should not be necessary, but is left for safty */
- eventStack.clear();
- this.createRoot(this.resource);
-
- }
-
- /**
- * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String,
- * java.lang.String, org.xml.sax.Attributes)
- */
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- addToStack(qName, attributes);
- }
-
- /**
- * @see org.xml.sax.ContentHandler#characters(char[], int, int)
- */
- public void characters(char[] data, int start, int length) throws SAXException {
-
- CacheEventNode currentRecord = getCurrentRecord();
- if (currentRecord != null) {
- currentRecord.appendToBuffer(data, start, length);
- }
- }
-
- /**
- * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String,
- * java.lang.String)
- */
- public void endElement(String uri, String localName, String qName) throws SAXException {
-
- CacheEventNode currentRecord = null;
-
- /*
- * This should only happen in the case where the DOMPath was ignored so the stack does not
- * quite match with the XML data structure. In this case we do nothing
- */
- if (qName.equals(this.getCurrentRecord().getNodeName())) {
- currentRecord = this.removeCurrentRecord();
- if (currentRecord != null) {
- currentRecord.commit();
- }
- }
- }
-
- /**
- * @see org.xml.sax.ContentHandler#endDocument()
- */
- public void endDocument() throws SAXException {
- CacheEventNode lastRecord = this.removeCurrentRecord();
- lastRecord.commit();
- availableEventPool.freezePool();
- }
-
- /**
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
- */
- public void error(SAXParseException ex) throws SAXException {
- throw ex;
- }
-
- /**
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
- */
- public void fatalError(SAXParseException ex) throws SAXException {
- throw ex;
- }
-
- /**
- * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
- */
- public void warning(SAXParseException ex) throws SAXException {
- Logger.getLogger().logWarning(ex);
- }
-
- /**
- * @return
- */
- public TranslatorResource getResource() {
- return resource;
- }
-
- protected void createRoot(TranslatorResource resourceArg) {
- this.eventStack.push(availableEventPool.createCacheEventNode(resourceArg));
- }
-
- protected void addToStack(String nodeName, Attributes attributes) {
- CacheEventNode parent = this.getCurrentRecord();
- if (!parent.isChildIgnorable(nodeName)) {
- this.eventStack.push(availableEventPool.createCacheEventNode(parent, nodeName, attributes));
- }
- }
-
- /**
- * Return the current CENO without removing it from the event stack.
- *
- * @return the current CENO without removing it
- */
- protected CacheEventNode getCurrentRecord() {
- CacheEventNode result = null;
- if (!this.eventStack.isEmpty()) {
- result = this.eventStack.peek();
- }
- return result;
- }
-
- /**
- * Return the current CENO and remove it from the event stack.
- *
- * @return the current CENO and remove it
- */
- protected CacheEventNode removeCurrentRecord() {
- CacheEventNode result = null;
- if (!this.eventStack.isEmpty()) {
- result = this.eventStack.pop();
- }
- return result;
- }
-
- // private final void printStack() {
- // // System.out.println("Printing stack ...");
- // // for (int i = 0; i < this.eventStack.size(); i++) {
- // // debug("stack[" + i + "]: " + eventStack.get(i));
- // // }
- // // System.out.println("... Printed stack");
- // }
- //
- // private final static void debug(Object obj) {
- // // System.out.println(obj);
- // }
- //
- // private final static void warn(Object obj) {
- // //System.err.println(obj);
- // }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
deleted file mode 100644
index c95699c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.common.util.WrappedException;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.XMLReader;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author mdelder
- */
-public class EMF2SAXRenderer extends AbstractRendererImpl {
-
- /**
- *
- */
- public EMF2SAXRenderer() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#doLoad(java.io.InputStream, java.util.Map)
- */
- public void doLoad(InputStream in, Map options) {
- try {
- SAXParserFactory factory = SAXParserFactory.newInstance();
- factory.setValidating(isValidating());
- factory.setNamespaceAware(true);
- /*
- * Causes errors in IBM JDK try { factory.setAttribute(JAXP_SCHEMA_LANGUAGE,
- * W3C_XML_SCHEMA); } catch (IllegalArgumentException x) { }
- */
- SAXParser parser = factory.newSAXParser();
- XMLReader reader = parser.getXMLReader();
- EMF2SAXDocumentHandler handler = new EMF2SAXDocumentHandler(this.getResource());
- try {
- reader.setFeature("http://xml.org/sax/features/validation", isValidating()); //$NON-NLS-1$
- } catch (SAXNotRecognizedException snre) {
- }
- try {
- reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); //$NON-NLS-1$
- } catch (SAXNotRecognizedException snre) {
- }
- try {
- reader.setFeature("http://apache.org/xml/features/validation/schema", isValidating()); //$NON-NLS-1$
- } catch (SAXNotRecognizedException e) {
- reader.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
- }
- try {
- reader.setFeature("http://apache.org/xml/features/allow-java-encodings", true); //$NON-NLS-1$
- } catch (SAXNotRecognizedException e) {
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
- }
- /*
- * try { reader.setProperty("http://xml.org/sax/properties/lexical-handler", handler); }
- * catch (SAXNotRecognizedException e) { }
- */
- reader.setContentHandler(handler);
- reader.setErrorHandler(handler);
- //reader.setDTDHandler(handler);
- reader.setEntityResolver(handler);
- InputSource testsource = new InputSource(in);
- reader.parse(testsource);
- } catch (RuntimeException t_rex) {
- throw t_rex;
- } catch (Exception ex) {
- throw new WrappedException(ex);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#doSave(java.io.OutputStream, java.util.Map)
- */
- public void doSave(OutputStream outputStream, Map options) throws IOException {
-
- /*
- * try { Serializer serializer =
- * SerializerFactory.getSerializerFactory(Method.XML).makeSerializer(outputStream,
- * createOutputFormat()); serializer.setOutputByteStream(outputStream); ContentHandler
- * handler = serializer.asContentHandler();
- */
-
- TransformerHandler handler = null;
- try {
- try {
- SAXTransformerFactory factory = (SAXTransformerFactory) TransformerFactory.newInstance();
- handler = factory.newTransformerHandler();
-
- handler.setResult(new StreamResult(outputStream));
- Transformer transformer = handler.getTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.ENCODING, getResource().getEncoding());
- transformer.setOutputProperty(OutputKeys.VERSION, getResource().getXMLVersion());
- transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no"); //$NON-NLS-1$
- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (getResource().getPublicId() != null)
- transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, getResource().getPublicId());
- if (getResource().getSystemId() != null)
- transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, getResource().getSystemId());
-
- } catch (TransformerConfigurationException e) {
- Logger.getLogger().logError(e);
- } catch (TransformerFactoryConfigurationError e) {
- Logger.getLogger().logError(e);
- }
- if (handler == null) {
- Logger.getLogger("SAX Writer is null"); //$NON-NLS-1$
- return;
- }
- EMF2SAXWriter writer = new EMF2SAXWriter();
- writer.serialize(this.resource, handler);
- } catch (SAXException saxe) {
- throw new WrappedException(saxe);
- }
- }
-
- /*
- * protected OutputFormat createOutputFormat() { OutputFormat format = new OutputFormat();
- * format.setIndenting(true); format.setLineSeparator(DOMUtilities.NEWLINE_STRING);
- * //$NON-NLS-1$ format.setEncoding(getResource().getEncoding());
- * format.setVersion(getResource().getXMLVersion()); if (this.resource != null)
- * format.setDoctype(this.resource.getPublicId(), this.resource.getSystemId()); return format; }
- */
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#prepareToAddContents()
- */
- public void prepareToAddContents() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.Renderer#getVersionID()
- */
- public int getVersionID() {
- return getResource().getVersionID();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
deleted file mode 100644
index d3fd5d9..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRendererFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 19, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-/**
- * Used to create instances of the EMF2SAXRenderer
- *
- * @author mdelder
- */
-public class EMF2SAXRendererFactory extends RendererFactory {
-
- public static final EMF2SAXRendererFactory INSTANCE = new EMF2SAXRendererFactory();
-
- protected EMF2SAXRendererFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.RendererFactory#createRenderer()
- */
- public Renderer createRenderer() {
- EMF2SAXRenderer renderer = new EMF2SAXRenderer();
- renderer.setValidating(isValidating());
- return renderer;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXWriter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXWriter.java
deleted file mode 100644
index c5d0807..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXWriter.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-/**
- * The EMF2SAXWriter handles the serialization of EMF Resources using SAX events. SAX events are
- * triggered to the content handler as the tree is being parsed. These events can then be written
- * into any stream wrapped by the ContentHandler.
- *
- * @author mdelder
- */
-public class EMF2SAXWriter {
-
- public static final String NAMESPACE = "";//"http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$
-
- /* Used in those cases where no Attributes are necessary */
- private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl();
-
- /**
- * Serialize an EMF resource into an XML Stream using the given ContentHandler. Note that this
- * method can also be used to copy a given EMF Resource if the EMF2SAXDocumentHandler is used as
- * the given ContentHandler.
- *
- * @param resource
- * @param handler
- */
- public void serialize(TranslatorResource resource, ContentHandler handler) throws SAXException {
-
- Translator rootTranslator = resource.getRootTranslator();
- EList contents = resource.getContents();
-
- if (contents.size() != 1) {
- throw new IllegalStateException("The contents of a resource may only contain one EMF Model Object."); //$NON-NLS-1$
- }
- handler.startDocument();
- EObject element = (EObject) contents.get(0);
- serialize(handler, element, rootTranslator, new WriterHints(resource));
- handler.endDocument();
-
- }
-
- private void serialize(ContentHandler handler, EObject target, Translator translator, WriterHints hints) throws SAXException {
-
- List mofChildren = null;
- Object rawValue = null;
- EObject newTarget = null;
- Translator currentChildTranslator = null;
- Translator nextTranslator = null;
- char[] characterData = null;
- String convertedValue = null;
- Attributes attributes = null;
- String childDomName = null;
- final int version = hints.getVersion();
-
- /*
- * Processing hints are used to remember where are in the iteration of the translator's
- * children. see the TranslatorFilter for more information on how this array is used.
- */
- int[] processingHints = TranslatorFilter.createProcessingHints();
-
- String targetDomName = translator.getDOMName(target);
-
- attributes = getAttributes(translator, target, hints);
-
- handler.startElement(NAMESPACE, targetDomName, targetDomName, attributes);
-
- currentChildTranslator = TranslatorFilter.getNextObjectTranslator(translator, processingHints[TranslatorFilter.NEXT_START_HINT_INDX], processingHints, target, version);
- while (currentChildTranslator != null) {
- /* For each Child Translator of the Translator parameter passed into the method */
-
- /* Does the Translator have any MOF Children? */
- mofChildren = currentChildTranslator.getMOFChildren(target);
- openDomPathIfNecessary(handler, hints, currentChildTranslator, target, mofChildren);
-
- if (currentChildTranslator.isManagedByParent()) {
- /*
- * Translators which are managed by their parents require less processing -- just
- * convert their value to a string and write it out as the content of an XML element
- */
- childDomName = currentChildTranslator.getDOMName(target);
- if (!currentChildTranslator.isEmptyTag()) {
- /* The Translator is not an Empty tag. Its text content is significant */
-
- if (mofChildren.size() > 0) {
- for (int j = 0; j < mofChildren.size(); j++) {
-
- /* Text only translators will not have open and close XML elements */
- if (!currentChildTranslator.isDOMTextValue())
- handler.startElement(NAMESPACE, childDomName, childDomName, EMPTY_ATTRIBUTES);
-
- rawValue = mofChildren.get(j);
- /* convertValueToString should always return a non-null String */
- convertedValue = currentChildTranslator.convertValueToString(rawValue, target);
- characterData = XMLEncoderDecoder.escape(convertedValue).toCharArray();
- handler.characters(characterData, 0, characterData.length);
-
- if (!currentChildTranslator.isDOMTextValue())
- handler.endElement(NAMESPACE, childDomName, childDomName);
- }
- }
- } else {
- /*
- * The Translator is an Empty Element (its mere presence has significance) (e.g.
- * <cascade-delete/>
- */
-
- if (currentChildTranslator.isBooleanFeature()) {
- /* Boolean features may or may not be rendered */
- rawValue = mofChildren.get(0);
- if (rawValue != null && ((Boolean) rawValue).booleanValue()) {
- handler.startElement(NAMESPACE, childDomName, childDomName, EMPTY_ATTRIBUTES);
- handler.endElement(NAMESPACE, childDomName, childDomName);
- }
-
- } else {
- /* Always render any other Empty elements */
- handler.startElement(NAMESPACE, childDomName, childDomName, EMPTY_ATTRIBUTES);
- handler.endElement(NAMESPACE, childDomName, childDomName);
- }
- }
- } else {
-
- /* The Translator is a more complex feature, handle its processing recursively */
- for (int j = 0; j < mofChildren.size(); j++) {
- newTarget = (EObject) mofChildren.get(j);
- serialize(handler, newTarget, currentChildTranslator, hints);
- }
- }
-
- /* Fetch the next peer translator */
- nextTranslator = TranslatorFilter.getNextObjectTranslator(translator, processingHints[TranslatorFilter.NEXT_START_HINT_INDX], processingHints, target, version);
-
- closeDomPathIfNecessary(handler, hints, currentChildTranslator, nextTranslator, target, mofChildren);
-
- /*
- * We needed to invoke closeDomPathIfNecessary() with the peer, now we move on to
- * process that peer
- */
- currentChildTranslator = nextTranslator;
-
- }
- handler.endElement(NAMESPACE, targetDomName, targetDomName);
- }
-
- /**
- * Determines whether or not a DOM Path should be rendered. This method is particularly useful
- * for determining whether Empty XML elements are relevant and should be written to the XML
- * stream.
- *
- * @param target
- * The EMF Target of the Translation
- * @param currentChildTranslator
- * The current Translator
- * @param mofChildren
- * The mofChildren that were found for the Translator on the Target
- * @return
- */
- private boolean shouldRenderDomPath(EObject target, Translator currentChildTranslator, List mofChildren) {
- return !currentChildTranslator.isEmptyContentSignificant() || (currentChildTranslator.shouldRenderEmptyDOMPath(target) || mofChildren.size() > 0);
- }
-
- /**
- * openDomPathIfNecessary will write the current DOM Path to the serialization stream if it has
- * not been written by a previous peer translator. The processing results in the collapse of
- * Peer Translators with matching DOM Paths into a single XML parent element.
- *
- * @param handler
- * The ContentHandler which is writing the XML result
- * @param hints
- * A Global container for information specific to a single XML document
- * @param currentChildTranslator
- * The active Translator being processed
- * @param target
- * The EMF Target of the Translation
- * @throws SAXException
- */
- private void openDomPathIfNecessary(ContentHandler handler, WriterHints hints, Translator currentChildTranslator, EObject target, List mofChildren) throws SAXException {
-
- /* If the translator does not have a DOM Path, then we do nothing */
- if (currentChildTranslator.hasDOMPath() && shouldRenderDomPath(target, currentChildTranslator, mofChildren)) {
-
- String childDomPath = currentChildTranslator.getDOMPath();
-
- /*
- * IsDomPathActive() will verify whether this DOM Path has already been written to the
- * XML stream
- */
- if (!hints.isDomPathActive(childDomPath)) {
-
- /*
- * Write an open element for the DOM Path and "remember" that we have written it
- */
- handler.startElement(NAMESPACE, childDomPath, childDomPath, EMPTY_ATTRIBUTES);
- hints.pushDomPath(childDomPath);
- }
-
- }
- }
-
- /**
- * closeDomPathIfNecessary will determine whether the next peer Translator shares the active DOM
- * Path of the current Translator. If the next peer Translator has the same DOM Path, no action
- * will be taken (hence condensing the elements into a single XML parent). However, if the DOM
- * Path differs (including the Next Peer Translator has no DOM Path) then the current DOM Path
- * will be closed (a close XML element is generated.
- *
- * @param handler
- * The ContentHandler which is writing the XML result
- * @param hints
- * A Global container for information specific to a single XML document
- * @param currentChildTranslator
- * The last Translator to have completed processing
- * @param nextTranslator
- * The next peer Translator that will become active
- * @param target
- * The EMF Target of the Translation
- * @throws SAXException
- */
- private void closeDomPathIfNecessary(ContentHandler handler, WriterHints hints, Translator currentChildTranslator, Translator nextTranslator, EObject target, List mofChildren) throws SAXException {
-
- if (currentChildTranslator.hasDOMPath() && shouldRenderDomPath(target, currentChildTranslator, mofChildren)) {
- String childDomPath = currentChildTranslator.getDOMPath();
- if (nextTranslator != null) { /*
- * There are more peers after this element, we can peek
- * ahead
- */
- String nextPeerDomPath = nextTranslator.getDOMPath();
- if (nextPeerDomPath == null || !nextPeerDomPath.equals(childDomPath)) {
- handler.endElement(NAMESPACE, childDomPath, childDomPath);
- hints.popDomPath();
- }
-
- } else { /* This was the last child element, we must close the dompath */
- handler.endElement(NAMESPACE, childDomPath, childDomPath);
- hints.popDomPath();
- }
- }
- }
-
- /**
- * Aggregate the Attribute translator children from a given translator. This method will request
- * the AttributesImpl object from the WriterHints object. The WriterHints maintains this
- * reusable collection to limit the requirement for new object creation.
- *
- * @param translator
- * @param target
- * @param hints
- * @return an initialized set of Attributes for the given Translator and EMF Target
- */
- private Attributes getAttributes(Translator translator, EObject target, WriterHints hints) {
-
- AttributesImpl attributes = hints.getAttributeHolder();
- int version = hints.getVersion();
- Object rawValue = null;
- String convertedValue = null;
- String childDomName = null;
- Translator attributeTranslator = null;
- int[] processingHints = TranslatorFilter.createProcessingHints();
-
- while ((attributeTranslator = TranslatorFilter.getNextAttributeTranslator(translator, processingHints[TranslatorFilter.NEXT_START_HINT_INDX], processingHints, target, version)) != null) {
-
- List mofChildren = attributeTranslator.getMOFChildren(target);
- if (mofChildren.size() > 0) {
- for (int j = 0; j < mofChildren.size(); j++) {
-
- childDomName = attributeTranslator.getDOMName(target);
- rawValue = mofChildren.get(j);
- convertedValue = attributeTranslator.convertValueToString(rawValue, target);
- convertedValue = XMLEncoderDecoder.escape(convertedValue);
- attributes.addAttribute(NAMESPACE, childDomName, childDomName, "String", convertedValue); //$NON-NLS-1$
- }
-
- } else {
- childDomName = attributeTranslator.getDOMName(target);
- convertedValue = (String) attributeTranslator.getMOFValue(target);
- if (convertedValue != null)
- attributes.addAttribute(NAMESPACE, childDomName, childDomName, "String", convertedValue); //$NON-NLS-1$
- }
- }
- return attributes;
- }
-
- /**
- * WriterHints is used to "remember" certain pieces of information while the writer is
- * processing. Of particular interest are the version and the state of the DOM Path output.
- * Consecutive elements with consistent (identical) DOM Paths are collapsed under a single XML
- * element.
- *
- * The WriterHints provides global state between recursive invocations of serialize(). It should
- * be not be used to store local data (e.g. data that is only relevant to a single Translator in
- * a given context).
- *
- * The WriterHints also stores an AttributesImpl object that is re-used to store attributes. The
- * getAttributes() method will request the Attributes Holder.
- *
- * @author mdelder
- */
- public final class WriterHints {
- private final TranslatorResource resource;
- private final Stack domStack = new Stack();
- private final AttributesImpl attributesImpl = new AttributesImpl();
-
- public WriterHints(TranslatorResource res) {
- this.resource = res;
- }
-
- /**
- * Push a new domPath onto the stack
- *
- * @param domPath
- * a DOMPath which has been written to the XML stream
- */
- public void pushDomPath(String domPath) {
-
- if (domPath != null && domPath.length() > 0)
- domStack.push(domPath);
- }
-
- /**
- * Pop the current domPath from the Array
- */
- public void popDomPath() {
-
- if (!domStack.isEmpty())
- domStack.pop();
- }
-
- /**
- * Determines if the given DOMPath has already been written to the XML stream
- *
- * @param domPath
- * @return true if the given DOMPath has already been written to the XML stream
- */
- public boolean isDomPathActive(String domPath) {
- boolean result = false;
- if (!domStack.isEmpty()) {
-
- String currentDomPath = (String) domStack.peek();
- if (currentDomPath != null && domPath != null)
- result = currentDomPath.equals(domPath);
- else if (!(currentDomPath == null ^ domPath == null))
- result = true;
- }
-
- return result;
- }
-
- /**
- * @return the version of the EMF Resource
- */
- public int getVersion() {
- return this.resource.getVersionID();
- }
-
- /**
- * Returns an empty AttributesImpl object to store attributes. Within the context of a given
- * WriterHints object (and hence single XML document), the object returned is a singleton.
- * The same AttributesImpl object is cleared and reused for each invocation.
- *
- * @return an empty AttributesImpl object to store attributes
- */
- public AttributesImpl getAttributeHolder() {
- this.attributesImpl.clear();
- return this.attributesImpl;
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
deleted file mode 100644
index 202c42d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/FileNameResourceFactoryRegistry.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.Resource.Factory;
-import org.eclipse.wst.common.emf.utilities.DefaultOverridableResourceFactoryRegistry;
-
-
-public abstract class FileNameResourceFactoryRegistry extends DefaultOverridableResourceFactoryRegistry {
- //We are using two lists instead of a Map because we need to iterate
- //the list of simpleFileNames quite a lot.
- protected List simpleFileNames;
- protected List simpleFileNameFactories;
-
- public FileNameResourceFactoryRegistry() {
- super();
- }
-
- /**
- * Return a Resource.Factory that is registered with the last segment of the URI's file name.
- *
- * @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl#getFactory(URI)
- */
- protected Object getFileNameFactory(URI uri) {
- if (simpleFileNames != null) {
- String fileName = uri.lastSegment();
- if (fileName != null) {
- String key;
- for (int i = 0; i < simpleFileNames.size(); i++) {
- key = (String) simpleFileNames.get(i);
- if (fileName.equals(key))
- return simpleFileNameFactories.get(i);
- }
- }
- }
- return null;
- }
-
- public Resource.Factory getFactory(URI uri) {
- Object resourceFactory = getFileNameFactory(uri);
- if (resourceFactory == null)
- resourceFactory = super.getFactory(uri);
- return (Resource.Factory) resourceFactory;
- }
-
- /**
- * Register a file name representing the last segment of a URI with the corresponding
- * Resource.Factory.
- */
- public void registerLastFileSegment(String aSimpleFileName, Resource.Factory aFactory) {
- URI uri = URI.createURI(aSimpleFileName);
- String lastSegment = uri.lastSegment();
- int index = getFileNameIndexForAdd(lastSegment);
- setFileName(lastSegment, index);
- setFileNameFactory(aFactory, index);
- }
-
- private int getFileNameIndexForAdd(String aSimpleFileName) {
- if (simpleFileNames != null) {
- int i = simpleFileNames.indexOf(aSimpleFileName);
- if (i > -1)
- return i;
- return simpleFileNames.size();
- }
- return 0;
- }
-
- private void setFileNameFactory(Factory aFactory, int index) {
- if (simpleFileNameFactories == null)
- simpleFileNameFactories = new ArrayList();
- simpleFileNameFactories.add(index, aFactory);
- }
-
- private void setFileName(String aSimpleFileName, int index) {
- if (simpleFileNames == null)
- simpleFileNames = new ArrayList();
- simpleFileNames.add(index, aSimpleFileName);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
deleted file mode 100644
index eafe09f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/GenericTranslator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Specialized translator for objects that contain simple mappings with no specialized behavior.
- */
-public class GenericTranslator extends Translator {
-
- protected Translator[] children;
-
- /**
- * @param domNameAndPath
- * @param eClass
- */
- public GenericTranslator(String domNameAndPath, EClass eClass) {
- super(domNameAndPath, eClass);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature) {
- super(domNameAndPath, aFeature);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param path
- */
- public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
- super(domNameAndPath, aFeature, path);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param paths
- */
- public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath[] paths) {
- super(domNameAndPath, aFeature, paths);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param eClass
- */
- public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, EClass eClass) {
- super(domNameAndPath, aFeature, eClass);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param style
- */
- public GenericTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
- super(domNameAndPath, aFeature, style);
- }
-
- /**
- * @return Translator[]
- */
- public Translator[] getChildren() {
- return children;
- }
-
- /**
- * Sets the children.
- *
- * @param children
- * The children to set
- */
- public void setChildren(Translator[] children) {
- this.children = children;
- }
-
-
- public static Translator appendChildren(GenericTranslator tran, Translator[] child) {
- Translator[] orgChild = tran.getChildren();
- Translator[] newChildren = (Translator[]) concat(orgChild, child);
- tran.setChildren(newChildren);
- return tran;
- }
-
- public static Translator appendChild(GenericTranslator tran, Translator child) {
- Object[] orgChild = tran.getChildren();
- Translator[] newChildren = (Translator[]) concat(orgChild, child);
- tran.setChildren(newChildren);
- return tran;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
deleted file mode 100644
index 1710118..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/IDTranslator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 19, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-/**
- * @author schacher
- */
-public class IDTranslator extends Translator {
- public class NoResourceException extends RuntimeException {
-
- public NoResourceException() {
- super();
- }
-
- public NoResourceException(String s) {
- super(s);
- }
- }
-
- static final public EStructuralFeature ID_FEATURE = EcorePackage.eINSTANCE.getEClass_EIDAttribute();
- static final public IDTranslator INSTANCE = new IDTranslator();
-
- public IDTranslator() {
- super("id", ID_FEATURE, DOM_ATTRIBUTE); //$NON-NLS-1$
- }
-
- public void setMOFValue(EObject emfObject, Object value) {
- XMIResource res = (XMIResource) emfObject.eResource();
- if (res == null)
- throw new NoResourceException();
- String id = (String) res.getEObjectToIDMap().get(emfObject);
- if (id == null && value == null)
- return;
- if ((id != null && !id.equals(value)) || (value != null && !value.equals(id)))
- res.setID(emfObject, (String) value);
- }
-
- public Object getMOFValue(EObject emfObject) {
- XMIResource res = (XMIResource) emfObject.eResource();
- if (res == null)
- throw new NoResourceException();
- return res.getID(emfObject);
- }
-
-
- public boolean featureExists(EObject emfObject) {
- return true;
- }
-
- public boolean isIDMap() {
- return true;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
deleted file mode 100644
index f5cd1f9..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/LinkUpdaterTarget.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.w3c.dom.Node;
-
-
-public class LinkUpdaterTarget extends Object {
-
- public static final LinkUpdaterTarget INSTANCE = new LinkUpdaterTarget();
-
- /**
- * Constructor for LinkUpdaterMultiTarget.
- *
- * @param adapter
- */
- private LinkUpdaterTarget() {
- super();
- }
-
-
- public void updateDOM(Translator map, Node node, EObject mofObject) {
- refreshSourceObjects(map, node, mofObject, true);
- }
-
- public void updateMOF(Translator map, Node node, EObject mofObject) {
- refreshSourceObjects(map, node, mofObject, false);
- }
-
- protected void refreshSourceObjects(Translator map, Node node, EObject mofObject, boolean domUpdate) {
- TranslatorPath[] paths = map.getTranslatorPaths();
- for (int i = 0; i < paths.length; i++) {
- TranslatorPath path = paths[i];
- List allSourceObjects = path.findObjects(mofObject);
- for (Iterator iter = allSourceObjects.iterator(); iter.hasNext();) {
- EObject curObject = (EObject) iter.next();
- EMF2DOMAdapter curAdapter = (EMF2DOMAdapter) EcoreUtil.getAdapter(curObject.eAdapters(), EMF2DOMAdapter.class);
- if (curAdapter != null) {
- if (domUpdate)
- curAdapter.updateDOM();
- else
- curAdapter.updateMOF();
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
deleted file mode 100644
index 166ee6f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MappedXMIHelper.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.wst.common.emf.utilities.IDUtil;
-
-public class MappedXMIHelper extends XMLHelperImpl {
-
- private static final String WORKSPACE_PROTOCOL = "workspace:/"; //$NON-NLS-1$
- private static final String PLATFORM_RESOURCE_PROTOCOL = "platform:/resource/"; //$NON-NLS-1$
- private static final EStructuralFeature NULL_FEATURE = new UnsupportedFeature();
- protected boolean usingMaps = true;
- protected Map cachedRelativeURIs;
- protected Map packageURIsToPrefixes;
-
- /**
- * Constructor for MappedXMLHelper.
- *
- * @param resource
- */
- public MappedXMIHelper(XMLResource resource, Map prefixesToURIs) {
- super(resource);
- this.prefixesToURIs.putAll(prefixesToURIs);
- pushContext(); //Needed to initialize the context to zero
- Set keys = prefixesToURIs.keySet();
- for (Iterator iter = keys.iterator(); iter.hasNext();) {
- String prefix = (String) iter.next();
- String uri = (String) prefixesToURIs.get(prefix);
- namespaceSupport.declarePrefix(prefix, uri);
- }
-
- }
-
- public URI resolve(URI relative, URI base) {
- URI resolved = null;
- boolean isMapped = false;
- ResourceSet set = getResource().getResourceSet();
- if (set != null) {
- URI localresourceURI = null;
- if (relative.hasFragment())
- localresourceURI = relative.trimFragment();
- else
- localresourceURI = relative;
- isMapped = !(((URIConverterImpl.URIMap) set.getURIConverter().getURIMap()).getURI(localresourceURI).equals(localresourceURI));
- }
- if (!isMapped) {
- if (isUsingContainerRelativePaths() && set != null)
- resolved = set.getURIConverter().normalize(relative);
- } else {
- resolved = relative;
- }
- return resolved == null ? super.resolve(relative, base) : resolved;
- }
-
- /**
- * Method isUsingContainerRelativePaths.
- *
- * @return boolean
- */
- private boolean isUsingContainerRelativePaths() {
- return ((CompatibilityXMIResource) resource).getFormat() == CompatibilityXMIResource.FORMAT_MOF5 || usingMaps;
- }
-
- public void addPrefix(String prefix, String uri) {
- /*
- * problem - the incoming key value pair is ejbbnd->ejbbnd.xmi; however, the map already has
- * a key value pair of ejbbnd->http:///ejbbnd.ecore
- */
- if (uri.endsWith(".ecore")) { //$NON-NLS-1$
- usingMaps = false;
- }
- String existing = (String) prefixesToURIs.get(prefix);
- if (existing == null) {
- prefixesToURIs.put(prefix, uri);
- namespaceSupport.declarePrefix(prefix, uri);
- } else if (!existing.equals(uri)) {
- getCompatibilityResource().addOriginalPackageURI(existing, uri);
- getCompatibilityResource().setFormat(CompatibilityXMIResource.FORMAT_MOF5);
- }
- }
-
- protected CompatibilityXMIResource getCompatibilityResource() {
- return (CompatibilityXMIResource) getResource();
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getHREF(EObject)
- */
- public String getHREF(EObject obj) {
- if (!getCompatibilityResource().usesDefaultFormat()) {
- URIConverter conv = getURIConverter();
- if (conv != null && conv instanceof CompatibilityURIConverter) {
- String href = getCompatibliltyHREF(obj, (CompatibilityURIConverter) conv);
- return useWorkspaceProtocolIfNecessary(href);
- }
- }
- return super.getHREF(obj);
- }
-
-
- /**
- * @param href
- * @return
- */
- protected String useWorkspaceProtocolIfNecessary(String href) {
- if (href != null && href.startsWith(PLATFORM_RESOURCE_PROTOCOL))
- return WORKSPACE_PROTOCOL + href.substring(19);
- return href;
- }
-
- private String getCompatibliltyHREF(EObject obj, CompatibilityURIConverter conv) {
- //Implementation copied from super.getHREF(EObject)
- InternalEObject o = (InternalEObject) obj;
-
- URI objectURI = o.eProxyURI();
- if (objectURI == null) {
- Resource otherResource = obj.eResource();
- if (otherResource == null) {
- objectURI = handleDanglingHREF(obj);
- if (objectURI == null) {
- return null;
- }
- } else
- objectURI = otherResource.getURI().appendFragment(otherResource.getURIFragment(obj));
- }
-
- //Modified to dispatch back to URI Converter
- if (!objectURI.isRelative()) {
- objectURI = makeRelative(objectURI, conv);
- }
- return objectURI.toString();
- }
-
- protected URI makeRelative(URI objectURI, CompatibilityURIConverter conv) {
- String fragment = objectURI.fragment();
- objectURI = objectURI.trimFragment();
- URI relative = (URI) getCachedRelativeURIs().get(objectURI);
- if (relative == null) {
- relative = conv.deNormalize(objectURI);
- if (relative.isRelative())
- cachedRelativeURIs.put(objectURI, relative);
- }
- return relative.appendFragment(fragment);
- }
-
- protected URIConverter getURIConverter() {
- ResourceSet set = getResource().getResourceSet();
- if (set != null)
- return set.getURIConverter();
- return null;
- }
-
- protected Map getCachedRelativeURIs() {
- if (cachedRelativeURIs == null)
- cachedRelativeURIs = new HashMap();
- return cachedRelativeURIs;
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#getID(EObject)
- */
- public String getID(EObject obj) {
- if (getCompatibilityResource().usesDefaultFormat())
- return super.getID(obj);
- return IDUtil.getOrAssignID(obj, resource);
- }
-
- public String[] getNSInfo(EPackage pkg) {
- String prefix = getMappedPrefix(pkg);
- if (prefix == null)
- return new String[]{pkg.getNsPrefix(), pkg.getNsURI()};
- return new String[]{prefix, prefix + ".xmi"}; //$NON-NLS-1$
- }
-
- protected String getMappedPrefix(EPackage pkg) {
- String nsURI = pkg.getNsURI();
- if (usingMaps || !getCompatibilityResource().usesDefaultFormat())
- return (String) packageURIsToPrefixes.get(nsURI);
- return null;
- }
-
- protected String getMappedPrefixOrDefault(EPackage pkg) {
- String prefix = getMappedPrefix(pkg);
- return prefix == null ? pkg.getNsPrefix() : prefix;
- }
-
-
- /**
- * Returns the packageURIsToPrefixes.
- *
- * @return Map
- */
- public Map getPackageURIsToPrefixes() {
- return packageURIsToPrefixes;
- }
-
- /**
- * Sets the packageURIsToPrefixes.
- *
- * @param packageURIsToPrefixes
- * The packageURIsToPrefixes to set
- */
- public void setPackageURIsToPrefixes(Map packageURIsToPrefixes) {
- this.packageURIsToPrefixes = packageURIsToPrefixes;
- }
-
- public String getQName(EClass c) {
- String name = getName(c);
-
- if (xmlMap != null) {
- XMLResource.XMLInfo clsInfo = xmlMap.getInfo(c);
-
- if (clsInfo != null) {
- String targetNamespace = clsInfo.getTargetNamespace();
- return getQName(targetNamespace, name);
- }
- }
-
- EPackage p = c.getEPackage();
- packages.put(p, null);
-
- if (p.getNsPrefix().equals("")) //$NON-NLS-1$
- return name;
-
- //Modified from superclass
- //return p.getNsPrefix() + ":" + name;
- return getMappedPrefixOrDefault(p) + ":" + name; //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#setValue(EObject, EStructuralFeature,
- * Object, int)
- */
- public void setValue(EObject object, EStructuralFeature feature, Object value, int position) {
- if (feature == NULL_FEATURE)
- return;
- if (!feature.isTransient()) {
- if (value == null && feature.getEType().getInstanceClass() != null && feature.getEType().getInstanceClass().isPrimitive())
- //For compatibility with MOF5 where types like Integer might have been set
- //and serialized as "xsi:nil"
- return;
-
- super.setValue(object, feature, value, position);
- }
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.XMLHelper#getFeature(org.eclipse.emf.ecore.EClass,
- * java.lang.String, java.lang.String, boolean)
- */
- public EStructuralFeature getFeature(EClass eClass, String namespaceURI, String name, boolean isElement) {
- if (UnsupportedFeature.isUnsupported(eClass, name))
- return NULL_FEATURE;
- return super.getFeature(eClass, namespaceURI, name, isElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.ecore.xmi.XMLHelper#getFeatureKind(org.eclipse.emf.ecore.EStructuralFeature)
- */
- public int getFeatureKind(EStructuralFeature feature) {
- if (feature == NULL_FEATURE)
- return XMLHelper.DATATYPE_SINGLE;
- return super.getFeatureKind(feature);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
deleted file mode 100644
index abfcc83..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/MultiObjectTranslator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author schacher
- */
-public abstract class MultiObjectTranslator extends Translator {
- private static final Translator[] EMPTY_TRANSLATORS = new Translator[]{};
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param style
- */
- public MultiObjectTranslator(String domNameAndPath, EStructuralFeature aFeature) {
- super(domNameAndPath, aFeature);
- }
-
- public abstract Translator getDelegateFor(EObject o);
-
- public abstract Translator getDelegateFor(String domName, String readAheadName);
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String,
- * java.lang.String)
- */
- public EObject createEMFObject(String nodeName, String readAheadName) {
- return getDelegateFor(nodeName, readAheadName).createEMFObject(nodeName, readAheadName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object)
- */
- public Translator[] getChildren(Object o, int version) {
- if (o == null)
- return EMPTY_TRANSLATORS;
- return getDelegateFor((EObject) o).getChildren(o, version);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#getDOMName(java.lang.Object)
- */
- public String getDOMName(Object value) {
- return getDelegateFor((EObject) value).getDOMName(value);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isManagedByParent()
- */
- public boolean isManagedByParent() {
- return false;
- }
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
deleted file mode 100644
index 051757d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/NamespaceTranslator.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 14, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.emf.utilities.NamespaceAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.Namespace;
-
-
-/**
- * @author schacher
- */
-public class NamespaceTranslator extends Translator {
-
- protected String prefix;
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public NamespaceTranslator(String domName) {
- super(domName, NamespaceAdapter.NOTIFICATION_FEATURE, DOM_ATTRIBUTE);
- initPrefix();
- }
-
- private void initPrefix() {
- String dName = getDOMName(null);
- prefix = dName.substring(DefaultTranslatorFactory.XMLNS.length());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
- * java.lang.Object)
- */
- public void setMOFValue(EObject emfObject, Object value) {
- NamespaceAdapter.addNamespace(prefix, (String) value, emfObject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public boolean isSetMOFValue(EObject emfObject) {
- return getMOFValue(emfObject) != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public Object getMOFValue(EObject mofObject) {
- return NamespaceAdapter.getNamespaceURIAtThisLevel(prefix, mofObject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- public void unSetMOFValue(EObject emfObject) {
- NamespaceAdapter.removeNamespace(prefix, emfObject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
- */
- public boolean featureExists(EObject emfObject) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
- */
- public boolean isDataType() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
- * java.lang.Object)
- */
- public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
- if (aFeature == feature) {
- Namespace namespace = (Namespace) (oldValue == null ? newValue : oldValue);
- if (namespace != null)
- return prefix.equals(namespace.getPrefix());
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
deleted file mode 100644
index 918b9ce..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ObjectTranslatorFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Sep 21, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-public final class ObjectTranslatorFilter extends TranslatorFilter {
-
- public ObjectTranslatorFilter() {
- super(null, -1);
- }
-
- public ObjectTranslatorFilter(Translator trans, int version) {
- super(trans, version);
- }
-
- public final int scanNextTranslator(Translator[] children, int start) {
- int found = start + 1;
- for (; found < children.length; ++found) {
- if (!children[found].isDOMAttribute())
- break;
- }
- found = (found < children.length) ? found : -1;
- return found;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReadAheadHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReadAheadHelper.java
deleted file mode 100644
index a7d1a23..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReadAheadHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-/**
- * @author schacher
- */
-public class ReadAheadHelper {
-
- protected String parentDOMName;
- protected String[] values;
- protected String childDOMName;
-
- public ReadAheadHelper(String parentDOMName, String[] values, String childDOMName) {
- super();
- this.parentDOMName = parentDOMName;
- this.values = values;
- this.childDOMName = childDOMName;
- }
-
- /**
- * @return
- */
- public String getChildDOMName() {
- return childDOMName;
- }
-
- /**
- * @return
- */
- public String getParentDOMName() {
- return parentDOMName;
- }
-
- /**
- * @return
- */
- public String[] getValues() {
- return values;
- }
-
- /**
- * @param string
- */
- public void setChildDOMName(String string) {
- childDOMName = string;
- }
-
- /**
- * @param string
- */
- public void setParentDOMName(String string) {
- parentDOMName = string;
- }
-
- /**
- * @param strings
- */
- public void setValues(String[] strings) {
- values = strings;
- }
-
-
- public boolean nodeValueIsReadAheadName(String nodeName) {
-
- return (childDOMName != null) ? childDOMName.equals(nodeName) : false;
- }
-
- public boolean nodeNameIsReadAheadName(String nodeName) {
- boolean result = false;
- for (int i = 0; i < values.length; i++) {
- if (nodeName.equals(values[i])) {
- result = true;
- break;
- }
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
deleted file mode 100644
index fc8ceaf..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedResource.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-public interface ReferencedResource extends Resource, CompatibilityXMIResource {
- //TODO - rename packaged
-
- public static final String DELETED_ERROR_MSG = "This resource has been deleted and can no longer be used."; //$NON-NLS-1$
-
- public static final int RESOURCE_WAS_SAVED = 601;
-
- /**
- * Access this resource for read only. This call increments the use read count of this resource.
- * Clients should call this method before they use the resource. They should call
- * releaseFromRead() after they are done modifying this resource.
- */
- void accessForRead();
-
- /**
- * Access this resource for write only. This call increments the use write count of this
- * resource. Clients should call this method before they modify the resource. They should call
- * releaseFromWrite() after they are done modifying this resource.
- */
- void accessForWrite();
-
- /**
- * Return true if this resource has just been loaded and not yet accessed for read or write.
- */
- boolean isNew();
-
- /**
- * Return true if this resource does not have any write references.
- */
- boolean isReadOnly();
-
- /**
- * Return true if this resource is shared for read or write by more than one accessor.
- */
- boolean isShared();
-
- /**
- * Return true if this resource is shared for write by more than one accessor.
- */
- boolean isSharedForWrite();
-
- /**
- * Release read the access to this resource. This call decrements the use count of this resource
- * and will remove the resource from its resource set if the use count goes to 0. Clients should
- * call this method when they are done accessing the resource and only after they have called
- * accessForRead() to obtain access.
- */
- void releaseFromRead();
-
- /**
- * Release write the access to this resource. This call decrements the write count of this
- * resource and will remove the resource from its resource set if the use count goes to 0.
- * Clients should call this method when they are done accessing the resource and only after they
- * have called accessForWrite() to obtain access.
- */
- void releaseFromWrite();
-
- /**
- * Saves this resource only if the write count is equal to 1.
- */
- void saveIfNecessary() throws Exception;
-
- /**
- * Return true if this resource is dirty and is not shared for write.
- */
- boolean needsToSave();
-
-
-
- /**
- * Set whether we should allow a refresh to take place even when this resource is dirty.
- *
- * @param b
- */
- void setForceRefresh(boolean b);
-
- /**
- * Return whether we should allow a refresh to take place even when this resource is dirty.
- */
- boolean shouldForceRefresh();
-
- boolean wasReverted();
-
- /**
- * Returns the number of open read accesses on this resource
- *
- * @return
- */
- int getReadCount();
-
- /**
- * Returns the number of open write accesses on this resource
- *
- * @return
- */
- int getWriteCount();
-
- /**
- * If the resource is no longer being accessed, then remove it from the resource set.
- */
- void unloadIfNecessary();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
deleted file mode 100644
index d891c2c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIFactoryImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-public class ReferencedXMIFactoryImpl extends ResourceFactoryImpl {
-
- protected static List globalAdapterFactories;
- protected List localAdapterFactories;
-
- /**
- * ReferencedXMIFactoryImpl constructor comment.
- */
- public ReferencedXMIFactoryImpl() {
- super();
- }
-
- /**
- * This is the method that subclasses can override to actually instantiate a new Resource
- *
- * @param uri
- * @return
- */
- protected Resource doCreateResource(URI uri) {
- return new ReferencedXMIResourceImpl(uri);
- }
-
- /**
- * @see org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl#createResource(URI)
- */
- public final Resource createResource(URI uri) {
- Resource res = doCreateResource(uri);
- adaptNew(res);
- return res;
- }
-
- protected void adaptNew(Resource res) {
- if (globalAdapterFactories != null) {
- for (int i = 0; i < globalAdapterFactories.size(); i++) {
- AdapterFactory factory = (AdapterFactory) globalAdapterFactories.get(i);
- factory.adaptAllNew(res);
- }
- }
- if (localAdapterFactories != null) {
- for (int i = 0; i < localAdapterFactories.size(); i++) {
- AdapterFactory factory = (AdapterFactory) localAdapterFactories.get(i);
- factory.adaptAllNew(res);
- }
- }
- }
-
- /**
- * The local adapter factory is an adapter factory that you use to only adapt the resource
- * specific to the ResourceFactory instance.
- *
- * @param factory
- */
- public void addLocalAdapterFactory(AdapterFactory factory) {
- if (localAdapterFactories == null)
- localAdapterFactories = new ArrayList(3);
- localAdapterFactories.add(factory);
- }
-
- public void removeLocalAdapterFactory(AdapterFactory factory) {
- if (localAdapterFactories != null)
- localAdapterFactories.remove(factory);
- }
-
- /**
- * A global adapter factory will be used to adapt any resource created by any ResourceFactory
- * instance.
- *
- * @param factory
- */
- public static void addGlobalAdapterFactory(AdapterFactory factory) {
- if (globalAdapterFactories == null)
- globalAdapterFactories = new ArrayList(3);
- globalAdapterFactories.add(factory);
- }
-
- public static void removeGlobalAdapterFactory(AdapterFactory factory) {
- if (globalAdapterFactories != null)
- globalAdapterFactories.remove(factory);
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
deleted file mode 100644
index 9712a82..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.emf.utilities.IDUtil;
-
-public class ReferencedXMIResourceImpl extends CompatibilityXMIResourceImpl implements ReferencedResource {
- //TODO Add toString hook
- private static final String TO_STRING = "ReferencedXMIResource, file = "; //$NON-NLS-1$
- private static final String READ_COUNT_TO_STRING = " R= "; //$NON-NLS-1$
- private static final String WRITE_COUNT_TO_STRING = " W= "; //$NON-NLS-1$
-
- private int readReferenceCount = 1;
- private int editReferenceCount = 0;
- protected boolean isNew = true;
- protected boolean forceRefresh;
-
- /**
- * ReferencableXMIResourceImpl constructor comment.
- */
- public ReferencedXMIResourceImpl() {
- super();
- }
-
- public ReferencedXMIResourceImpl(URI uri) {
- super(uri);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#getReadCount()
- */
- public int getReadCount() {
- return readReferenceCount;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#getWriteCount()
- */
- public int getWriteCount() {
- return editReferenceCount;
- }
-
-
-
- /*
- * @see ReferencedResource#accessForRead
- */
- public void accessForRead() {
- checkDeleted();
- if (!isNew())
- readReferenceCount++;
- isNew = false;
- }
-
- /*
- * @see ReferencedResource#accessForWrite
- */
- public void accessForWrite() {
- checkDeleted();
- editReferenceCount++;
- if (isNew)
- releaseFromRead();
- isNew = false;
- if (!isTrackingModification())
- setTrackingModification(true);
- }
-
- /*
- * Check if this resource has been removed and throw an exception if it does not have a
- * ResourceSet.
- */
- protected void checkDeleted() {
- if (getResourceSet() == null)
- throw new RuntimeException(DELETED_ERROR_MSG);
- }
-
- /**
- *
- */
- public void collectContainedObjects(java.util.List collecting, EObject parentObject) {
-
- java.util.Iterator children = parentObject.eContents().iterator();
- while (children.hasNext()) {
- EObject child = (EObject) children.next();
- collecting.add(child);
- collectContainedObjects(collecting, child);
- }
- }
-
- /**
- *
- */
- public void ensureFullIDHydration() {
- List allRefObjects = new ArrayList();
- Iterator rootObjects = getContents().iterator();
- while (rootObjects.hasNext()) {
- EObject child = (EObject) rootObjects.next();
- allRefObjects.add(child);
- collectContainedObjects(allRefObjects, child);
- }
-
- Iterator iter = allRefObjects.iterator();
- while (iter.hasNext())
- IDUtil.assignID((EObject) iter.next(), this);
- }
-
- /**
- * If the resource is no longer being accessed, then remove it from the resource set.
- */
- public void unloadIfNecessary() {
- if ((getTotalReferenceCount() <= 0) || (editReferenceCount <= 0 && isModified()))
- unload();
- }
-
- /**
- * Return the number of write accesses to this resource.
- *
- * @return int The number of references.
- */
- protected int getTotalReferenceCount() {
- return editReferenceCount + readReferenceCount;
- }
-
- /*
- * @see ReferencedResource#isNew
- */
- public boolean isNew() {
- return isNew;
- }
-
- /*
- * @see ReferencedResource#isReadOnly
- */
- public boolean isReadOnly() {
- return editReferenceCount <= 0;
- }
-
- /*
- * @see ReferencedResource#isShared
- */
- public boolean isShared() {
- return getTotalReferenceCount() > 1;
- }
-
- /*
- * @see ReferencedResource#isSharedForWrite
- */
- public boolean isSharedForWrite() {
- return editReferenceCount > 1;
- }
-
- /**
- * @see ReferencedResource#preDelete
- */
- public void preDelete() {
- }
-
- /*
- * @see ReferencedResource#releaseFromRead
- */
- public void releaseFromRead() {
- readReferenceCount--;
- if (readReferenceCount < 0)
- throw new RuntimeException("Read reference count error: " + this.toString()); //$NON-NLS-1$
- unloadIfNecessary();
- }
-
- /*
- * @see ReferencedResource#releaseFromWrite
- */
- public void releaseFromWrite() {
- editReferenceCount--;
- if (editReferenceCount < 0)
- throw new RuntimeException("Write reference count error: " + this.toString()); //$NON-NLS-1$
- unloadIfNecessary();
- }
-
- /*
- * @see ReferencedResource#saveIfNecessary
- */
- public void saveIfNecessary() throws Exception {
- if (!isSharedForWrite()) // caller is the only referencer
- save(Collections.EMPTY_MAP);
- }
-
- public String toString() {
- return TO_STRING + getURI().toString() + READ_COUNT_TO_STRING + new Integer(readReferenceCount) + WRITE_COUNT_TO_STRING + new Integer(editReferenceCount);
- }
-
- /*
- * @see ReferencedResource#needsToSave()
- */
- public boolean needsToSave() {
- return isModified() && !isSharedForWrite();
- }
-
-
- /**
- * @see ReferencedResource#setForceRefresh(boolean)
- */
- public void setForceRefresh(boolean b) {
- forceRefresh = b;
- }
-
- /**
- * @see ReferencedResource#shouldForceRefresh()
- */
- public boolean shouldForceRefresh() {
- return forceRefresh;
- }
-
- protected void basicDoLoad(InputStream arg0, Map arg1) throws IOException {
- boolean isTrackingMods = isTrackingModification();
- try {
- if (isTrackingMods)
- setTrackingModification(false);
- super.basicDoLoad(arg0, arg1);
- } finally {
- if (isTrackingMods)
- setTrackingModification(true);
- }
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doUnload()
- */
- protected void doUnload() {
- if (isTrackingModification() && editReferenceCount < 1) //do not turn off modification if
- // we still have a write count
- setTrackingModification(false);
- super.doUnload();
- setForceRefresh(false);
- setModified(false); //dcb - this is required to ensure that resources without files are
- // marked as not modified.
- if (readReferenceCount == 0 && editReferenceCount == 0)
- resetAsNew();
- }
-
-
- /**
- * The resource has been unloaded, and there are no references. Treat the resource like a new
- * Resource
- */
- private void resetAsNew() {
- readReferenceCount = 1;
- isNew = true;
- }
-
- /**
- * @see Resource#save(Object)
- */
- public void save(Map options) throws IOException {
- super.save(options);
- notifySaved();
- }
-
- protected void notifySaved() {
- if (eNotificationRequired()) {
- Notification notification = new NotificationImpl(RESOURCE_WAS_SAVED, this, this) {
- public Object getNotifier() {
- return ReferencedXMIResourceImpl.this;
- }
-
- public int getFeatureID(Class expectedClass) {
- return RESOURCE_WAS_SAVED;
- }
- };
- eNotify(notification);
- }
- }
-
- /**
- * @see com.ibm.etools.emf.workbench.ReferencedResource#wasReverted()
- */
- public boolean wasReverted() {
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Renderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Renderer.java
deleted file mode 100644
index e3be112..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Renderer.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-/**
- * Interface that defines the api for rendering an EMF object to XML and vice versa
- */
-public interface Renderer {
-
- public static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; //$NON-NLS-1$
-
- public static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
-
- void setResource(TranslatorResource aResource);
-
- TranslatorResource getResource();
-
- void doLoad(InputStream in, Map options) throws IOException;
-
- void doSave(OutputStream outputStream, Map options) throws IOException;
-
- boolean useStreamsForIO();
-
- void prepareToAddContents();
-
- int getVersionID();
-
- boolean isModified();
-
- void accessForWrite();
-
- void accessForRead();
-
- void releaseFromRead();
-
- void releaseFromWrite();
-
- void preDelete();
-
- void preUnload();
-
- boolean isShared();
-
- boolean isSharedForWrite();
-
- void setBatchMode(boolean isBatch);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
deleted file mode 100644
index 9f294d3..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactory.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-
-public abstract class RendererFactory {
-
- public abstract Renderer createRenderer();
-
- private static RendererFactory defaultRendererFactory;
-
- private static RendererFactoryDefaultHandler defaultHandler;
-
- private boolean validating = true;
-
- /**
- * Interested parties can use the
- */
- public final static Notifier NotificationEngine = Notifier.INSTANCE;
-
- /**
- * @return
- */
- public static RendererFactory getDefaultRendererFactory() {
- if (defaultRendererFactory == null)
- defaultRendererFactory = getDefaultHandler().getDefaultRendererFactory();
- return defaultRendererFactory;
- }
-
- /**
- * @param factory
- */
- public static void setDefaultRendererFactory(RendererFactory factory) {
-
- //System.out.println("\n\n***Setting factory: " + factory);
- NotificationEngine.notifyListeners(factory);
- defaultRendererFactory = factory;
- }
-
- public String toString() {
- return "RendererFactory instance: " + getClass().getName(); //$NON-NLS-1$
- }
-
- public static class Notifier {
-
- private static final Notifier INSTANCE = new Notifier();
-
- private final Collection resourceFactoryListeners = new ArrayList();
-
- private Notifier() {
- }
-
- public void notifyListeners(RendererFactory rendererFactory) {
-
- final int length = resourceFactoryListeners.size();
- //System.out.println("Notifying " + length + " listeners");
-
- if (length > 0) {
- /*
- * Since the renderer factories are singletons, this reference check should always
- * work
- */
- if (rendererFactory != RendererFactory.getDefaultRendererFactory()) {
- WeakReference wref = null;
- Listener listener = null;
- synchronized (resourceFactoryListeners) {
- for (Iterator i = resourceFactoryListeners.iterator(); i.hasNext();) {
- wref = (WeakReference) i.next();
- listener = (Listener) wref.get();
- //System.out.println("Notifying Listener: " + listener);
- if (listener != null)
- listener.updateRendererFactory(rendererFactory);
- else
- i.remove();
- }
- }
- }
- }
- }
-
- public void addListener(Listener l) {
- //System.out.println("Adding listener: " + l);
- synchronized (resourceFactoryListeners) {
- resourceFactoryListeners.add(new WeakReference(l));
- }
- }
-
- public void removeListener(Listener listenerToRemove) {
- final int length = resourceFactoryListeners.size();
- if (length > 0) {
- WeakReference wref = null;
- Listener listener = null;
- synchronized (resourceFactoryListeners) {
- for (Iterator i = resourceFactoryListeners.iterator(); i.hasNext();) {
- wref = (WeakReference) i.next();
- listener = (Listener) wref.get();
- if (listener != null) {
- if (listener == listenerToRemove) {
- i.remove();
- break;
- }
- } else {
- i.remove();
- }
- }
- }
- }
- }
-
- }
-
- public interface Listener {
- void updateRendererFactory(RendererFactory newRendererFactory);
- }
-
- /**
- * @return
- */
- public boolean isValidating() {
- return validating;
- }
-
- /**
- * @param b
- */
- public void setValidating(boolean b) {
- validating = b;
- }
-
- /**
- * @return
- */
- public static RendererFactoryDefaultHandler getDefaultHandler() {
- if (defaultHandler == null)
- defaultHandler = EMF2DOMRendererFactoryDefaultHandler.INSTANCE;
- return defaultHandler;
- }
-
- /**
- * @param handler
- */
- public static void setDefaultHandler(RendererFactoryDefaultHandler handler) {
- defaultHandler = handler;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactoryDefaultHandler.java
deleted file mode 100644
index 575df4f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RendererFactoryDefaultHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface RendererFactoryDefaultHandler {
-
- RendererFactory getDefaultRendererFactory();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
deleted file mode 100644
index 18f8d84..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/RootTranslator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.resource.Resource;
-
-public class RootTranslator extends Translator {
-
- /**
- * Constructor for RootTranslator.
- *
- * @param domNameAndPath
- * @param eClass
- */
- public RootTranslator(String domNameAndPath, EClass eClass) {
- super(domNameAndPath, eClass);
- }
-
- /**
- * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(Notifier, Object, int)
- */
- public void setMOFValue(Notifier owner, Object value, int newIndex) {
- ((Resource) owner).getContents().add(newIndex, value);
- }
-
- /**
- * @see com.ibm.etools.emf2xml.impl.Translator#removeMOFValue(Notifier, Object)
- */
- public void removeMOFValue(Notifier owner, Object value) {
- ((Resource) owner).getContents().remove(value);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
- * java.lang.Object)
- */
- public void setMOFValue(Resource res, Object value) {
- if (res != null && value != null)
- res.getContents().add(value);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isMultiValued()
- */
- public boolean isMultiValued() {
- return true;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
deleted file mode 100644
index d5d697b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/SourceLinkTranslator.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author schacher
- */
-public class SourceLinkTranslator extends Translator {
-
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param path
- */
- public SourceLinkTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
- super(domNameAndPath, aFeature, path);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param path
- */
- public SourceLinkTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path, int style) {
- super(domNameAndPath, aFeature, path);
- fStyle |= style;
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param style
- */
- public SourceLinkTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
- super(domNameAndPath, aFeature, style);
- }
-
- public Object convertStringToValue(String strValue, EObject owner) {
-
- Object value = null;
- if (strValue != null)
- // Find the object with the name that matches matchName
- value = fTranslatorPaths[0].findObject(owner, strValue.trim());
- if ((fStyle & Translator.STRING_RESULT_OK) != 0)
- return ((value != null) ? value : strValue);
- return value;
- }
-
- public String convertValueToString(Object value, EObject owner) {
- TranslatorPath path = fTranslatorPaths[0];
- Object attrValue = path.getLastMap().getMOFValue((EObject) value);
- return path.getLastMap().convertValueToString(attrValue, owner);
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
deleted file mode 100644
index a073820..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/Translator.java
+++ /dev/null
@@ -1,792 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.FeatureValueConverter;
-
-
-public class Translator {
-
- public final static int NO_STYLE = 0;
- public final static int DOM_ATTRIBUTE = 1;
- public final static int EMPTY_TAG = 1 << 1;
- public final static int CDATA_CONTENT = 1 << 2;
- /**
- * Style bit that indicates that the end tag should NOT be indented; by default it is.
- */
- public final static int END_TAG_NO_INDENT = 1 << 3;
- /**
- * Style bit that indicates that booleans should NOT be converted as "True" and "False"; default
- * is that they are
- */
- public final static int BOOLEAN_LOWERCASE = 1 << 4;
- /**
- * Style bit that indicates an enum value contains hyphens If this is true, then internally the
- * hyphens are replaced with underscores
- */
- public final static int ENUM_FEATURE_WITH_HYPHENS = 1 << 5;
-
- protected final static int OBJECT_MAP = 1 << 6;
- protected final static int BOOLEAN_FEATURE = 1 << 7;
-
- protected final static int SHARED_REFERENCE = 1 << 8;
-
- /**
- * Indicates that the feature may be significant even if it is empty
- */
- public final static int EMPTY_CONTENT_IS_SIGNIFICANT = 1 << 9;
-
- /**
- * Used to indicate that feature is associated with a comment node
- */
- protected final static int COMMENT_FEATURE = 1 << 10;
-
- /**
- * If the value is null, then an eUnset() will be invoked on the feature
- */
- public final static int UNSET_IF_NULL = 1 << 11;
-
- /**
- * Return the element contents as a String if the feature is unresolveable (Used by the
- * SourceLinkTranslator)
- */
- public final static int STRING_RESULT_OK = 1 << 12;
-
- protected String[] fDOMNames;
- protected String fDOMPath = ""; //$NON-NLS-1$
- protected Map readAheadNames;
- protected int fStyle = NO_STYLE;
- protected EStructuralFeature feature;
- protected TranslatorPath[] fTranslatorPaths;
- protected EClass emfClass;
- protected String fNameSpace = ""; //$NON-NLS-1$
- // added by MDE
- protected String domNameAndPath = null;
-
- /**
- * Indicates if any of the children of this Translator are themselves DependencyTranslators
- */
- protected Boolean isDependencyParent;
- protected EStructuralFeature dependencyFeature;
- protected static EcorePackage ECORE_PACKAGE = EcorePackage.eINSTANCE;
-
- // Use this identifier for the DOMName when the attribute
- // value is to be extracted directly from the text of the node.
- // This is rare, but occurs in the web.xml in the case of a
- // WelcomeFile.
- static final public String TEXT_ATTRIBUTE_VALUE = "$TEXT_ATTRIBUTE_VALUE"; //$NON-NLS-1$
-
- static final public EStructuralFeature CONTAINER_FEATURE = new ContainerFeature();
-
- static final public EStructuralFeature ROOT_FEATURE = new RootFeature();
-
- protected static class ContainerFeature extends EStructuralFeatureImpl {
- protected ContainerFeature() {
- super();
- }
- }
-
- protected static class RootFeature extends EStructuralFeatureImpl {
- protected RootFeature() {
- super();
- }
- }
-
- public Translator findChild(String tagName, Object target, int versionID) {
-
- Translator result = null;
- Translator[] maps = getChildren(target, versionID);
-
- if (maps != null) {
- for (int i = 0; i < maps.length; i++) {
- Translator map = maps[i];
- if (map.isMapFor(tagName)) {
- result = map;
- break;
- }
- }
- }
- if (result == null) {
- VariableTranslatorFactory factory = getVariableTranslatorFactory();
- if (factory != null && factory.accepts(tagName)) {
- result = factory.create(tagName);
- }
- }
- return result;
- }
-
- /**
- * Utility method to string together arrays of children
- */
- public static Object[] concat(Object[] array1, Object[] array2) {
- Object[] result = (Object[]) java.lang.reflect.Array.newInstance(array1.getClass().getComponentType(), array1.length + array2.length);
- System.arraycopy(array1, 0, result, 0, array1.length);
- System.arraycopy(array2, 0, result, array1.length, array2.length);
- return result;
- }
-
- public static Object[] concat(Object[] array1, Object object2) {
- Object[] newArray = new Object[]{object2};
- return concat(array1, newArray);
- }
-
- public static Translator createParentAndTextAttributeTranslator(String domName, EStructuralFeature parentFeature, EStructuralFeature childFeature) {
- GenericTranslator parent = new GenericTranslator(domName, parentFeature, END_TAG_NO_INDENT);
- parent.setChildren(new Translator[]{new Translator(TEXT_ATTRIBUTE_VALUE, childFeature)});
- return parent;
- }
-
- public Translator(String domNameAndPath, EClass eClass) {
- initializeDOMNameAndPath(domNameAndPath);
- setEMFClass(eClass);
- }
-
- public Translator(String domNameAndPath, EStructuralFeature aFeature) {
- initializeDOMNameAndPath(domNameAndPath);
- setFeature(aFeature);
- }
-
- public Translator(String domNameAndPath, EStructuralFeature aFeature, EClass eClass) {
- this(domNameAndPath, aFeature);
- setEMFClass(emfClass);
- }
-
- public Translator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
- this(domNameAndPath, aFeature, new TranslatorPath[]{path});
- }
-
- public Translator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath[] paths) {
- initializeDOMNameAndPath(domNameAndPath);
- fTranslatorPaths = paths;
- setFeature(aFeature);
- }
-
- public Translator(String domNameAndPath, EStructuralFeature aFeature, int style) {
- initializeDOMNameAndPath(domNameAndPath);
- fStyle = style;
- setFeature(aFeature);
- }
-
- public static EcorePackage getEcorePackage() {
- return EcorePackage.eINSTANCE;
- }
-
- public String getDOMName(Object value) {
- return fDOMNames[0];
- }
-
- public String[] getDOMNames() {
- return fDOMNames;
- }
-
- public String getDOMPath() {
- return fDOMPath;
- }
-
- public boolean hasDOMPath() {
- return fDOMPath != null && fDOMPath.length() != 0;
- }
-
- public EStructuralFeature getFeature() {
- return feature;
- }
-
- /**
- * Parse the DOM names and path out of <domNameAndPath>and set the appropriate fields.
- */
- protected void initializeDOMNameAndPath(String domNameAndPathArg) {
- if (domNameAndPathArg == null)
- return;
- int inx = domNameAndPathArg.lastIndexOf('/');
- if (inx != -1) {
- fDOMNames = parseDOMNames(domNameAndPathArg.substring(inx + 1));
- fDOMPath = domNameAndPathArg.substring(0, inx);
- } else {
- fDOMNames = parseDOMNames(domNameAndPathArg);
- fDOMPath = ""; //$NON-NLS-1$
- }
- // added by MDE
- this.domNameAndPath = domNameAndPathArg;
-
- }
-
- /**
- * Indicates whether the node should be written as an empty tag; eg, <distributable/>
- */
- public boolean isCDATAContent() {
- return (fStyle & CDATA_CONTENT) != 0;
- }
-
- /**
- * Indicates whether the DOMName represents a sub element name or an attribute name
- *
- * @return boolean True if the DOMName is an attribute name.
- */
- public boolean isDOMAttribute() {
- return (fStyle & DOM_ATTRIBUTE) != 0;
- }
-
- /**
- * Indicates whether the node should be written as an empty tag; eg, <distributable/>
- */
- public boolean isEmptyTag() {
- return (fStyle & EMPTY_TAG) != 0;
- }
-
- public boolean isBooleanUppercase() {
- return (fStyle & BOOLEAN_FEATURE) != 0 && (fStyle & BOOLEAN_LOWERCASE) == 0;
- }
-
- public boolean isBooleanFeature() {
- return (fStyle & BOOLEAN_FEATURE) != 0;
- }
-
- public boolean shouldIndentEndTag() {
- return (fStyle & END_TAG_NO_INDENT) == 0;
- }
-
- public boolean isEmptyContentSignificant() {
- return ((fStyle & EMPTY_TAG) != 0) || ((fStyle & EMPTY_CONTENT_IS_SIGNIFICANT) != 0);
- }
-
- /**
- * Returns true if this map is to another MOF object (not a primitive)
- */
- public boolean isObjectMap() {
- return (fStyle & OBJECT_MAP) != 0;
- }
-
- /**
- * Returns true if this map is for a shared reference
- */
- public boolean isShared() {
- return (fStyle & SHARED_REFERENCE) != 0;
- }
-
- public boolean isEnumWithHyphens() {
- return (fStyle & ENUM_FEATURE_WITH_HYPHENS) != 0;
- }
-
- /**
- * Indicates whether the map represents a case where the text of the DOMNode represents the
- * objects one and only attribute value. An example of this case is a <welcome-file>file.txt
- * </welcome-file>.
- */
- public boolean isDOMTextValue() {
- return fDOMNames[0] == TEXT_ATTRIBUTE_VALUE;
- }
-
- /**
- * Indicates whether the id is the mof attribute that should be set.
- */
- public boolean isIDMap() {
- return false;
- }
-
- /**
- * Indicates whether the id is the mof attribute that should be set.
- */
- public boolean isLinkMap() {
- return fTranslatorPaths != null;
- }
-
- public boolean isTargetLinkMap() {
- return isLinkMap() && !isObjectMap();
- }
-
- /**
- * Return true if this map is the one representing a node with the name <domName>. By default
- * this method simply compares the DOM name of the map against the <domName>parameter
- *
- * @return boolean
- * @param domName
- * java.lang.String
- */
- public boolean isMapFor(String domName) {
- if (domName.equals(getDOMPath()))
- return true;
- for (int i = 0; i < fDOMNames.length; i++) {
- if (domName.equals(fDOMNames[i]))
- return true;
- }
- return false;
- }
-
- public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
- return feature == aFeature;
- }
-
- /**
- * Indicates whether feature being mapped is a collection.
- *
- * @return boolean True if the feature is multi valued.
- */
- public boolean isMultiValued() {
- if (feature != null)
- return feature.isMany();
- return false;
- }
-
- /**
- * Parses comma separated names from <domNamesString>. Returns an array containing the names.
- *
- * @return java.lang.String[]
- * @param domNamesString
- * java.lang.String
- */
- protected String[] parseDOMNames(String domNamesString) {
- int startInx = 0;
- int inx = domNamesString.indexOf(',');
- ArrayList results = new ArrayList(1);
- while (inx != -1) {
- results.add(domNamesString.substring(startInx, inx));
- startInx = inx + 1;
- inx = domNamesString.indexOf(',', startInx);
- }
- if (startInx == 0)
- results.add(domNamesString);
- else
- results.add(domNamesString.substring(startInx));
- return (String[]) results.toArray(new String[results.size()]);
- }
-
- public String toString() {
- StringBuffer sb = new StringBuffer();
- String cn = getClass().getName();
- int i = cn.lastIndexOf('.');
- cn = cn.substring(++i, cn.length());
- sb.append(cn);
- sb.append('(');
- sb.append(fDOMNames[0]);
- for (int j = 1; j < fDOMNames.length; j++) {
- sb.append('|');
- sb.append(fDOMNames[j]);
- }
- sb.append(',');
- sb.append(hashCode());
- sb.append(')');
- return sb.toString();
- }
-
- /**
- * Gets the TranslatorPath.
- *
- * @return Returns a TranslatorPath
- */
- public TranslatorPath[] getTranslatorPaths() {
- return fTranslatorPaths;
- }
-
- /*
- * @see Object#equals(Object)
- */
- public boolean equals(Object object) {
- if (!(object instanceof Translator))
- return false;
- Translator mapInfo = (Translator) object;
- return fDOMNames.equals(mapInfo.getDOMNames()) && (feature == null && mapInfo.getFeature() == null || feature.equals(mapInfo.getFeature()));
- }
-
- /**
- * Returns the isManagedByParent.
- *
- * @return boolean
- */
- public boolean isManagedByParent() {
- return getChildren(null, -1) == null;
- }
-
- /*
- * In the 99% case there is only one node name to be concerned with, but subclasses can override
- * for the cases where multiple dom names map to one feature
- */
- public EObject createEMFObject(String nodeName, String readAheadName) {
- if (emfClass == null) {
- if (feature == null)
- return null;
- if (isObjectMap())
- return createEMFObject(feature);
- }
- return createEMFObject(emfClass);
- }
-
- public static EObject createEMFObject(EStructuralFeature aFeature) {
- if (aFeature == null)
- return null;
-
- return createEMFObject(((EReference) aFeature).getEReferenceType());
- }
-
- public static EObject createEMFObject(EClass anEClass) {
- if (anEClass == null)
- return null;
- return anEClass.getEPackage().getEFactoryInstance().create(anEClass);
- }
-
- public void setTextValueIfNecessary(String textValue, Notifier owner, int versionId) {
- Translator textTranslator = this.findChild(Translator.TEXT_ATTRIBUTE_VALUE, owner, versionId);
- if (textTranslator != null) {
- Object objectValue = textTranslator.convertStringToValue(textValue, (EObject) owner);
- textTranslator.setMOFValue(owner, objectValue);
- }
- }
-
- /**
- * Check to see if feature is valid on a particular mofObject.
- *
- * @return boolean Return true if the feature specified exists on the MOF object.
- * @param emfObject
- * org.eclipse.emf.ecore.EObject
- */
- public boolean featureExists(EObject emfObject) {
- if (feature == null)
- return false;
-
- return emfObject.eClass().getEStructuralFeature(feature.getName()) != null;
- }
-
- /**
- * Translators which do not have a feature should override this method with custom behavior.
- */
- public String extractStringValue(EObject emfObject) {
- if (isEmptyTag() && feature == null)
- return ""; //Fake it out with a value //$NON-NLS-1$
- return null;
- }
-
- public Object convertStringToValue(String nodeName, String readAheadName, String value, Notifier owner) {
- Object result = null;
- try {
-
- if (!this.isManagedByParent()) {
- result = createEMFObject(nodeName, readAheadName);
- } else {
- result = convertStringToValue(value, (EObject) owner);
- }
-
- } catch (ClassCastException cce) {
-
- }
- return result;
- }
-
- /**
- * Converts a string value to the appropriate type.
- *
- * @return java.lang.Object The converted value
- * @param strValue
- * java.lang.String The string to convert.
- */
- public Object convertStringToValue(String strValue, EObject owner) {
- if (feature == null)
- return strValue;
- if (strValue != null) {
- if (isEnumWithHyphens())
- strValue = strValue.replace('-', '_');
- if (!isCDATAContent()) {
- strValue = strValue.trim();
- }
- }
- Object value = FeatureValueConverter.DEFAULT.convertValue(strValue, feature);
- if (value == null) {
- if (isEmptyTag() && !isDOMAttribute() && !isDOMTextValue() && isBooleanFeature())
- return Boolean.TRUE;
- EObject convertToType = feature.getEType();
- if (convertToType == null)
- value = strValue;
- else if (convertToType.equals(getEcorePackage().getEString())) {
- value = ""; //$NON-NLS-1$
- }
- }
- return value;
- }
-
- /**
- * Converts a value of a specified type to a string value. Subclasses may override for special
- * cases where special conversion needs to occur based on the feature and or object type.
- *
- * @return String The converted value
- * @param value
- * java.lang.Object The object to convert.
- */
- public String convertValueToString(Object value, EObject owner) {
- if (isEmptyTag() || value == null)
- return null;
- else if (isEnumWithHyphens())
- return value.toString().replace('_', '-');
- else if (isBooleanUppercase())
- return ((Boolean) value).booleanValue() ? "True" : "False"; //$NON-NLS-1$ //$NON-NLS-2$
-
- return value.toString();
- }
-
- public Translator[] getVariableChildren(Notifier target, int version) {
- Translator[] results = null;
- VariableTranslatorFactory factory = getVariableTranslatorFactory();
- if (factory != null) {
- List variableTranslators = factory.create(target);
- if (variableTranslators != null && variableTranslators.size() > 0) {
- Object[] vtoa = variableTranslators.toArray();
-
- results = new Translator[vtoa.length];
- for (int i = 0; i < results.length; i++)
- results[i] = (Translator) vtoa[i];
- }
-
- }
- if (results == null)
- results = new Translator[0];
- return results;
- }
-
- /**
- * Returns null by default; subclasses should override to return specific children
- */
- public Translator[] getChildren(Object target, int versionID) {
- return getChildren();
- }
-
- protected Translator[] getChildren() {
- return null;
- }
-
- /**
- * Return the list of MOF children that currently exist for the values of an attribute.
- */
- public List getMOFChildren(EObject mofObject) {
- if (feature == null)
- return Collections.EMPTY_LIST;
- Object value = getMOFValue(mofObject);
- List result = Collections.EMPTY_LIST;
- if (isMultiValued())
- result = (List) value;
- else if (value != null)
- result = Collections.singletonList(value);
- return result;
- }
-
- public Object getMOFValue(EObject mofObject) {
- if (feature == null)
- return null;
- return mofObject.eGet(feature);
- }
-
- /**
- * Sets a value of a feature in a mof object.
- */
- public void setMOFValue(Notifier owner, Object value, int newIndex) {
- if (feature != null) {
- if ((fStyle & UNSET_IF_NULL) != 0 && value == null)
- ExtendedEcoreUtil.eUnsetOrRemove((EObject) owner, feature, value);
- else
- ExtendedEcoreUtil.eSetOrAdd((EObject) owner, feature, value, newIndex);
- }
- }
-
- public void setMOFValue(Notifier owner, Object value) {
- if (owner instanceof EObject) {
- setMOFValue((EObject) owner, value);
- } else if (owner instanceof Resource) {
- setMOFValue((Resource) owner, value);
- }
- }
-
- public void setMOFValue(EObject emfObject, Object value) {
- // if (feature != null)
- // emfObject.eSet(feature, value);
- setMOFValue(emfObject, value, -1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
- * java.lang.Object)
- */
- public void setMOFValue(Resource res, Object value) {
- if (res != null && value != null)
- res.getContents().add(value);
- }
-
- public void removeMOFValue(Notifier owner, Object value) {
- if (feature != null)
- ExtendedEcoreUtil.eUnsetOrRemove((EObject) owner, feature, value);
- }
-
- public boolean isSetMOFValue(EObject emfObject) {
- boolean isSet = feature != null && emfObject.eIsSet(feature);
- if (isEmptyTag())
- return isSet && ((Boolean) emfObject.eGet(feature)).booleanValue();
- return isSet;
- }
-
- public void unSetMOFValue(EObject emfObject) {
- if (feature != null)
- emfObject.eUnset(feature);
- }
-
- public void clearList(EObject mofObject) {
- if (feature != null)
- ((List) mofObject.eGet(feature)).clear();
- }
-
- protected void setFeature(EStructuralFeature aFeature) {
- this.feature = aFeature;
- if (feature == null)
- return;
- //This way an instance check happens only once
- if (aFeature instanceof EReference) {
- fStyle |= OBJECT_MAP;
- if (!((EReference) aFeature).isContainment())
- fStyle |= SHARED_REFERENCE;
- }
-
- if (getEcorePackage().getEBoolean() == feature.getEType())
- fStyle |= BOOLEAN_FEATURE;
- }
-
- protected void setEMFClass(EClass anEClass) {
- this.emfClass = anEClass;
- if (anEClass != null)
- fStyle |= OBJECT_MAP;
-
- }
-
- public boolean hasReadAheadNames() {
- return readAheadNames != null && !readAheadNames.isEmpty();
- }
-
- /**
- * Return the read ahead names, if they are defined, for a given parent node name. This is used
- * when creation of a specific EMF object is dependent on the value of a child node.
- */
- public ReadAheadHelper getReadAheadHelper(String parentName) {
- if (readAheadNames == null)
- return null;
- return (ReadAheadHelper) readAheadNames.get(parentName);
- }
-
- public void addReadAheadHelper(ReadAheadHelper helper) {
- if (readAheadNames == null)
- readAheadNames = new HashMap(3);
- readAheadNames.put(helper.getParentDOMName(), helper);
- }
-
- public boolean isDependencyChild() {
- return false;
- }
-
- /**
- * @return
- */
- public boolean isDependencyParent() {
- if (isDependencyParent == null) {
- isDependencyParent = Boolean.FALSE;
- Translator[] theChildren = getChildren(null, -1);
- if (theChildren != null) {
- for (int i = 0; i < theChildren.length; i++) {
- //For now we assume one
- if (theChildren[i].isDependencyChild()) {
- isDependencyParent = Boolean.TRUE;
- dependencyFeature = theChildren[i].getDependencyFeature();
- }
- }
- }
- }
- return isDependencyParent.booleanValue();
- }
-
- /**
- * @return
- */
- public EStructuralFeature getDependencyFeature() {
- return dependencyFeature;
- }
-
- public EObject basicGetDependencyObject(EObject parent) {
- return (EObject) parent.eGet(dependencyFeature);
- }
-
- /**
- * Use when the DOM path is not null, and there are no children. Default is false, but
- * subclasses may wish to override
- */
- public boolean shouldRenderEmptyDOMPath(EObject eObject) {
- return isEmptyContentSignificant();
- }
-
- /**
- * Use when the translator tolerates parent nodes that relate to the DOM path, and no children;
- * default is do nothing
- */
- public void setMOFValueFromEmptyDOMPath(EObject eObject) {
-
- }
-
- /**
- * Namespace for the attributes
- *
- * @return
- */
- public String getNameSpace() {
- return fNameSpace;
- }
-
- /**
- * Set the namespace for the dom attribute
- *
- * @param string
- */
- public void setNameSpace(String string) {
- fNameSpace = string;
- }
-
- public VariableTranslatorFactory getVariableTranslatorFactory() {
- if (isObjectMap())
- return DefaultTranslatorFactory.INSTANCE;
- return null;
- }
-
- public boolean isEnumFeature() {
- return feature != null && ECORE_PACKAGE.getEEnum().isInstance(feature.getEType());
- }
-
- public boolean isUnsettable() {
- return feature != null && feature.isUnsettable();
- }
-
- public boolean isDataType() {
- return feature != null && feature.getEType() instanceof EDataType;
- }
-
- /**
- * @return
- */
- public boolean isComment() {
- return (fStyle & COMMENT_FEATURE) != 0;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
deleted file mode 100644
index b12067d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorFilter.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Sep 21, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EObject;
-
-
-/*
- * Translator filters can be used to differentiate between Object and Attribute Translators without
- * breaking them out into seperate data structures. The Filter will rely on the underlying data
- * structure used to store the children of the given Translator.
- *
- * getNextChild() will return null when no other translators of the given genre are available.
- *
- * The processing hints which are created and then passed to getNext*Translator() store information
- * that needs to be persisted between calls. The createProcessingHints() will create a properly
- * initialized array. The constants NEXT_START_HINT_INDX and MODE_HINT_INDX provide pointers into
- * the array for the NEXT_START position and the proper mode to operate in
- * (STANDARD_TRANSLATORS_MODE or
- *
- */
-public abstract class TranslatorFilter {
-
- protected final Translator translator;
- protected final int version;
-
- public static final int NEXT_START_HINT_INDX = 0;
- public static final int MODE_HINT_INDX = 1;
-
- public static final int STANDARD_TRANSLATORS_MODE = 0;
- public static final int VARIABLE_TRANSLATORS_MODE = 1;
-
- /*
- * These TranslatorFilters are used in a stateless mode. Only their scanNextTranslator() methods
- * will be invoked
- */
- private static final TranslatorFilter objectTranslatorFilter = new ObjectTranslatorFilter(null, -1);
- private static final TranslatorFilter attributeTranslatorFilter = new AttributeTranslatorFilter(null, -1);
-
-
- protected int mode = STANDARD_TRANSLATORS_MODE;
- protected int index = -1;
-
- protected Translator cachedPeekAheadTranslator = null;
-
- public TranslatorFilter(Translator trans, int version) {
- this.translator = trans;
- this.version = version;
- }
-
- /**
- * Calling peek twice will advance the current child
- */
- public Translator peekNextChild(EObject target) {
- cachedPeekAheadTranslator = getNextChild(target);
- return cachedPeekAheadTranslator;
- }
-
- /**
- * getNextChild() will return null when no other translators of the given genre are available.
- */
- public Translator getNextChild(EObject target) {
-
- Translator result = null;
- if (cachedPeekAheadTranslator != null) {
- result = cachedPeekAheadTranslator;
- cachedPeekAheadTranslator = null;
- return result;
- }
-
- int found = 0;
- Translator children[] = null;
- switch (mode) {
- case STANDARD_TRANSLATORS_MODE :
- children = this.translator.getChildren(target, this.version);
-
- /* Look for the next Attribute Translator */
- found = scanNextTranslator(children, this.index);
-
- if (found >= 0) {
- /*
- * If found, (1) update the result, (2) update the index so we can skip ahead on
- * the next invocation (3) escape the VARIABLE_TRANSLATORS processing
- */
- result = children[found];
- this.index = found;
- break;
- }
- /*
- * Reset the index. DO NOT BREAK. Allow entry into VARIABLE_TRANSLATORS case
- */
- this.index = -1;
- /*
- * update the mode to VARIABLE_TRANSLATORS so we can skip to it directly next time
- */
- this.mode = VARIABLE_TRANSLATORS_MODE;
- case VARIABLE_TRANSLATORS_MODE :
- children = this.translator.getVariableChildren(target, this.version);
- found = scanNextTranslator(children, this.index);
- if (found >= 0) {
- /*
- * If found, (1) update the result, (2) update the index so we can skip ahead on
- * the next invocation
- */
- result = children[found];
- this.index = found;
- }
-
- }
-
- return result;
- }
-
- public static final int[] createProcessingHints() {
- return new int[]{-1, STANDARD_TRANSLATORS_MODE};
- }
-
- public static final Translator getNextAttributeTranslator(Translator translator, int startHint, int[] nextHint, EObject target, int version) {
-
- return TranslatorFilter.getNextChild(translator, startHint, nextHint, target, version, attributeTranslatorFilter);
- }
-
- public static final Translator getNextObjectTranslator(Translator translator, int startHint, int[] nextHint, EObject target, int version) {
-
- return TranslatorFilter.getNextChild(translator, startHint, nextHint, target, version, objectTranslatorFilter);
- }
-
- /**
- * getNextChild() takes hints on where to begin in the children array of the given Translator.
- * When it finds the translator, it will update the hints array with the start hint for the next
- * invocation(hints[0]) and when necessary it will use update the mode (hints[1]) to either
- * STANDARD_TRANSLATORS or VARIABLE_TRANSLATORS.
- *
- * @param translator
- * @param startHint
- * @param hints
- * a two-element array: hints[0] will be updated with the next startHint and hints[1]
- * will be used to store the mode.
- * @param target
- * @param version
- * @param translatorFilter
- * @return
- */
- public static final Translator getNextChild(Translator translator, int startHint, int[] hints, EObject target, int version, TranslatorFilter translatorFilter) {
-
- Translator result = null;
-
- int index = startHint;
- Translator children[] = null;
-
- switch (hints[MODE_HINT_INDX]) {
- case STANDARD_TRANSLATORS_MODE :
- children = translator.getChildren(target, version);
- if (children != null && startHint < children.length) {
-
- /* Look for the next Attribute Translator */
- index = translatorFilter.scanNextTranslator(children, index);
-
- if (index >= 0) {
- /*
- * If found, (1) update the result, (2) update the index so we can skip
- * ahead on the next invocation (3) escape the VARIABLE_TRANSLATORS
- * processing
- */
- result = children[index];
- break;
- }
- /*
- * DO NOT BREAK we will default to VARIABLE TRANSLATORS MODE so we must reset
- * the startHint appropriately
- */
- startHint = -1;
- }
-
- case VARIABLE_TRANSLATORS_MODE :
- hints[MODE_HINT_INDX] = VARIABLE_TRANSLATORS_MODE;
- /*
- * Reset the index.
- */
- index = startHint;
- children = translator.getVariableChildren(target, version);
- if (children != null && children.length > 0 && startHint < children.length) {
- index = translatorFilter.scanNextTranslator(children, index);
- result = (index >= 0) ? children[index] : null;
- }
- }
-
- hints[NEXT_START_HINT_INDX] = (result == null && children != null) ? children.length : index;
-
- return result;
- }
-
-
- public abstract int scanNextTranslator(Translator[] children, int start);
-
- /**
- * @return
- */
- public int getIndex() {
- return index;
- }
-
- /**
- * @return
- */
- public int getMode() {
- return mode;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
deleted file mode 100644
index a2d843e..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorPath.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-
-public class TranslatorPath {
- protected Translator[] mapInfoPath;
-
- /**
- * Construct with an array of Translator that specifies the path to follow from an object to
- * another object
- */
- public TranslatorPath(Translator[] path) {
- mapInfoPath = path;
- }
-
- public List findObjects(EObject startObject) {
- Object cur = startObject;
- for (int i = 0; i < mapInfoPath.length; i++) {
- Translator curMap = mapInfoPath[i];
- if (cur instanceof EObject) {
- EStructuralFeature curAttr = curMap.getFeature();
- if (curAttr == Translator.CONTAINER_FEATURE) {
- curAttr = ((EObject) cur).eContainmentFeature();
- cur = ((EObject) cur).eContainer();
- } else if (curAttr == Translator.ROOT_FEATURE) {
- cur = ((TranslatorResource) startObject.eResource()).getRootObject();
- } else {
- cur = ((EObject) cur).eGet(curAttr);
- }
- if (curMap.isMultiValued()) {
- return (List) cur;
- }
- }
- }
- return null;
- }
-
- public Object findObject(EObject startObject, Object matchValue) {
- List objects = findObjects(startObject);
- if (objects == null)
- return null;
- return findObject(objects, getLastMap(), matchValue);
- }
-
- private Object findObject(List objectList, Translator map, Object matchValue) {
- for (Iterator iter = objectList.iterator(); iter.hasNext();) {
- EObject mofObject = (EObject) iter.next();
- Object curMatchValue = mofObject.eGet(map.getFeature());
- if (matchValue.equals(curMatchValue))
- return mofObject;
- }
- return null;
- }
-
- public Translator getLastMap() {
- return mapInfoPath[mapInfoPath.length - 1];
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer sb = new StringBuffer();
- String cn = getClass().getName();
- int i = cn.lastIndexOf('.');
- cn = cn.substring(++i, cn.length());
- sb.append(cn);
- sb.append('(');
- sb.append(mapInfoPath[0]);
- for (int j = 1; j < mapInfoPath.length; j++) {
- sb.append('\n');
- sb.append(mapInfoPath[j]);
- }
- sb.append(')');
- return sb.toString();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
deleted file mode 100644
index 32c9c47..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.xml.sax.EntityResolver;
-
-public interface TranslatorResource extends ReferencedResource {
- /*
- * must make a subclass because the constructor for EStructuralFeature is protected
- */
- static class DocTypeFeature extends EStructuralFeatureImpl {
- protected DocTypeFeature() {
- super();
- }
- }
-
-
- EStructuralFeature DOC_TYPE_FEATURE = new DocTypeFeature();
-
- /**
- * The public id of the XML document, if specified.
- */
- String getPublicId();
-
- /**
- * Return the first element in the EList.
- */
- EObject getRootObject();
-
- /**
- * The system id of the XML document, if specified.
- */
- String getSystemId();
-
- /**
- * Sets the public id and system id of the XML document.
- */
- void setDoctypeValues(String publicId, String systemId);
-
- /**
- * Sets the default public/system ids if necessary
- */
- void setDefaults();
-
- /**
- * Returns the name that will be in the document type header of the serialized xml file
- */
- String getDoctype();
-
- /**
- * Returns the XML version of this document
- */
- String getXMLVersion();
-
- Translator getRootTranslator();
-
- /**
- * Entity resolver that can be used when using standard parsers to read the resource
- */
- EntityResolver getEntityResolver();
-
- boolean usesDTD();
-
- public int getVersionID();
-
- void setVersionID(int i);
-
- Renderer getRenderer();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
deleted file mode 100644
index 20a450b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-
-public abstract class TranslatorResourceFactory extends ReferencedXMIFactoryImpl implements RendererFactory.Listener {
-
- protected RendererFactory rendererFactory;
- private boolean listeningForUpdates = false;
-
- /**
- * Constructor for TranslatorResourceFactory.
- */
- public TranslatorResourceFactory(RendererFactory aRendererFactory, boolean listeningForUpdates) {
- super();
- rendererFactory = aRendererFactory;
- setListeningForUpdates(listeningForUpdates);
- }
-
- /**
- * Constructor for TranslatorResourceFactory.
- */
- public TranslatorResourceFactory(RendererFactory aRendererFactory) {
- this(aRendererFactory, true);
- }
-
- public void setListeningForUpdates(boolean shouldBeListeningForUpdates) {
-
- if (this.listeningForUpdates ^ shouldBeListeningForUpdates) {
- if (!shouldBeListeningForUpdates)
- RendererFactory.NotificationEngine.removeListener(this);
- else
- RendererFactory.NotificationEngine.addListener(this);
-
- this.listeningForUpdates = shouldBeListeningForUpdates;
- }
- }
-
- public boolean isListeningForUpdates() {
- return this.listeningForUpdates;
- }
-
- public Resource doCreateResource(URI uri) {
- Renderer aRenderer = rendererFactory.createRenderer();
- return createResource(uri, aRenderer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.RendererFactory.Listener#updateRendererFactory(com.ibm.etools.emf2xml.RendererFactory)
- */
- public void updateRendererFactory(RendererFactory newRendererFactory) {
- //System.out.println("Updating renderer factory");
- rendererFactory = newRendererFactory;
- }
-
- protected abstract TranslatorResource createResource(URI uri, Renderer aRenderer);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
deleted file mode 100644
index 83d9700..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-import org.xml.sax.EntityResolver;
-
-public abstract class TranslatorResourceImpl extends ReferencedXMIResourceImpl implements TranslatorResource {
- static final public EStructuralFeature ID_FEATURE = EcorePackage.eINSTANCE.getEClass_EIDAttribute();
- protected static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
- protected static final String DEFAULT_VERSION = "1.0"; //$NON-NLS-1$
- protected Renderer renderer;
- /**
- * The public Id to use at the head of the document.
- */
- protected String publicId;
- /**
- * The system Id to use at the head of the document.
- */
- protected String systemId;
- protected String xmlVersion;
- // Default the resources to J2EE 1.4
- protected int versionID;
-
- /**
- * @deprecated since 4/29/2003 - used for compatibility Subclasses should be using the Renderers
- * and translator framework
- */
- public TranslatorResourceImpl() {
- super();
- }
-
- /**
- * @deprecated since 4/29/2003 - used for compatibility Subclasses should be using the Renderers
- * and translator framework
- */
- public TranslatorResourceImpl(URI uri) {
- super(uri);
- }
-
- public TranslatorResourceImpl(URI uri, Renderer aRenderer) {
- super(uri);
- setRenderer(aRenderer);
- versionID = getDefaultVersionID();
- }
-
- public TranslatorResourceImpl(Renderer aRenderer) {
- super();
- setRenderer(aRenderer);
- }
-
- public java.lang.String getEncoding() {
- if (super.getEncoding() == null)
- setEncoding(DEFAULT_ENCODING);
- return super.getEncoding();
- }
-
- public String getPublicId() {
- return publicId;
- }
-
- /**
- * Return the first element in the EList.
- */
- public EObject getRootObject() {
- if (contents == null || contents.isEmpty())
- return null;
- return (EObject) getContents().get(0);
- }
-
- public String getSystemId() {
- return systemId;
- }
-
- public void setDoctypeValues(String aPublicId, String aSystemId) {
- boolean changed = !(StringUtil.stringsEqual(publicId, aPublicId) && StringUtil.stringsEqual(systemId, aSystemId));
- publicId = aPublicId;
- systemId = aSystemId;
- if (changed) {
- eNotify(new NotificationImpl(Notification.SET, null, null) {
- public Object getFeature() {
- return DOC_TYPE_FEATURE;
- }
-
- public Object getNotifier() {
- return TranslatorResourceImpl.this;
- }
- });
- }
- }
-
- /**
- * Returns the xmlVersion.
- *
- * @return String
- */
- public String getXMLVersion() {
- if (xmlVersion == null)
- xmlVersion = DEFAULT_VERSION;
- return xmlVersion;
- }
-
- /**
- * Sets the xmlVersion.
- *
- * @param xmlVersion
- * The xmlVersion to set
- */
- public void setXMLVersion(String xmlVersion) {
- this.xmlVersion = xmlVersion;
- }
-
- protected void basicDoLoad(InputStream inputStream, Map options) throws IOException {
- //long start = System.currentTimeMillis();
- boolean isTrackingMods = isTrackingModification();
- try {
- if (isTrackingMods)
- setTrackingModification(false);
- renderer.doLoad(inputStream, options);
- } finally {
- if (isTrackingMods)
- setTrackingModification(true);
- }
- //long end = System.currentTimeMillis();
- //recordTime("Load", start, end);
- }
-
- public void save(Map options) throws IOException {
- if (renderer.useStreamsForIO()) {
- super.save(options);
- } else {
- doSave(null, options);
- notifySaved();
- }
- }
-
- /**
- * @see com.ibm.etools.xmi.helpers.CompatibilityXMIResourceImpl#doSave(OutputStream, Map)
- */
- public void doSave(OutputStream outputStream, Map options) throws IOException {
- //long start = System.currentTimeMillis();
- renderer.doSave(outputStream, options);
- setModified(false);
- //long end = System.currentTimeMillis();
- //recordTime("Save", start, end);
- }
-
- // private void recordTime(String type, long start, long end) {
- // System.out.println(renderer.getClass().getName() + "\t" + type + "\t" + (end - start) +
- // "\t\t\tms" + "\t" + (( this.getVersionID()) / 10.0) + "\t" + this); //$NON-NLS-1$
- // //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- // }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#doUnload()
- */
- protected void doUnload() {
- renderer.preUnload();
- super.doUnload();
- }
-
- public String toString() {
- return getClass().getName() + getURI().toString();
- }
-
- /**
- * Returns the renderer.
- *
- * @return Renderer
- */
- public Renderer getRenderer() {
- return renderer;
- }
-
- /**
- * Sets the renderer.
- *
- * @param renderer
- * The renderer to set
- */
- public void setRenderer(Renderer renderer) {
- this.renderer = renderer;
- if (renderer.getResource() != this)
- renderer.setResource(this);
- }
-
- /**
- * For compatibility of old subtype resources, returns the super implementation
- *
- * @return
- */
- protected EList primGetContents() {
- return super.getContents();
- }
-
- public EList getContents() {
- if (contents == null) {
- initializeContents();
- }
- return contents;
- }
-
- protected void initializeContents() {
- contents = new ResourceImpl.ContentsEList() {
- public boolean add(Object object) {
- renderer.prepareToAddContents();
- return super.add(object);
- }
-
- public boolean addAll(Collection collection) {
- renderer.prepareToAddContents();
- return super.addAll(collection);
- }
- };
- }
-
- public void setDefaults() {
- if (systemId != null && publicId != null)
- return;
- String pubId = publicId == null ? getDefaultPublicId() : publicId;
- String sysId = systemId == null ? getDefaultSystemId() : systemId;
- setDoctypeValues(pubId, sysId);
- }
-
- /**
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#init()
- */
- protected void init() {
- super.init();
- setEncoding(DEFAULT_ENCODING);
- }
-
- /**
- * Returns null by default; subclasses can override
- *
- * @see com.ibm.etools.emf2xml.TranslatorResource#createEntityResolver()
- */
- public EntityResolver getEntityResolver() {
- return null;
- }
-
- protected abstract String getDefaultPublicId();
-
- protected abstract String getDefaultSystemId();
-
- protected abstract int getDefaultVersionID();
-
- /**
- * @return
- */
- public int getVersionID() {
- return versionID;
- }
-
- /**
- * @param i
- */
- public void setVersionID(int i) {
- versionID = i;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.TranslatorResource#usesDTD()
- */
- public boolean usesDTD() {
- return getPublicId() != null && getSystemId() != null;
- }
-
- /**
- * Overridden to notify when the ID gets set; need this to push it into the resource
- *
- * @see org.eclipse.emf.ecore.xmi.XMLResource#setID(EObject, String)
- */
- public void setID(EObject eObject, String id) {
- String oldId = getID(eObject);
- super.setID(eObject, id);
- eObject.eNotify(new ENotificationImpl((InternalEObject) eObject, Notification.SET, ID_FEATURE, oldId, id));
- }
-
- /**
- * This method indicates whether or not the extent associated with the resource has been
- * modified since the last time it was loaded or saved.
- *
- * @return boolean
- */
- public boolean isModified() {
- return super.isModified() || renderer.isModified();
- }
-
- /*
- * Overriden to give the renderer a hook
- *
- * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#accessForWrite()
- */
- public void accessForWrite() {
- renderer.accessForWrite();
- super.accessForWrite();
- }
-
- /*
- * Overriden to give the renderer a hook
- *
- * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#accessForRead()
- */
- public void accessForRead() {
- renderer.accessForRead();
- super.accessForRead();
- }
-
- public void releaseFromRead() {
- renderer.releaseFromRead();
- super.releaseFromRead();
- }
-
- public void releaseFromWrite() {
- renderer.releaseFromWrite();
- super.releaseFromWrite();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf.workbench.ReferencedXMIResourceImpl#preDelete()
- */
- public void preDelete() {
- super.preDelete();
- renderer.preDelete();
- }
-
- public boolean isShared() {
- return super.isShared() || renderer.isShared();
- }
-
- public boolean isSharedForWrite() {
- return super.isSharedForWrite() || renderer.isSharedForWrite();
- }
-
- public void load(Map options) throws IOException {
- if (renderer.useStreamsForIO()) {
- super.load(options);
- } else if (!isLoaded) {
- load(null, options);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
deleted file mode 100644
index 43c5864..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/UnsupportedFeature.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 13, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class UnsupportedFeature extends EAttributeImpl {
- /**
- * This is used to capture features that are no longer supported
- */
- public static boolean isUnsupported(EClass anEClass, String featureName) {
-
- if (featureName.equals("isZeroParams") && anEClass.getName().equals("MethodElement")) //$NON-NLS-1$ //$NON-NLS-2$
- return true;
- return false;
- }
-
- public UnsupportedFeature() {
- super();
- // TODO Auto-generated constructor stub
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/VariableTranslatorFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/VariableTranslatorFactory.java
deleted file mode 100644
index 1a4eef9..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/VariableTranslatorFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-
-/**
- * @author schacher
- */
-public interface VariableTranslatorFactory {
- /** Returns whether a Translator should be created for the given DOM name */
- boolean accepts(String domName);
-
- /** Returns whether a Translator should be created for the given feature */
- boolean accepts(Notification notif);
-
- Translator create(Notification notif);
-
- /** Creates a new Translator for the DOM name */
- Translator create(String domName);
-
- /** Creates variable translators for an EMF object to be rendered */
- List create(Notifier target);
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/XMLEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/XMLEncoderDecoder.java
deleted file mode 100644
index 9f46962..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/XMLEncoderDecoder.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 20, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.resource;
-
-/**
- * @author mdelder
- *
- */
-public class XMLEncoderDecoder {
-
- /**
- *
- */
- public XMLEncoderDecoder() {
- super();
- }
-
- /**
- * Identifies the last printable character in the Unicode range that is supported by the
- * encoding used with this serializer. For 8-bit encodings this will be either 0x7E or 0xFF. For
- * 16-bit encodings this will be 0xFFFF. Characters that are not printable will be escaped using
- * character references.
- */
- private int _lastPrintable = 0x7E;
-
- protected static XMLEncoderDecoder _singleton;
-
-
- /**
- * Returns a decoded version of the value.
- */
- public String decode(String value) {
- // NOT_IMPLEMENTED
- return value;
- }
-
-
- /**
- * Escapes a string so it may be printed as text content or attribute value. Non printable
- * characters are escaped using character references. Where the format specifies a deault entity
- * reference, that reference is used (e.g. <tt>&lt;</tt>).
- *
- * @param source
- * The string to escape
- */
- public char[] encode(char[] value) {
- boolean unmodified = true;
- StringBuffer sbuf = new StringBuffer(value.length);
- String charRef = null;
- char ch;
- for (int i = 0; i < value.length; ++i) {
- ch = value[i];
- // If there is a suitable entity reference for this
- // character, print it. The list of available entity
- // references is almost but not identical between
- // XML and HTML.
- charRef = getEntityRef(ch);
- if (charRef != null) {
- sbuf.append('&');
- sbuf.append(charRef);
- sbuf.append(';');
- unmodified = false;
- } else if ((ch >= ' ' && ch <= _lastPrintable && ch != 0xF7) || ch == '\n' || ch == '\r' || ch == '\t') {
- // If the character is not printable, print as character
- // reference.
- // Non printables are below ASCII space but not tab or line
- // terminator, ASCII delete, or above a certain Unicode
- // threshold.
- sbuf.append(ch);
- } else {
- sbuf.append("&#");//$NON-NLS-1$
- sbuf.append(Integer.toString(ch));
- sbuf.append(';');
- unmodified = false;
- }
- }
- if (unmodified)
- return value;
- char[] result = new char[sbuf.length()];
- sbuf.getChars(0, sbuf.length(), result, 0);
- return result;
- }
-
- /**
- * Escapes a string so it may be printed as text content or attribute value. Non printable
- * characters are escaped using character references. Where the format specifies a deault entity
- * reference, that reference is used (e.g. <tt>&lt;</tt>).
- *
- * @param source
- * The string to escape
- */
- public String encode(String value) {
- StringBuffer sbuf = new StringBuffer(value.length());
- String charRef = null;
- char ch;
- for (int i = 0; i < value.length(); ++i) {
- ch = value.charAt(i);
- // If there is a suitable entity reference for this
- // character, print it. The list of available entity
- // references is almost but not identical between
- // XML and HTML.
- charRef = getEntityRef(ch);
- if (charRef != null) {
- sbuf.append('&');
- sbuf.append(charRef);
- sbuf.append(';');
- } else if ((ch >= ' ' && ch <= _lastPrintable && ch != 0xF7) || ch == '\n' || ch == '\r' || ch == '\t') {
- // If the character is not printable, print as character
- // reference.
- // Non printables are below ASCII space but not tab or line
- // terminator, ASCII delete, or above a certain Unicode
- // threshold.
- sbuf.append(ch);
- } else {
- sbuf.append("&#");//$NON-NLS-1$
- sbuf.append(Integer.toString(ch));
- sbuf.append(';');
- }
- }
- return sbuf.toString();
- }
-
- public static String escape(String value) {
- if (_singleton == null) {
- _singleton = new XMLEncoderDecoder();
- }
- return _singleton.encode(value);
- }
-
- /**
- * Returns the suitable entity reference for this character value, or null if no such entity
- * exists. Calling this method with <tt>'&'</tt> will return <tt>"&amp;"</tt>.
- *
- * @param ch
- * Character value
- * @return Character entity name, or null
- */
- protected String getEntityRef(char ch) {
- // Encode special XML characters into the equivalent character
- // references.
- // These five are defined by default for all XML documents.
- switch (ch) {
- case '<' :
- return "lt";//$NON-NLS-1$
- case '>' :
- return "gt";//$NON-NLS-1$
- case '"' :
- return "quot";//$NON-NLS-1$
- case '\'' :
- return "apos";//$NON-NLS-1$
- case '&' :
- return "amp";//$NON-NLS-1$
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
deleted file mode 100644
index 847b88d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ArrayUtil.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-public class ArrayUtil {
-
- public static Object[] concat(Object[] array1, Object[] array2) {
- Class componentType = null;
- if (array1.getClass().getComponentType() == array2.getClass().getComponentType())
- componentType = array1.getClass().getComponentType();
- else
- componentType = Object.class;
-
- return concat(array1, array2, componentType);
- }
-
- public static Object[] concat(Object[] array1, Object[] array2, Class componentType) {
- Object[] result = (Object[]) java.lang.reflect.Array.newInstance(componentType, array1.length + array2.length);
- System.arraycopy(array1, 0, result, 0, array1.length);
- System.arraycopy(array2, 0, result, array1.length, array2.length);
- return result;
- }
-
- public static Object[] concatAll(java.util.List arrays, Class componentType) {
- int resultLength = 0;
- for (int i = 0; i < arrays.size(); i++) {
- resultLength += ((Object[]) arrays.get(i)).length;
- }
- Object[] result = (Object[]) java.lang.reflect.Array.newInstance(componentType, resultLength);
- int pos = 0;
- for (int i = 0; i < arrays.size(); i++) {
- Object[] array = (Object[]) arrays.get(i);
- System.arraycopy(array, 0, result, pos, array.length);
- pos += array.length;
- }
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
deleted file mode 100644
index bc9cf9d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Assert.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks in code. The predicate
- * methods all test a condition and throw some type of unchecked exception if the condition does not
- * hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are thrown when something is
- * misbehaving. Assertion failures are invariably unspecified behavior; consequently, clients should
- * never rely on these being thrown (and certainly should not being catching them specifically).
- * </p>
- */
-// This class was, originally, copied directly from com.ibm.itp.common.
-// It was copied to our own package just to minimize minor dependencies
-// on other packages and internal APIs.
-public final class Assert {
- /* This class is not intended to be instantiated. */
-
- private Assert() {
- }
-
- /**
- * Asserts that an argument is legal. If the given boolean is not <code>true</code>, an
- * <code>IllegalArgumentException</code> is thrown.
- *
- * @param expression
- * the outcode of the check
- * @return <code>true</code> if the check passes (does not return if the check fails)
- * @exception IllegalArgumentException
- * if the legality test failed
- */
- public static boolean isLegal(boolean expression) {
- return isLegal(expression, "");//$NON-NLS-1$
- }
-
- /**
- * Asserts that an argument is legal. If the given boolean is not <code>true</code>, an
- * <code>IllegalArgumentException</code> is thrown. The given message is included in that
- * exception, to aid debugging.
- *
- * @param expression
- * the outcode of the check
- * @param message
- * the message to include in the exception
- * @return <code>true</code> if the check passes (does not return if the check fails)
- * @exception IllegalArgumentException
- * if the legality test failed
- */
- public static boolean isLegal(boolean expression, String message) {
- if (!expression)
- throw new IllegalArgumentException();
- return expression;
- }
-
- /**
- * Asserts that the given object is not <code>null</code>. If this is not the case, some kind
- * of unchecked exception is thrown.
- *
- * @param object
- * the value to test
- * @exception IllegalArgumentException
- * if the object is <code>null</code>
- */
- public static void isNotNull(Object object) {
- isNotNull(object, "");//$NON-NLS-1$
- }
-
- /**
- * Asserts that the given object is not <code>null</code>. If this is not the case, some kind
- * of unchecked exception is thrown. The given message is included in that exception, to aid
- * debugging.
- *
- * @param object
- * the value to test
- * @param message
- * the message to include in the exception
- * @exception IllegalArgumentException
- * if the object is <code>null</code>
- */
- public static void isNotNull(Object object, String message) {
- if (object == null) {
- Logger.getLogger().logError("null_argument: " + message);//$NON-NLS-1$
- throw new AssertionFailedException();
- }
- }
-
- /**
- * Asserts that the given boolean is <code>true</code>. If this is not the case, some kind of
- * unchecked exception is thrown.
- *
- * @param expression
- * the outcode of the check
- * @return <code>true</code> if the check passes (does not return if the check fails)
- */
- public static boolean isTrue(boolean expression) {
- return isTrue(expression, "");//$NON-NLS-1$
- }
-
- /**
- * Asserts that the given boolean is <code>true</code>. If this is not the case, some kind of
- * unchecked exception is thrown. The given message is included in that exception, to aid
- * debugging.
- *
- * @param expression
- * the outcode of the check
- * @param message
- * the message to include in the exception
- * @return <code>true</code> if the check passes (does not return if the check fails)
- */
- public static boolean isTrue(boolean expression, String message) {
- if (!expression) {
- Logger.getLogger().logError("assertion failed: " + message);//$NON-NLS-1$
- throw new AssertionFailedException();
- }
- return expression;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
deleted file mode 100644
index 044c60d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/AssertionFailedException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown by some of the methods in
- * <code>Assert</code>.
- * <p>
- * This class is not declared public to prevent some misuses; programs that catch or otherwise
- * depend on assertion failures are susceptible to unexpected breakage when assertions in the code
- * are added or removed.
- * </p>
- */
-// This class was, originally, copied directly from com.ibm.itp.common.
-// It was copied to our own package just to minimize minor dependencies
-// on other packages and internal APIs.
-class AssertionFailedException extends RuntimeException {
- /**
- * Constructs a new exception.
- */
- public AssertionFailedException() {
- }
-
- /**
- * Constructs a new exception with the given message.
- */
- public AssertionFailedException(String detail) {
- super(detail);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Association.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Association.java
deleted file mode 100644
index 485d0c3..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Association.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * Insert the type's description here. Creation date: (12/17/2000 7:38:15 PM)
- *
- * @author: Administrator
- */
-public class Association {
- protected Object key;
- protected Object value;
-
- /**
- * Association constructor comment.
- */
- public Association(Object aKey, Object aValue) {
- setKey(aKey);
- setValue(aValue);
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
- *
- * @return java.lang.Object
- */
- public java.lang.Object getKey() {
- return key;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
- *
- * @return java.lang.Object
- */
- public java.lang.Object getValue() {
- return value;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
- *
- * @param newKey
- * java.lang.Object
- */
- public void setKey(java.lang.Object newKey) {
- key = newKey;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/17/2000 7:38:48 PM)
- *
- * @param newValue
- * java.lang.Object
- */
- public void setValue(java.lang.Object newValue) {
- value = newValue;
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
deleted file mode 100644
index b243775..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CloneablePublic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 22, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * Interface that exposes the clone method, for objects that need to generically copy other
- * cloneable objects
- */
-public interface CloneablePublic extends Cloneable {
- Object clone();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMLoadOptions.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMLoadOptions.java
deleted file mode 100644
index 05ae8a5..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMLoadOptions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 12, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * @author schacher
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DOMLoadOptions {
- protected boolean validate;
- protected boolean allowJavaEncodings;
- protected boolean expandEntityRefererences;
-
- /**
- * @return boolean
- */
- public boolean isAllowJavaEncodings() {
- return allowJavaEncodings;
- }
-
- /**
- * @return boolean
- */
- public boolean isExpandEntityRefererences() {
- return expandEntityRefererences;
- }
-
- /**
- * @return boolean
- */
- public boolean isValidate() {
- return validate;
- }
-
- /**
- * Sets the allowJavaEncodings.
- *
- * @param allowJavaEncodings
- * The allowJavaEncodings to set
- */
- public void setAllowJavaEncodings(boolean allowJavaEncodings) {
- this.allowJavaEncodings = allowJavaEncodings;
- }
-
- /**
- * Sets the expandEntityRefererences.
- *
- * @param expandEntityRefererences
- * The expandEntityRefererences to set
- */
- public void setExpandEntityRefererences(boolean expandEntityRefererences) {
- this.expandEntityRefererences = expandEntityRefererences;
- }
-
- /**
- * Sets the validate.
- *
- * @param validate
- * The validate to set
- */
- public void setValidate(boolean validate) {
- this.validate = validate;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
deleted file mode 100644
index b04fe7a..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
+++ /dev/null
@@ -1,681 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * A class containing common dom manipulation and search functions.
- */
-public class DOMUtilities {
- // Handy Constants
- public static final String INDENT_STRING = "\t"; //$NON-NLS-1$
- public static final String NEWLINE_STRING = System.getProperty("line.separator"); //$NON-NLS-1$
- //Hack to be removed when the DOM apis change such that there is an easier
- //way to fluff up and set the doctype
- private static final String DUMMY_ENTITY_STRING = "dummy"; //$NON-NLS-1$
- private static final String DUMMY_ENTITY_NODE_STRING = "<dummy/>"; //$NON-NLS-1$
- private static DocumentBuilder defaultDocumentBuilder;
- private static EntityResolver defaultEntityResolver;
-
- /**
- * Returns an iterator that iterates over the sub nodes of a path.
- */
- static public Iterator createPathIterator(String path) {
- String tPath = path.startsWith("/") ? path.substring(1) : path; //$NON-NLS-1$
- if (tPath.length() == 0)
- tPath = null;
- final String aPath = tPath;
-
- return new Iterator() {
- int prevIndex = 0;
- int curIndex = 0;
- String pathString = aPath;
-
- public boolean hasNext() {
- return pathString != null && prevIndex != -1;
- }
-
- public Object next() {
- curIndex = pathString.indexOf('/', prevIndex);
- String nodeString = null;
- if (curIndex != -1)
- nodeString = pathString.substring(prevIndex, curIndex++);
- else
- nodeString = pathString.substring(prevIndex);
- prevIndex = curIndex;
- return nodeString;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
- }
-
- /**
- * Get the text for the passed in node.
- */
- static public String getChildText(Node node) {
- Text textNode = getChildTextNode(node);
- if (textNode != null)
- return textNode.getData();
- return null;
- }
-
- /**
- * Get the text for the passed in node.
- */
- static public Text getChildTextNode(Node node) {
- Node textNode = node.getFirstChild();
- while (textNode != null && DOMUtilities.isTextNode(textNode)) {
- if (!isWhitespace(textNode))
- return (Text) textNode;
- textNode = textNode.getNextSibling();
- }
- return null;
- }
-
- /**
- * Return a string representing the current indentation of the node.
- */
- static public String getIndentString(Node node) {
- Revisit.toDo();
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Get the last non-text child of a node.
- *
- * @return org.w3c.dom.Node The last non-text child node of
- * @node.
- * @param node
- * org.w3c.dom.Node The node
- */
- public static Node getLastNodeChild(Node node) {
- if (node == null)
- return null;
- Node child = node.getLastChild();
- while (child != null && child.getNodeType() == Node.TEXT_NODE)
- child = child.getPreviousSibling();
- return child;
- }
-
- /**
- * Get the next non-text sibling after a node.
- *
- * @return org.w3c.dom.Node The first non-text sibling node after
- * @node. If there is no next non-text sibling, null is returned.
- * @param node
- * org.w3c.dom.Node The node
- */
- public static Node getNextNodeSibling(Node node) {
- Node sibling = node.getNextSibling();
- while (sibling != null && sibling.getNodeType() != Node.ELEMENT_NODE)
- sibling = sibling.getNextSibling();
- return sibling;
- }
-
- /**
- * Get the first child Node with the specified name
- */
- static public Node getNodeChild(Node node, String nodeName) {
- Node child = null;
- NodeList children = node.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node n = children.item(i);
- if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals(nodeName)) {
- child = n;
- break;
- }
- }
- return child;
- }
-
- /**
- * Traverses the path passed in <pathName>. The path is a string in the form
- * 'node1/node2/node3'. This method starts at node.
- */
- static public Node getNodeChildForPath(Node parent, String pathName) {
-
- Node curNode = parent;
- Iterator i = DOMUtilities.createPathIterator(pathName);
- while (i.hasNext()) {
- String child = (String) i.next();
- curNode = DOMUtilities.getNodeChild(curNode, child);
- if (curNode == null)
- return null;
- }
- return curNode;
- }
-
- /**
- * Get the Node children with the specified names
- */
- static public List getNodeChildren(Node node, String[] nodeNames) {
- NodeList childNodes = node.getChildNodes();
- ArrayList results = new ArrayList();
-
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node n = childNodes.item(i);
- if (n.getNodeType() == Node.ELEMENT_NODE) {
- boolean found = false;
- for (int j = 0; j < nodeNames.length; j++) {
- if (nodeNames[j].equals(n.getNodeName())) {
- found = true;
- break;
- }
- }
- if (found)
- results.add(n);
- }
- }
- return results;
- }
-
- /**
- * Get the Node children with the specified name
- */
- static public List getNodeChildren(Node node, String nodeName) {
- NodeList childNodes = node.getChildNodes();
- ArrayList results = new ArrayList();
-
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node n = childNodes.item(i);
- if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals(nodeName))
- results.add(n);
- }
- return results;
- }
-
- /**
- * Get the first non-text sibling before a node.
- *
- * @return org.w3c.dom.Node The first non-text sibling node before
- * @node. If there is no previous non-text sibling, null is returned.
- * @param node
- * org.w3c.dom.Node The node
- */
- public static Node getPreviousNodeSibling(Node node) {
- if (node == null)
- return null;
- Node sibling = node.getPreviousSibling();
- while (sibling != null && DOMUtilities.isTextNode(sibling))
- sibling = sibling.getPreviousSibling();
- return sibling;
- }
-
- /**
- * Get the first text node before a node.
- *
- * @return org.w3c.dom.Node The first text node before
- * @node. Null if no such node exist.
- * @param node
- * org.w3c.dom.Node The node
- */
- public static Text getPreviousText(Node node) {
- Text sibling = getPreviousTextSibling(node);
-
- if (sibling == null && node.getParentNode() != null)
- sibling = getPreviousText(node.getParentNode());
-
- return sibling;
- }
-
- /**
- * Get the first text sibling before a node.
- *
- * @return org.w3c.dom.Node The first text sibling node before
- * @node. If there is no previous text sibling, null is returned.
- * @param node
- * org.w3c.dom.Node The node
- */
- public static Text getPreviousTextSibling(Node node) {
- Assert.isNotNull(node);
-
- Node sibling = node.getPreviousSibling();
- Node lastText = null;
- while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE) {
- lastText = sibling;
- sibling = sibling.getPreviousSibling();
- }
- return (Text) lastText;
- }
-
- /**
- * Get the first text sibling before a node.
- *
- * @return org.w3c.dom.Node The first text sibling node before
- * @node. If there is no previous text sibling, null is returned.
- * @param node
- * org.w3c.dom.Node The node
- */
- public static String getTrailingWhitespace(Text node) {
- Assert.isNotNull(node);
-
- String text = node.getData();
- if (text.length() == 0)
- return ""; //$NON-NLS-1$
-
- int i = text.length() - 1;
- for (; i >= 0; i--) {
- if (!Character.isWhitespace(text.charAt(i))) {
- break;
- }
- }
-
- return text.substring(++i);
- }
-
- /**
- * Inserts <newNode>into <parent>after <refNode>. If <refNode>is null then the node is inserted
- * to the beginning of the parent's child nodes.
- *
- * @param parent
- * org.w3c.dom.Node
- * @param newNode
- * org.w3c.dom.Node
- * @param refNode
- * org.w3c.dom.Node
- */
- public static void insertAfterNode(Node parent, Node newNode, Node refNode) {
- Node insertBeforeNode = null;
- if (refNode != null) {
- insertBeforeNode = refNode.getNextSibling();
- }
- if (refNode == null)
- insertBeforeNode(parent, newNode, parent.getFirstChild());
- else
- insertBeforeNode(parent, newNode, insertBeforeNode);
- }
-
- /**
- * Insert a <newNode>into <parent>before <refNode>. This utility method is used to ensure that
- * the insertion does not result in two adjacent text nodes. The DOM model does not handle
- * adjacent text nodes. They must be joined together.
- *
- * @param newNode
- * org.w3c.dom.Node
- * @param newNode
- * org.w3c.dom.Node
- * @param refNode
- * org.w3c.dom.Node
- */
- static public void insertBeforeNode(Node parent, Node newNode, Node refNode) {
- if (newNode.getNodeType() == Node.TEXT_NODE) {
- Text textNewNode = (Text) newNode;
-
- // If the insert before node is text, join it with the new node.
- if (refNode != null && refNode.getNodeType() == Node.TEXT_NODE) {
- Text textRefNode = (Text) refNode;
- textRefNode.setData(textNewNode.getData() + textRefNode.getData());
- return;
- }
- // If the node we are inserting after is text,
- // join it with the new node.
- Node insertAfterNode = (refNode == null) ? parent.getLastChild() : refNode.getPreviousSibling();
- if (insertAfterNode != null && insertAfterNode.getNodeType() == Node.TEXT_NODE) {
- Text textInsertAfterNode = (Text) insertAfterNode;
- textInsertAfterNode.setData(textInsertAfterNode.getData() + textNewNode.getData());
- return;
- }
- }
- // There is no text node to join to, simple insert the node.
- parent.insertBefore(newNode, refNode);
- }
-
- /**
- * Insert a <newNode>into <parent>before <refNode>. This method will also insert the node before
- * any whitespace nodes that appear in the tree before <refNode>. This method will also ensure
- * that the insertion does not result in two adjacent text nodes. The DOM model does not handle
- * adjacent text nodes. They must be joined together.
- *
- * @param newNode
- * org.w3c.dom.Node
- * @param newNode
- * org.w3c.dom.Node
- * @param refNode
- * org.w3c.dom.Node
- */
- static public void insertBeforeNodeAndWhitespace(Node parent, Node newNode, Node refNode) {
- Node curNode = (refNode == null) ? parent.getLastChild() : refNode.getPreviousSibling();
- Node lastNode = refNode;
-
- while (curNode != null && (DOMUtilities.isWhitespace(curNode) || DOMUtilities.isComment(curNode))) {
- lastNode = curNode;
- curNode = curNode.getPreviousSibling();
- }
-
- insertBeforeNode(parent, newNode, lastNode);
- }
-
- /**
- * Return whether the node is a text node.
- *
- * @return boolean Answer true if the node is a text node, false otherwise.
- * @param node
- * org.w3c.dom.Node The node to check
- */
- static public boolean isTextNode(Node node) {
- Assert.isNotNull(node);
- return (node.getNodeType() == Node.TEXT_NODE) || (node.getNodeType() == Node.CDATA_SECTION_NODE);
- }
-
- /**
- * Return whether the node is entirely comment or not.
- *
- * @return boolean Answer true if the node is whitespace, false otherwise.
- * @param node
- * org.w3c.dom.Node The node to check
- */
- static public boolean isComment(Node node) {
- Assert.isNotNull(node);
-
- return node.getNodeType() == Node.COMMENT_NODE;
- }
-
- /**
- * Return whether the node is entirely whitepace or not.
- *
- * @return boolean Answer true if the node is whitespace, false otherwise.
- * @param node
- * org.w3c.dom.Node The node to check
- */
- static public boolean isWhitespace(Node node) {
- Assert.isNotNull(node);
-
- if (node.getNodeType() != Node.TEXT_NODE)
- return false;
-
- Text textNode = (Text) node;
- String text = textNode.getData();
- if (text == null)
- return false;
-
- for (int i = 0; i < text.length(); i++) {
- if (!Character.isWhitespace(text.charAt(i))) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Remove all the children of <node>
- */
- static public void removeAllChildren(Node node) {
- NodeList list = node.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- node.removeChild(list.item(i));
- }
- }
-
- // traverses the DOM starting at the specified node and returns a list
- // of nodes matching the search string
-
- static public ArrayList getAllNodes(Node node, String nodeName) {
- ArrayList nodeList = new ArrayList();
-
- String[] nodeNames = {nodeName};
- findAllNodes(node, nodeNames, nodeList);
-
- return nodeList;
- }
-
- // traverses the DOM starting at the specified node and returns a list
- // of nodes matching the search strings
-
- static public ArrayList getAllNodes(Node node, String[] nodeNamesArray) {
- ArrayList nodeList = new ArrayList();
- findAllNodes(node, nodeNamesArray, nodeList);
-
- return nodeList;
- }
-
- // recursive helper for getAllNodes
- static private void findAllNodes(Node node, String[] nodeNames, ArrayList results) {
-
- NodeList nodes = node.getChildNodes();
- if (nodes != null) {
- for (int i = 0; i < nodes.getLength(); i++) {
- for (int j = 0; j < nodeNames.length; j++) {
- if (nodes.item(i).getNodeName().equals(nodeNames[j])) {
- results.add(nodes.item(i));
- }
- }
- findAllNodes(nodes.item(i), nodeNames, results);
- }
- }
- }
-
- /**
- * Returns the system defined JAXP document builder
- */
- static public DocumentBuilder newDefaultDocumentBuilder(DOMLoadOptions options) throws ParserConfigurationException {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setValidating(options.isValidate());
- dbf.setNamespaceAware(options.isValidate());
- /*
- * Causes errors in IBM JDK try { dbf.setAttribute(Renderer.JAXP_SCHEMA_LANGUAGE,
- * Renwderer.W3C_XML_SCHEMA); } catch (IllegalArgumentException x) { }
- */
- try {
- dbf.setAttribute("http://apache.org/xml/features/allow-java-encodings", new Boolean(options.isAllowJavaEncodings())); //$NON-NLS-1$
- } catch (IllegalArgumentException ignore) {
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/allow-java-encodings\"."); //$NON-NLS-1$
- }
- try {
- dbf.setAttribute("http://apache.org/xml/features/validation/schema", new Boolean(options.isValidate())); //$NON-NLS-1$
- } catch (IllegalArgumentException ignore) {
- dbf.setValidating(false);
- Logger.getLogger().log("Warning: Parser does not support \"http://apache.org/xml/features/validation/schema\". Validation will be disabled."); //$NON-NLS-1$
- }
- dbf.setExpandEntityReferences(options.isExpandEntityRefererences());
- DocumentBuilder result = dbf.newDocumentBuilder();
- result.setErrorHandler(new ErrorHandler() {
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
- */
- public void error(SAXParseException arg0) throws SAXException {
- throw arg0;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
- */
- public void fatalError(SAXParseException arg0) throws SAXException {
- throw arg0;
- }
-
- public void warning(SAXParseException arg0) throws SAXException {
- Logger.getLogger().logWarning(arg0);
- }
-
- });
- return result;
- }
-
- /**
- * Creates a stub document, where the DocumentType is defined by the parameters.
- */
- static public Document createNewDocument(String doctype, String publicId, String systemId) throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilder builder = getDefaultDocumentBuilder();
- InputStream in = createHeaderInputStream(doctype, publicId, systemId, true);
- Document result = builder.parse(in);
- removeDummyEntity(result);
- removeExtraneousComments(result);
- return result;
- }
-
- public static Document loadDocument(InputStream in, DOMLoadOptions options, EntityResolver resolver) throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilder builder = DOMUtilities.newDefaultDocumentBuilder(options);
- builder.setEntityResolver(resolver);
- Document result = builder.parse(in);
- removeExtraneousComments(result);
- return result;
- }
-
- /**
- * At the time of this writing, the DOM Level 2 APIs are not advanced enough for setting the
- * document type; so the only parser independent way of accomplishing this is by creating a
- * stream and parsing it.
- */
- public static InputStream createHeaderInputStream(String doctype, String publicId, String systemId) {
- return createHeaderInputStream(doctype, publicId, systemId, false);
- }
-
-
- private static InputStream createHeaderInputStream(String doctype, String publicId, String systemId, boolean includeDummy) {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- PrintWriter writer = new PrintWriter(outputStream);
- writeHeader(writer, doctype, publicId, systemId);
- if (includeDummy)
- addDummyEntity(writer);
- writer.flush();
- writer.close();
- return new java.io.ByteArrayInputStream(outputStream.toByteArray());
- }
-
- private static void writeHeader(PrintWriter writer, String doctype, String publicId, String systemId) {
- writer.write("<?xml version=\""); //$NON-NLS-1$
- writer.write("1.0"); //$NON-NLS-1$
- writer.write("\" encoding=\""); //$NON-NLS-1$
- writer.write("UTF-8"); //$NON-NLS-1$
- writer.write("\"?>"); //$NON-NLS-1$
- writer.println();
-
- if (doctype != null) {
- writer.write("<!DOCTYPE "); //$NON-NLS-1$
- writer.write(doctype);
- writer.write(" PUBLIC \""); //$NON-NLS-1$
- writer.write(publicId);
- writer.write("\" \""); //$NON-NLS-1$
- writer.write(systemId);
- writer.write("\">"); //$NON-NLS-1$
- writer.println();
- }
- }
-
- private static void addDummyEntity(PrintWriter writer) {
- Revisit.revisit();
- writer.println(DUMMY_ENTITY_NODE_STRING);
- //Major hack because we can not parse an empty document
- }
-
- private static void removeDummyEntity(Document doc) {
- doc.removeChild(getNodeChild(doc, DUMMY_ENTITY_STRING));
- }
-
- private static void removeExtraneousComments(Document doc) {
- //another major hack because of a bug in XML4J 4.0.7 that added all the
- //comments from the dtd to the document. Can be removed after we move up
- //Xerces levels
- Node aNode = doc.getFirstChild();
- while (aNode != null) {
- Node nextNode = aNode.getNextSibling();
- if (aNode.getNodeType() == Node.COMMENT_NODE)
- doc.removeChild(aNode);
- aNode = nextNode;
- }
- }
-
- /**
- * For performance, cache a static instance of the JAXP registered document builder. Validation
- * is disabled for this instance. If you need validation, use
- * {@link #newDefaultDocumentBuilder(boolean, boolean, boolean)}
- *
- * @return DocumentBuilder
- * @throws ParserConfigurationException
- * if JAXP is not configured correctly
- */
- public static DocumentBuilder getDefaultDocumentBuilder() throws ParserConfigurationException {
- if (defaultDocumentBuilder == null) {
- DOMLoadOptions opts = new DOMLoadOptions();
- opts.setAllowJavaEncodings(true);
- opts.setExpandEntityRefererences(true);
- opts.setValidate(false);
- defaultDocumentBuilder = newDefaultDocumentBuilder(opts);
- defaultDocumentBuilder.setEntityResolver(defaultEntityResolver);
- defaultDocumentBuilder.setErrorHandler(new ErrorHandler() {
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
- */
- public void error(SAXParseException exception) throws SAXException {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
- */
- public void fatalError(SAXParseException exception) throws SAXException {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
- */
- public void warning(SAXParseException exception) throws SAXException {
-
- }
-
- });
- }
-
- return defaultDocumentBuilder;
- }
-
- /**
- * @return
- */
- public static EntityResolver getDefaultEntityResolver() {
- return defaultEntityResolver;
- }
-
- /**
- * @param resolver
- */
- public static void setDefaultEntityResolver(EntityResolver resolver) {
- defaultEntityResolver = resolver;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
deleted file mode 100644
index dda0593..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * Insert the type's description here. Creation date: (5/10/2001 2:49:49 PM)
- *
- * @author: Administrator
- */
-public class DefaultFeatureValueConverter implements FeatureValueConverter {
- private static final String FAILED_CONVERSION_PATTERN = WFTUtilsResourceHandler.getString("Failed_to_convert_{0}_to_{_ERROR_"); //$NON-NLS-1$ = "Failed to convert {0} to {1}."
-
- /**
- * DefaultFeatureValueConverter constructor comment.
- */
- public DefaultFeatureValueConverter() {
- super();
- }
-
- /**
- * Convert
- *
- * @aValue to a Boolean.
- */
- protected Object convertToBoolean(Object aValue) {
- if (aValue instanceof String)
- return Boolean.valueOf((String) aValue);
- if (aValue instanceof Boolean)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Boolean_UI_")); //$NON-NLS-1$ = "Boolean"
- }
-
- /**
- * Convert
- *
- * @aValue to a Byte.
- */
- protected Object convertToByte(Object aValue) {
- if (aValue instanceof String)
- return Byte.valueOf((String) aValue);
- if (aValue instanceof Byte)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Byte_UI_")); //$NON-NLS-1$ = "Byte"
- }
-
- /**
- * Convert
- *
- * @aValue to a Character.
- */
- protected Object convertToCharacter(Object aValue) {
- if (aValue instanceof String && ((String) aValue).length() == 1)
- return new Character(((String) aValue).charAt(0));
- if (aValue instanceof Character)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Character_UI_")); //$NON-NLS-1$ = "Character"
- }
-
- /**
- * Convert
- *
- * @aValue to a Double.
- */
- protected Object convertToDouble(Object aValue) {
- if (aValue instanceof String) {
- try {
- return Double.valueOf((String) aValue);
- } catch (NumberFormatException e) {
- return defaultDouble();
- }
- }
- if (aValue instanceof Double)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Double_UI_")); //$NON-NLS-1$ = "Double"
- }
-
- /**
- * Convert
- *
- * @aValue to a EEnumLiteral.
- */
- protected Object convertToEnum(Object aValue, EStructuralFeature aFeature) {
- EEnumLiteral literal = null;
- EEnum eenum = (EEnum) aFeature.getEType();
- if (aValue instanceof String)
- literal = eenum.getEEnumLiteral((String) aValue);
- else if (aValue instanceof Integer)
- literal = eenum.getEEnumLiteral(((Integer) aValue).intValue());
- else if (aValue instanceof EEnumLiteral)
- literal = (EEnumLiteral) aValue;
-
- if (literal == null)
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Enumeration_UI_")); //$NON-NLS-1$ = "Enumeration"
-
- return literal.getInstance();
- }
-
- /**
- * Convert
- *
- * @aValue to a Float.
- */
- protected Object convertToFloat(Object aValue) {
- if (aValue instanceof String) {
- try {
- return Float.valueOf((String) aValue);
- } catch (NumberFormatException e) {
- return defaultFloat();
- }
- }
- if (aValue instanceof Float)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Float_UI_")); //$NON-NLS-1$ = "Float"
- }
-
- /**
- * Convert
- *
- * @aValue to a Integer.
- */
- protected Object convertToInteger(Object aValue) {
- if (aValue instanceof String) {
- try {
- return Integer.valueOf((String) aValue);
- } catch (NumberFormatException e) {
- return defaultInteger();
- }
- }
- if (aValue instanceof Integer)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Integer_UI_")); //$NON-NLS-1$ = "Integer"
- }
-
- /**
- * Convert
- *
- * @aValue to a Java Object.
- */
- protected Object convertToJavaObject(Object aValue) {
- return aValue;
- }
-
- /**
- * Convert
- *
- * @aValue to a Long.
- */
- protected Object convertToLong(Object aValue) {
- if (aValue instanceof String) {
- try {
- return Long.valueOf((String) aValue);
- } catch (NumberFormatException e) {
- return defaultLong();
- }
- }
- if (aValue instanceof Long)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Long_UI_")); //$NON-NLS-1$ = "Long"
- }
-
- /**
- * Convert
- *
- * @aValue to a MofObject.
- */
- protected Object convertToMofObject(Object aValue) {
- if (aValue instanceof EObject)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("MofObject_UI_")); //$NON-NLS-1$ = "MofObject"
- }
-
- /**
- * Convert
- *
- * @aValue to a Short.
- */
- protected Object convertToShort(Object aValue) {
- if (aValue instanceof String) {
- try {
- return Short.valueOf((String) aValue);
- } catch (NumberFormatException e) {
- return defaultShort();
- }
- }
- if (aValue instanceof Short)
- return aValue;
- return failedToConvert(aValue, WFTUtilsResourceHandler.getString("Short_UI_")); //$NON-NLS-1$ = "Short"
- }
-
- /**
- * Convert
- *
- * @aValue to a String.
- */
- protected Object convertToString(Object aValue) {
- return aValue.toString();
- }
-
- /**
- * Convert
- *
- * @aValue to the type of
- * @anAttribute.
- */
- protected Object convertValue(Object aValue, org.eclipse.emf.ecore.EAttribute anAttribute) {
-
- EClassifier meta = anAttribute.getEType();
- if (meta.eClass() == EcorePackage.eINSTANCE.getEEnum())
- return convertToEnum(aValue, anAttribute);
- switch (meta.getClassifierID()) {
- case EcorePackage.ESTRING :
- return convertToString(aValue);
- case EcorePackage.EBOOLEAN_OBJECT :
- case EcorePackage.EBOOLEAN :
- return convertToBoolean(aValue);
- case EcorePackage.EINTEGER_OBJECT :
- case EcorePackage.EINT :
- return convertToInteger(aValue);
- case EcorePackage.EFLOAT_OBJECT :
- case EcorePackage.EFLOAT :
- return convertToFloat(aValue);
- case EcorePackage.ECHARACTER_OBJECT :
- case EcorePackage.ECHAR :
- return convertToCharacter(aValue);
- case EcorePackage.ELONG_OBJECT :
- case EcorePackage.ELONG :
- return convertToLong(aValue);
- case EcorePackage.EBYTE_OBJECT :
- case EcorePackage.EBYTE :
- return convertToByte(aValue);
- case EcorePackage.EDOUBLE_OBJECT :
- case EcorePackage.EDOUBLE :
- return convertToDouble(aValue);
- case EcorePackage.ESHORT_OBJECT :
- case EcorePackage.ESHORT :
- return convertToShort(aValue);
- // case EcorePackage.EENUM:
- // return convertToEnum(aValue, anAttribute);
- case EcorePackage.EOBJECT :
- return convertToMofObject(aValue);
- case EcorePackage.EJAVA_OBJECT :
- return convertToJavaObject(aValue);
- }
- return aValue;
- }
-
- /**
- * Convert
- *
- * @aValue to the type of
- * @aFeature.
- */
- public Object convertValue(Object aValue, org.eclipse.emf.ecore.EStructuralFeature aFeature) {
- if (aValue == null || aFeature == null || !(aFeature instanceof EAttribute))
- return aValue; //nothing to convert
- return convertValue(aValue, (EAttribute) aFeature);
- }
-
- /**
- * Return the default Double value.
- */
- protected Double defaultDouble() {
- return null;
- }
-
- /**
- * Return the default Float value.
- */
- protected Float defaultFloat() {
- return null;
- }
-
- /**
- * Return the default Integer value.
- */
- protected Integer defaultInteger() {
- return null;
- }
-
- /**
- * Return the default Long value.
- */
- protected Long defaultLong() {
- return null;
- }
-
- /**
- * Return the default Short value.
- */
- protected Short defaultShort() {
- return null;
- }
-
- /**
- * Failed to convert
- *
- * @aValue.
- */
- protected Object failedToConvert(Object aValue, String aString) {
- String errorString = java.text.MessageFormat.format(FAILED_CONVERSION_PATTERN, new String[]{aValue.toString(), aString});
- throw new FeatureValueConversionException(errorString);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DeferredReferenceUtilityAction.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DeferredReferenceUtilityAction.java
deleted file mode 100644
index ec1f668..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DeferredReferenceUtilityAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * Insert the type's description here. Creation date: (12/15/2000 5:25:43 PM)
- *
- * @author: Administrator
- */
-public abstract class DeferredReferenceUtilityAction {
- protected EReference reference;
- protected Object referenceValue;
- protected EObject copyContainer;
- protected String idSuffix;
-
- /**
- * DeferredCopy constructor comment.
- */
- public DeferredReferenceUtilityAction(EReference aReference, Object aValue, String aSuffix, EObject aCopyContainer) {
- reference = aReference;
- referenceValue = aValue;
- idSuffix = aSuffix;
- copyContainer = aCopyContainer;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/16/2000 9:32:28 AM)
- *
- * @return org.eclipse.emf.ecore.EObject
- */
- public org.eclipse.emf.ecore.EObject getCopyContainer() {
- return copyContainer;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/15/2000 5:34:56 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getIdSuffix() {
- return idSuffix;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/15/2000 5:34:56 PM)
- *
- * @return org.eclipse.emf.ecore.EReference
- */
- public org.eclipse.emf.ecore.EReference getReference() {
- return reference;
- }
-
- /**
- * Insert the method's description here. Creation date: (12/16/2000 9:32:28 AM)
- *
- * @return java.lang.Object
- */
- public Object getReferenceValue() {
- return referenceValue;
- }
-
- public abstract void performAction();
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoder.java
deleted file mode 100644
index 69fe06b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * Represents an interface to an object which can encode and decode values. This typically involves
- * cryptography algorithms. This interface, along with the supplied adapters provide an extension
- * mechanism for pluggable crytography that can be used when storing and retrieving attribute
- * values, and is used prevalently for encoding and decoding password values of mof objects.
- */
-public interface EncoderDecoder {
- /**
- * Returns a decoded version of the value.
- */
- public String decode(String value);
-
- /**
- * Returns an encoded version of the value.
- */
- public String encode(String value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
deleted file mode 100644
index 788b300..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * An adapter for EncoderDecoder implementations
- */
-public abstract class EncoderDecoderAdapter implements EncoderDecoder {
-
- /**
- * EncoderDecoderAdapter constructor comment.
- */
- public EncoderDecoderAdapter() {
- super();
- }
-
- /**
- * Returns a decoded version of the value.
- */
- public abstract String decode(String value);
-
- /**
- * Returns an encoded version of the value.
- */
- public abstract String encode(String value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderRegistry.java
deleted file mode 100644
index d615112..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderRegistry.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Registry for storing and retrieving value decoders and encoders. Usage Example:
- *
- * <pre>
- *
- *
- * // Use the standard WebSphere password value encoder/decoder.
- * EncoderDecoderRegistry.getDefaultRegistry().setDefaultEncoderDecoder(new com.ibm.ejs.security.util.WASEncoderDecoder());
- * // Begin tracking changes...
- * WriteBackHelper.begin();
- * // Load a resource which may have un-encoded values...
- * // Note: The WCCM will attempt to detect un-encoded values. If unencoded values
- * // are found, the value will be encoded, and the resource will be added to the
- * // WriteBackHelper.
- * Resource res = resourceSet.load("myResource");
- * // Ensure that any changes due to encoding are written back out.
- * WriteBackHelper.end();
- * </pre>
- */
-public class EncoderDecoderRegistry {
- protected static EncoderDecoderRegistry _defaultInstance;
- public static final EncoderDecoder INITIAL_DEFAULT_ENCODER = PassthruEncoderDecoder.INSTANCE;
- protected Map encoders = new HashMap();
- protected Object defaultEncoderKey;
-
- /**
- * EncoderDecoderRegistry constructor comment.
- */
- public EncoderDecoderRegistry() {
- super();
- initializeDefaultEncoders();
- }
-
- /**
- * Insert the method's description here. Creation date: (2/2/2001 12:43:31 AM)
- */
- public void addEncoderDecoder(EncoderDecoder encoderDecoder) {
- encoders.put(encoderDecoder.getClass().getName(), encoderDecoder);
- if (defaultEncoderKey == null)
- defaultEncoderKey = encoderDecoder.getClass().getName();
- }
-
- /**
- * Returns an encoder/decoder by key.
- */
- public EncoderDecoder getDefaultEncoderDecoder() {
- if (defaultEncoderKey == null)
- return null;
- return (EncoderDecoder) encoders.get(defaultEncoderKey);
- }
-
- /**
- * Returns the default registry to use for retrieving value encoders and decoders
- */
- public static EncoderDecoderRegistry getDefaultRegistry() {
- if (_defaultInstance == null) {
- _defaultInstance = new EncoderDecoderRegistry();
- }
- return _defaultInstance;
- }
-
- /**
- * Returns an encoder/decoder by key.
- */
- public EncoderDecoder getEncoderDecoder(Object key) {
- return (EncoderDecoder) encoders.get(key);
- }
-
- /**
- * Initializes a standard set of encoder/decoders.
- */
- public void initializeDefaultEncoders() {
- setDefaultEncoderDecoder(INITIAL_DEFAULT_ENCODER);
- addEncoderDecoder(new XMLValueEncoderDecoder());
- }
-
- /**
- * Removes the encoder/decoder with the specified key.
- */
- public void removeEncoderDecoder(Object key) {
- if (encoders.containsKey(key)) {
- encoders.remove(key);
- }
- }
-
- /**
- * Returns an encoder/decoder by key.
- */
- public void setDefaultEncoderDecoder(EncoderDecoder encoder) {
- defaultEncoderKey = encoder.getClass().getName();
- if (!encoders.containsKey(defaultEncoderKey)) {
- addEncoderDecoder(encoder);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
deleted file mode 100644
index 0525a1f..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConversionException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-public class FeatureValueConversionException extends RuntimeException {
-
- /**
- * Constructor for FeatureValueConversionException.
- */
- public FeatureValueConversionException() {
- super();
- }
-
- /**
- * Constructor for FeatureValueConversionException.
- *
- * @param s
- */
- public FeatureValueConversionException(String s) {
- super(s);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConverter.java
deleted file mode 100644
index 786a687..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/FeatureValueConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Insert the type's description here. Creation date: (5/10/2001 2:46:54 PM)
- *
- * @author: Administrator
- */
-public interface FeatureValueConverter {
- static final FeatureValueConverter DEFAULT = new DefaultFeatureValueConverter();
-
- /**
- * Convert
- *
- * @aValue to the type of
- * @aFeature.
- */
- Object convertValue(Object aValue, EStructuralFeature aFeature);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
deleted file mode 100644
index 5ff513b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordCipherException extends UserException {
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
deleted file mode 100644
index 2e16808..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordDecodingException extends UserException {
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
deleted file mode 100644
index dd882d7..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordEncodingException extends UserException {
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
deleted file mode 100644
index d7d114c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code
- * and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-
-public class IsLoadingDetector implements Adapter {
- public static final IsLoadingDetector INSTANCE = new IsLoadingDetector();
-
- private IsLoadingDetector() {
- }
-
- public void notifyChanged(Notification notification) {
- }
-
- public Notifier getTarget() {
- return null;
- }
-
- public void setTarget(Notifier newTarget) {
- }
-
- public boolean isAdapterForType(Object type) {
- return type == this;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
deleted file mode 100644
index b1be5f6..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingProxyAdapter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.emf.utilities.ExtendedEcoreUtil;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class IsLoadingProxyAdapter extends AdapterImpl {
- private Resource resource;
- private Adapter targetAdapter;
- private EObject targetObject;
-
- public IsLoadingProxyAdapter(Adapter aTargetAdapter, EObject aTargetObject) {
- targetAdapter = aTargetAdapter;
- targetObject = aTargetObject;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification msg) {
- if (resource != null) {
- //listen for the remove of the loading adapter
- if (msg.getFeatureID(null) == Resource.RESOURCE__IS_LOADED && msg.getEventType() == Notification.SET) {
- removeProxySupport();
- reset();
- }
- } else if (cacheResource()) {
- targetAdapter.notifyChanged(msg);
- reset();
- }
- }
-
- /**
- * Cache the resource variable and return true if we removed the proxy support.
- */
- private boolean cacheResource() {
- if (getTarget() != null) {
- EObject eObj = (EObject) getTarget();
- resource = eObj.eResource();
- if (resource != null) {
- eObj.eAdapters().remove(this);
- if (ExtendedEcoreUtil.isLoading(resource))
- resource.eAdapters().add(this);
- else {
- targetObject.eAdapters().add(targetAdapter);
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- *
- */
- private void removeProxySupport() {
- getTarget().eAdapters().remove(this);
- targetObject.eAdapters().add(targetAdapter);
- }
-
- private void reset() {
- resource = null;
- targetAdapter = null;
- targetObject = null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
deleted file mode 100644
index 1a4a736..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Namespace.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Aug 20, 2003
- *
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-public class Namespace {
-
- protected String prefix;
- protected String nsURI;
-
-
- public Namespace(String prefix, String uri) {
- this.prefix = prefix;
- this.nsURI = uri;
- }
-
- public String getNsURI() {
- return nsURI;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setNsURI(String string) {
- nsURI = string;
- }
-
- public void setPrefix(String string) {
- prefix = string;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
deleted file mode 100644
index e684059..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PassthruEncoderDecoder.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * A passthru EncoderDecoder implementation
- */
-public class PassthruEncoderDecoder extends EncoderDecoderAdapter implements EncoderDecoder {
- public static final PassthruEncoderDecoder INSTANCE = new PassthruEncoderDecoder();
- public static final String KEY = PassthruEncoderDecoder.class.getName();
-
- /**
- * EncoderDecoderAdapter constructor comment.
- */
- private PassthruEncoderDecoder() {
- super();
- }
-
- /**
- * Returns a decoded version of the value.
- */
- public String decode(String value) {
- return value;
- }
-
- /**
- * Returns an encoded version of the value.
- */
- public String encode(String value) {
- return value;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
deleted file mode 100644
index f237158..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordCipherUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-public class PasswordCipherUtil {
- private static final String DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS[] = {"xor"}; //$NON-NLS-1$
- private static String _supported_crypto_algorithms[];
-
- public PasswordCipherUtil() {
- }
-
- public static byte[] decipher(byte abyte0[], String s) throws InvalidPasswordCipherException, UnsupportedCryptoAlgorithmException {
- if (s == null)
- throw new UnsupportedCryptoAlgorithmException();
- byte abyte1[] = null;
- if (s.equalsIgnoreCase(DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS[0]))
- abyte1 = xor(abyte0);
- else
- throw new UnsupportedCryptoAlgorithmException();
-
- if (abyte1 == null)
- throw new InvalidPasswordCipherException();
-
- return abyte1;
- }
-
- public static byte[] encipher(byte abyte0[], String s) throws InvalidPasswordCipherException, UnsupportedCryptoAlgorithmException {
- if (s == null)
- throw new UnsupportedCryptoAlgorithmException();
- byte abyte1[] = null;
- if (s.equalsIgnoreCase(DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS[0]))
- abyte1 = xor(abyte0);
- else
- throw new UnsupportedCryptoAlgorithmException();
-
- if (abyte1 == null)
- throw new InvalidPasswordCipherException();
- return abyte1;
- }
-
- public static String[] getSupportedCryptoAlgorithms() {
- return _supported_crypto_algorithms;
- }
-
- private static byte[] xor(byte abyte0[]) {
- byte abyte1[] = null;
- if (abyte0 != null) {
- abyte1 = new byte[abyte0.length];
- for (int i = 0; i < abyte0.length; i++)
- abyte1[i] = (byte) (0x5f ^ abyte0[i]);
- }
- return abyte1;
- }
-
- static {
- _supported_crypto_algorithms = null;
- if (_supported_crypto_algorithms == null)
- _supported_crypto_algorithms = DEFAULT_SUPPORTED_CRYPTO_ALGORITHMS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
deleted file mode 100644
index 2c82ced..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordEncoderDecoder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-public class PasswordEncoderDecoder extends EncoderDecoderAdapter implements EncoderDecoder {
- public static final String KEY = "password-security-coder"; //$NON-NLS-1$
-
- public PasswordEncoderDecoder() {
- }
-
- public String decode(String s) {
- return PasswordUtil.passwordDecode(s);
- }
-
- public String encode(String s) {
- return PasswordUtil.passwordEncode(s);
- }
-
- public Object getKey() {
- return KEY;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
deleted file mode 100644
index 012f2c2..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordUtil.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.io.UnsupportedEncodingException;
-
-public class PasswordUtil {
- public static final String STRING_CONVERSION_CODE = "UTF8"; //$NON-NLS-1$
- public static final String EMPTY_STRING = ""; //$NON-NLS-1$
- public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
- public static final String DEFAULT_CRYPTO_ALGORITHM;
- private static final String SUPPORTED_CRYPTO_ALGORITHMS[];
- private static final byte BASE64_ENCODE_MAP[];
- private static final byte BASE64_DECODE_MAP[];
-
- public PasswordUtil() {
- }
-
- public static String decode(String s) throws InvalidPasswordDecodingException, UnsupportedCryptoAlgorithmException {
- if (s == null)
- throw new InvalidPasswordDecodingException();
- String s1 = getCryptoAlgorithm(s);
- if (s1 == null)
- throw new InvalidPasswordDecodingException();
-
- if (!isValidCryptoAlgorithm(s1))
- throw new UnsupportedCryptoAlgorithmException();
-
- String s2 = decode_password(removeCryptoAlgorithmTag(s), s1);
- if (s2 == null)
- throw new InvalidPasswordDecodingException();
- return s2;
- }
-
- public static String encode(String s) throws InvalidPasswordEncodingException, UnsupportedCryptoAlgorithmException {
- return encode(s, DEFAULT_CRYPTO_ALGORITHM);
- }
-
- public static String encode(String s, String s1) throws InvalidPasswordEncodingException, UnsupportedCryptoAlgorithmException {
- if (!isValidCryptoAlgorithm(s1))
- throw new UnsupportedCryptoAlgorithmException();
- if (s == null)
- throw new InvalidPasswordEncodingException();
-
- if (getCryptoAlgorithm(s) != null)
- throw new InvalidPasswordEncodingException();
-
- String s2 = encode_password(s.trim(), s1.trim());
- if (s2 == null)
- throw new InvalidPasswordEncodingException();
- return s2;
- }
-
- public static String getCryptoAlgorithm(String s) {
- String s1 = null;
- if (s != null) {
- s = s.trim();
- if (s.length() >= 2) {
- int i = s.indexOf("{"); //$NON-NLS-1$
- if (i == 0) {
- int j = s.indexOf("}", ++i); //$NON-NLS-1$
- if (j > 0)
- if (i < j)
- s1 = s.substring(i, j).trim();
- else
- s1 = EMPTY_STRING;
- }
- }
- }
- return s1;
- }
-
- public static String getCryptoAlgorithmTag(String s) {
- String s1 = null;
- String s2 = getCryptoAlgorithm(s);
- if (s2 != null) {
- StringBuffer stringbuffer = new StringBuffer("{"); //$NON-NLS-1$
- if (s2.length() > 0)
- stringbuffer.append(s2);
- stringbuffer.append("}"); //$NON-NLS-1$
- s1 = stringbuffer.toString();
- }
- return s1;
- }
-
- public static boolean isValidCryptoAlgorithm(String s) {
- if (s != null) {
- s = s.trim();
- if (s.length() == 0)
- return true;
- for (int i = 0; i < SUPPORTED_CRYPTO_ALGORITHMS.length; i++)
- if (s.equalsIgnoreCase(SUPPORTED_CRYPTO_ALGORITHMS[i]))
- return true;
- }
- return false;
- }
-
- public static boolean isValidCryptoAlgorithmTag(String s) {
- return isValidCryptoAlgorithm(getCryptoAlgorithm(s));
- }
-
- public static String passwordDecode(String s) {
- if (s == null)
- return null;
- String s1 = getCryptoAlgorithm(s);
- if (s1 == null)
- return s;
- if (!isValidCryptoAlgorithm(s1))
- return null;
- return decode_password(removeCryptoAlgorithmTag(s), s1);
- }
-
- public static String passwordEncode(String s) {
- return passwordEncode(s, DEFAULT_CRYPTO_ALGORITHM);
- }
-
- public static String passwordEncode(String s, String s1) {
- if (!isValidCryptoAlgorithm(s1))
- return null;
- if (s == null)
- return null;
- String s2 = getCryptoAlgorithm(s);
- if (s2 != null) {
- if (s2.equalsIgnoreCase(s1.trim()))
- return s.trim();
- return null;
- }
- return encode_password(s.trim(), s1.trim());
- }
-
- public static String removeCryptoAlgorithmTag(String s) {
- String s1 = null;
- if (s != null) {
- s = s.trim();
- if (s.length() >= 2) {
- int i = s.indexOf("{"); //$NON-NLS-1$
- if (i == 0) {
- int j = s.indexOf("}", ++i); //$NON-NLS-1$
- if (j > 0)
- if (++j < s.length())
- s1 = s.substring(j).trim();
- else
- s1 = EMPTY_STRING;
- }
- }
- }
- return s1;
- }
-
- private static byte[] convert_to_bytes(String s) {
- byte abyte0[] = null;
- if (s != null)
- if (s.length() == 0)
- abyte0 = EMPTY_BYTE_ARRAY;
- else
- try {
- abyte0 = s.getBytes(STRING_CONVERSION_CODE);
- } catch (UnsupportedEncodingException unsupportedencodingexception) {
- abyte0 = null;
- }
- return abyte0;
- }
-
- private static String convert_to_string(byte abyte0[]) {
- String s = null;
- if (abyte0 != null)
- if (abyte0.length == 0)
- s = EMPTY_STRING;
- else
- try {
- s = new String(abyte0, STRING_CONVERSION_CODE);
- } catch (UnsupportedEncodingException unsupportedencodingexception) {
- s = null;
- }
- return s;
- }
-
- private static byte[] convert_viewable_to_bytes(String s) {
- byte abyte0[] = null;
- if (s != null)
- if (s.length() == 0)
- abyte0 = EMPTY_BYTE_ARRAY;
- else
- try {
- abyte0 = base64Decode(convert_to_bytes(s));
- } catch (Exception exception) {
- abyte0 = null;
- }
- return abyte0;
- }
-
- private static byte[] base64Decode(byte abyte0[]) {
- int i;
- for (i = abyte0.length; abyte0[--i] == 61;);
- byte abyte1[] = new byte[(i + 1) - abyte0.length / 4];
- for (int j = 0; j < abyte0.length; j++)
- abyte0[j] = BASE64_DECODE_MAP[abyte0[j]];
- int k = abyte1.length - 2;
- int l = 0;
- int i1;
- for (i1 = 0; l < k; i1 += 4) {
- abyte1[l] = (byte) (abyte0[i1] << 2 & 0xff | abyte0[i1 + 1] >>> 4 & 0x3);
- abyte1[l + 1] = (byte) (abyte0[i1 + 1] << 4 & 0xff | abyte0[i1 + 2] >>> 2 & 0xf);
- abyte1[l + 2] = (byte) (abyte0[i1 + 2] << 6 & 0xff | abyte0[i1 + 3] & 0x3f);
- l += 3;
- }
- if (l < abyte1.length) {
- abyte1[l++] = (byte) (abyte0[i1] << 2 & 0xff | abyte0[i1 + 1] >>> 4 & 0x3);
- if (l < abyte1.length)
- abyte1[l] = (byte) (abyte0[i1 + 1] << 4 & 0xff | abyte0[i1 + 2] >>> 2 & 0xf);
- }
- return abyte1;
- }
-
- private static String convert_viewable_to_string(byte abyte0[]) {
- String s = null;
- if (abyte0 != null)
- if (abyte0.length == 0)
- s = EMPTY_STRING;
- else
- try {
- s = convert_to_string(base64Encode(abyte0));
- } catch (Exception exception) {
- s = null;
- }
- return s;
- }
-
- private static byte[] base64Encode(byte abyte0[]) {
- byte abyte1[] = new byte[((abyte0.length + 2) / 3) * 4];
- int i = 0;
- int j = 0;
- for (; i < abyte0.length - 2; i += 3) {
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i] >>> 2 & 0x3f];
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 1] >>> 4 & 0xf | abyte0[i] << 4 & 0x3f];
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 2] >>> 6 & 0x3 | abyte0[i + 1] << 2 & 0x3f];
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 2] & 0x3f];
- }
- if (i < abyte0.length) {
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i] >>> 2 & 0x3f];
- if (i < abyte0.length - 1) {
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 1] >>> 4 & 0xf | abyte0[i] << 4 & 0x3f];
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i + 1] << 2 & 0x3f];
- } else {
- abyte1[j++] = BASE64_ENCODE_MAP[abyte0[i] << 4 & 0x3f];
- }
- }
- for (; j < abyte1.length; j++)
- abyte1[j] = 61;
- return abyte1;
- }
-
- private static String decode_password(String s, String s1) {
- StringBuffer stringbuffer = new StringBuffer();
- if (s1.length() == 0) {
- stringbuffer.append(s);
- } else {
- String s2 = null;
- if (s.length() > 0) {
- byte abyte0[] = convert_viewable_to_bytes(s);
- if (abyte0 == null)
- return null;
- if (abyte0.length > 0) {
- byte abyte1[] = null;
- try {
- abyte1 = PasswordCipherUtil.decipher(abyte0, s1);
- } catch (InvalidPasswordCipherException invalidpasswordcipherexception) {
- return null;
- } catch (UnsupportedCryptoAlgorithmException unsupportedcryptoalgorithmexception) {
- return null;
- }
- if (abyte1 != null && abyte1.length > 0)
- s2 = convert_to_string(abyte1);
- }
- }
- if (s2 != null && s2.length() > 0)
- stringbuffer.append(s2);
- }
- return stringbuffer.toString();
- }
-
- private static String encode_password(String s, String s1) {
- StringBuffer stringbuffer = new StringBuffer("{"); //$NON-NLS-1$
- if (s1.length() == 0) {
- stringbuffer.append("}").append(s); //$NON-NLS-1$
- } else {
- stringbuffer.append(s1).append("}"); //$NON-NLS-1$
- String s2 = null;
- if (s.length() > 0) {
- byte abyte0[] = convert_to_bytes(s);
- if (abyte0.length > 0) {
- byte abyte1[] = null;
- try {
- abyte1 = PasswordCipherUtil.encipher(abyte0, s1);
- } catch (InvalidPasswordCipherException invalidpasswordcipherexception) {
- return null;
- } catch (UnsupportedCryptoAlgorithmException unsupportedcryptoalgorithmexception) {
- return null;
- }
- if (abyte1 != null && abyte1.length > 0) {
- s2 = convert_viewable_to_string(abyte1);
- if (s2 == null)
- return null;
- }
- }
- }
- if (s2 != null && s2.length() > 0)
- stringbuffer.append(s2);
- }
- return stringbuffer.toString();
- }
-
- static {
- SUPPORTED_CRYPTO_ALGORITHMS = PasswordCipherUtil.getSupportedCryptoAlgorithms();
- DEFAULT_CRYPTO_ALGORITHM = SUPPORTED_CRYPTO_ALGORITHMS[0];
- byte abyte0[] = {65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47};
- BASE64_ENCODE_MAP = abyte0;
- BASE64_DECODE_MAP = new byte[128];
- for (int i = 0; i < BASE64_DECODE_MAP.length; i++)
- BASE64_DECODE_MAP[i] = -1;
- for (int j = 0; j < BASE64_ENCODE_MAP.length; j++)
- BASE64_DECODE_MAP[BASE64_ENCODE_MAP[j]] = (byte) j;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
deleted file mode 100644
index f56cfc1..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PleaseMigrateYourCodeError.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class PleaseMigrateYourCodeError extends Error {
-
- //TODO Delete me
- public PleaseMigrateYourCodeError() {
- super(WFTUtilsResourceHandler.getString("PleaseMigrateYourCodeError_ERROR_0")); //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
deleted file mode 100644
index 34ff643..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ResourceDependencyRegister.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-
-public class ResourceDependencyRegister {
- protected static Map GLOBAL_DEPENDENCIES = new HashMap();
- private static String RESOURCE_DEPENDENCY_TYPE = "ResourceDependencyAdapter"; //$NON-NLS-1$
- protected Map localDependencies = new HashMap();
-
- class ResourceDependencyAdapter extends AdapterImpl {
- Resource dependentResource;
-
- ResourceDependencyAdapter(Resource aDependentResource) {
- dependentResource = aDependentResource;
- dependentResource.eAdapters().add(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return RESOURCE_DEPENDENCY_TYPE.equals(type);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification msg) {
- //Listen for unloads and removes
- switch (msg.getFeatureID(null)) {
- case Resource.RESOURCE__IS_LOADED :
- if (msg.getNotifier() != dependentResource && msg.getOldBooleanValue() && !msg.getNewBooleanValue())
- dependentResource.unload();
- break;
- case Resource.RESOURCE__RESOURCE_SET :
- if (msg.getOldValue() != null && msg.getNewValue() == null) {
- if (msg.getNotifier() == dependentResource)
- ((Resource) getTarget()).eAdapters().remove(this);
- else {
- ResourceSet set = dependentResource.getResourceSet();
- if (set != null)
- set.getResources().remove(dependentResource);
- }
- }
- break;
- }
- }
- }
-
- class ResourceSetListener extends AdapterImpl {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.ADD)
- proccessAddedResource((ResourceSet) msg.getNotifier(), (Resource) msg.getNewValue());
- }
- }
-
- /**
- * Register a dependency between two URIs. The first parameter, aURIString, is the one that
- * dependentUriString depends on.
- *
- * @param aUriString
- * java.lang.String
- * @param dependentUriString
- * java.lang.String
- */
- public static void registerDependency(URI targetURI, URI dependentURI) {
- if (targetURI != null && dependentURI != null) {
- GLOBAL_DEPENDENCIES.put(dependentURI, targetURI);
- }
- }
-
- public ResourceDependencyRegister(ResourceSet aResourceSet) {
- initialize(aResourceSet);
- }
-
-
- ResourceDependencyRegister() {
- super();
- }
-
- /**
- * @param aResourceSet
- */
- protected void initialize(ResourceSet aResourceSet) {
- if (aResourceSet == null)
- throw new NullPointerException("The ResourceSet cannot be null."); //$NON-NLS-1$
- initializeLocalDependencies(aResourceSet);
- setupDependencyAdapters(aResourceSet);
- setupResourceSetListener(aResourceSet);
- }
-
- /**
- * @param aResourceSet
- */
- protected void setupResourceSetListener(ResourceSet aResourceSet) {
- aResourceSet.eAdapters().add(new ResourceSetListener());
- }
-
- /**
- * @param aResourceSet
- * @return
- */
- protected void setupDependencyAdapters(ResourceSet aResourceSet) {
- if (!aResourceSet.getResources().isEmpty()) {
- Iterator it = localDependencies.entrySet().iterator();
- Map.Entry entry;
- URI dependentURI, targetURI;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- dependentURI = (URI) entry.getKey();
- targetURI = (URI) entry.getValue();
- setupDependencyAdapter(aResourceSet, dependentURI, targetURI);
- }
- }
- }
-
- /**
- * @param aResourceSet
- * @param dependentURI
- * @param targetURI
- * @return
- */
- protected void setupDependencyAdapter(ResourceSet aResourceSet, URI dependentURI, URI targetURI) {
- Resource dependent = aResourceSet.getResource(dependentURI, false);
- if (dependent != null)
- setupDependencyAdapter(dependent, targetURI, aResourceSet);
- }
-
- protected void setupDependencyAdapter(Resource dependent, URI targetURI, ResourceSet aResourceSet) {
- Resource target = aResourceSet.getResource(targetURI, false);
- if (target == null)
- target = aResourceSet.createResource(targetURI);
- target.eAdapters().add(new ResourceDependencyAdapter(dependent));
- }
-
- /**
- * @param aResourceSet
- */
- protected void initializeLocalDependencies(ResourceSet aResourceSet) {
- URIConverter converter = aResourceSet.getURIConverter();
- initializeLocalDependencies(converter);
- }
-
- /**
- * @param aResourceSet
- */
- protected void initializeLocalDependencies(URIConverter aConverter) {
- Iterator it = GLOBAL_DEPENDENCIES.entrySet().iterator();
- Map resolved = new HashMap();
- Map.Entry entry;
- URI key, value;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- key = (URI) entry.getKey();
- value = (URI) entry.getValue();
- key = normalize(key, aConverter, resolved);
- value = normalize(value, aConverter, resolved);
- localDependencies.put(key, value);
- }
- }
-
- /**
- * @param relativeURI
- * @param converter
- * @param resolved
- * @return
- */
- protected URI normalize(URI relativeURI, URIConverter converter, Map resolved) {
- URI result = (URI) resolved.get(relativeURI);
- if (result == null) {
- result = converter.normalize(relativeURI);
- resolved.put(relativeURI, result);
- }
- return result;
- }
-
- /**
- * @param set
- * @param resource
- */
- protected void proccessAddedResource(ResourceSet set, Resource resource) {
- URI targetURI = (URI) localDependencies.get(resource.getURI());
- if (targetURI != null)
- setupDependencyAdapter(resource, targetURI, set);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
deleted file mode 100644
index 2ec67d4..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/Revisit.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-public class Revisit {
-
- /**
- * Revisit constructor comment.
- */
- public Revisit() {
- super();
- }
-
- public static void revisit() {
- }
-
-
- public static void unComment() {
- }
-
- public static void toDo() {
- }
-
- public static void refactor() {
- }
-
- public static void removeDeprecatedMethod() {
- }
-
- public static void deleteMe() {
- }
-
- public static void reviewDesign() {
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/StringUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/StringUtil.java
deleted file mode 100644
index d1f2308..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/StringUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.internal.emf.utilities;
-
-/**
- * @author schacher
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class StringUtil {
- /**
- * Enhanced equality check for two string parameters, that takes into consideration null values.
- * If both values are null, this will return true.
- *
- * @param s1
- * @param s2
- * @return boolean
- */
- public static boolean stringsEqual(String s1, String s2) {
- if (s1 == null)
- return s2 == null;
- return s1.equals(s2);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
deleted file mode 100644
index f71c66d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import org.omg.CORBA.UserException;
-
-public class UnsupportedCryptoAlgorithmException extends UserException {
-}
-
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WFTUtilsResourceHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WFTUtilsResourceHandler.java
deleted file mode 100644
index 037337b..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WFTUtilsResourceHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class WFTUtilsResourceHandler {
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("wftutils");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null)
- fgResourceBundle = getResourceBundle();
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WriteBackHelper.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WriteBackHelper.java
deleted file mode 100644
index b7f0034..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/WriteBackHelper.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-
-/**
- * @deprecated This class will be deleted. If you still need to use this class, please contact the
- * WCCM team. A class which can be used in conjunction with Encoder/Decoders to save
- * resources if they are made dirty by automatic encoding support. Usage Example:
- *
- * <pre>
- *
- *
- * // Use the standard WebSphere password value encoder/decoder.
- * EncoderDecoderRegistry.getDefaultRegistry().setDefaultEncoderDecoder(new com.ibm.ejs.security.util.WASEncoderDecoder());
- * // Begin tracking changes...
- * WriteBackHelper.begin();
- * // Load a resource which may have un-encoded values...
- * // Note: The WCCM will attempt to detect un-encoded values. If unencoded values
- * // are found, the value will be encoded, and the resource will be added to the
- * // WriteBackHelper.
- * Resource res = resourceSet.load("myResource");
- * // Ensure that any changes due to encoding are written back out.
- * WriteBackHelper.end();
- * </pre>
- */
-public class WriteBackHelper {
- private Set dirtyObjects = new HashSet();
- private boolean trackingChanges = false;
- private static WriteBackHelper _instance;
- static {
- //Deprecated class
- Revisit.deleteMe();
- };
-
- /**
- * Private constructor ensures proper usage through singleton.
- */
- private WriteBackHelper() {
- super();
- }
-
- /**
- * Adds a resource which is dirty, and needs to be saved.
- */
- public void addDirtyObject(EObject dirtyObject) {
- dirtyObjects.add(dirtyObject);
- }
-
- /**
- * Begin collecting objects which have changed.
- */
- public void begin() {
- trackingChanges = true;
- }
-
- /**
- * Attempts to save all dirty resources (if possible), then marks the resources as non-dirty.
- */
- public void end() {
- saveDirtyResources();
- reset();
- trackingChanges = false;
- }
-
- /**
- * Returns true if changes to mof objects are currently being tracked.
- */
- public boolean isActive() {
- return trackingChanges;
- }
-
- /**
- * Clears the list of dirty resources.
- */
- protected void reset() {
- dirtyObjects.clear();
- }
-
- /**
- * Attempts to save all dirty resources (if possible), then marks the resources as non-dirty.
- */
- protected void saveDirtyResources() {
- Set dirtyResources = new HashSet();
- Iterator dirtyObjIter = dirtyObjects.iterator();
- while (dirtyObjIter.hasNext()) {
- EObject dirtyObject = (EObject) dirtyObjIter.next();
- if (dirtyObject.eResource() != null && !dirtyResources.contains(dirtyObject)) {
- dirtyResources.add(dirtyObject.eResource());
- }
- }
- Iterator dirtyIter = dirtyResources.iterator();
- while (dirtyIter.hasNext()) {
- Resource dirtyResource = (Resource) dirtyIter.next();
- try {
- dirtyResource.save(Collections.EMPTY_MAP);
- } catch (Exception e) {
- warn(dirtyResource, e);
- }
- }
- }
-
- /**
- * Adds a resource which is dirty, and needs to be saved.
- */
- public static WriteBackHelper singleton() {
- if (_instance == null) {
- _instance = new WriteBackHelper();
- }
- return _instance;
- }
-
- /**
- * Warn the user of problems during save.
- */
- protected void warn(Resource res, Exception e) {
- System.err.println(WFTUtilsResourceHandler.getString("Warning__Could_not_write_b_WARN_", new Object[]{res.getURI()})); //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
deleted file mode 100644
index d9a1d2c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/XMLValueEncoderDecoder.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.internal.emf.utilities;
-
-
-/**
- * An XML value escaping EncoderDecoder implementation
- */
-public class XMLValueEncoderDecoder extends EncoderDecoderAdapter implements EncoderDecoder {
- /**
- * Identifies the last printable character in the Unicode range that is supported by the
- * encoding used with this serializer. For 8-bit encodings this will be either 0x7E or 0xFF. For
- * 16-bit encodings this will be 0xFFFF. Characters that are not printable will be escaped using
- * character references.
- */
- private int _lastPrintable = 0x7E;
- protected static XMLValueEncoderDecoder _singleton;
-
- /**
- * EncoderDecoderAdapter constructor comment.
- */
- public XMLValueEncoderDecoder() {
- super();
- }
-
- /**
- * Returns a decoded version of the value.
- */
- public String decode(String value) {
- // NOT_IMPLEMENTED
- return value;
- }
-
- /**
- * Escapes a string so it may be printed as text content or attribute value. Non printable
- * characters are escaped using character references. Where the format specifies a deault entity
- * reference, that reference is used (e.g. <tt>&lt;</tt>).
- *
- * @param source
- * The string to escape
- */
- public String encode(String value) {
- StringBuffer sbuf = new StringBuffer(value.length());
- String charRef = null;
- char ch;
- for (int i = 0; i < value.length(); ++i) {
- ch = value.charAt(i);
- // If there is a suitable entity reference for this
- // character, print it. The list of available entity
- // references is almost but not identical between
- // XML and HTML.
- charRef = getEntityRef(ch);
- if (charRef != null) {
- sbuf.append('&');
- sbuf.append(charRef);
- sbuf.append(';');
- } else if ((ch >= ' ' && ch <= _lastPrintable && ch != 0xF7) || ch == '\n' || ch == '\r' || ch == '\t') {
- // If the character is not printable, print as character reference.
- // Non printables are below ASCII space but not tab or line
- // terminator, ASCII delete, or above a certain Unicode threshold.
- sbuf.append(ch);
- } else {
- sbuf.append("&#");//$NON-NLS-1$
- sbuf.append(Integer.toString(ch));
- sbuf.append(';');
- }
- }
- return sbuf.toString();
- }
-
- public static String escape(String value) {
- if (_singleton == null) {
- _singleton = new XMLValueEncoderDecoder();
- }
- return _singleton.encode(value);
- }
-
- /**
- * Returns the suitable entity reference for this character value, or null if no such entity
- * exists. Calling this method with <tt>'&'</tt> will return <tt>"&amp;"</tt>.
- *
- * @param ch
- * Character value
- * @return Character entity name, or null
- */
- protected String getEntityRef(char ch) {
- // Encode special XML characters into the equivalent character references.
- // These five are defined by default for all XML documents.
- switch (ch) {
- case '<' :
- return "lt";//$NON-NLS-1$
- case '>' :
- return "gt";//$NON-NLS-1$
- case '"' :
- return "quot";//$NON-NLS-1$
- case '\'' :
- return "apos";//$NON-NLS-1$
- case '&' :
- return "amp";//$NON-NLS-1$
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
deleted file mode 100644
index a1ae58c..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Warning: Could not write back {0}
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Stack trace of nested exception:
-Enumeration_UI_=Enumeration
-Double_UI_=Double
-Float_UI_=Float
-Long_UI_=Long
-Short_UI_=Short
-Boolean_UI_=Boolean
-Integer_UI_=Integer
-Character_UI_=Character
-Byte_UI_=Byte
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E Failed to convert {0} to {1}.
-DANGLING_HREF_ERROR_=IWAE0001E Unable to resolve HREF {0}. Check the descriptor files and ensure the ids are valid.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E The ResourceSet cannot be null.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_de.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_de.properties
deleted file mode 100644
index 740d673..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_de.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Warnung: Zur\u00fcckschreiben von {0} war nicht m\u00f6glich
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Stack-Trace der verschachtelten Ausnahmebedingung:
-Enumeration_UI_=Aufz\u00e4hlung
-Double_UI_=DOUBLE
-Float_UI_=FLOAT
-Long_UI_=LONG
-Short_UI_=SHORT
-Boolean_UI_=BOOLEAN
-Integer_UI_=INTEGER
-Character_UI_=CHARACTER
-Byte_UI_=BYTE
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E Die Konvertierung von {0} in {1} ist fehlgeschlagen.
-DANGLING_HREF_ERROR_=IWAE0001E HREF {0} konnte nicht aufgel\u00f6st werden. \u00dcberpr\u00fcfen Sie die Deskriptordateien und stellen Sie sicher, dass die IDs g\u00fcltig sind.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E Die Ressourcengruppe darf nicht Null sein.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_es.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_es.properties
deleted file mode 100644
index 3ca824d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_es.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Aviso: no se ha podido de nuevo {0}
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Rastreo de pila de excepci\u00f3n anidada:
-Enumeration_UI_=Enumeraci\u00f3n
-Double_UI_=Doble
-Float_UI_=Coma flotante
-Long_UI_=Largo
-Short_UI_=Corto
-Boolean_UI_=Booleano
-Integer_UI_=Entero
-Character_UI_=Car\u00e1cter
-Byte_UI_=Byte
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E No se ha podido convertir {0} en {1}.
-DANGLING_HREF_ERROR_=IWAE0001E No se puede resolver HREF {0}. Compruebe los archivos de descriptor y aseg\u00farese de que los ID son v\u00e1lidos.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E ResourceSet no puede ser nulo.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_fr.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_fr.properties
deleted file mode 100644
index b2ad804..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_fr.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Avertissement : impossible de r\u00e9\u00e9crire {0}.
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Trace de pile de l'exception imbriqu\u00e9e :
-Enumeration_UI_=Enum\u00e9ration
-Double_UI_=Variable double
-Float_UI_=Variable flottante
-Long_UI_=Variable longue
-Short_UI_=Variable courte
-Boolean_UI_=Bool\u00e9en
-Integer_UI_=Entier
-Character_UI_=Caract\u00e8re
-Byte_UI_=Octet
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E Echec de la conversion de {0} en {1}.
-DANGLING_HREF_ERROR_=IWAE0001E Impossible de r\u00e9soudre HREF {0}. V\u00e9rifiez les fichiers du descripteur et assurez-vous que les ID sont valides.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E La classe ResourceSet ne peut pas \u00eatre NULL.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_it.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_it.properties
deleted file mode 100644
index 31d60a6..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_it.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Avviso: Impossibile eseguire il write back per {0}
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Traccia dello stack dell'eccezione nidificata:
-Enumeration_UI_=Numerazione
-Double_UI_=Doppio
-Float_UI_=Mobile
-Long_UI_=Esteso
-Short_UI_=Breve
-Boolean_UI_=Booleano
-Integer_UI_=Intero
-Character_UI_=Carattere
-Byte_UI_=Byte
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E Impossibile convertire {0} in {1}.
-DANGLING_HREF_ERROR_=IWAE0001E Impossibile risolvere HREF {0}. Controllare i file del descrittore e assicurarsi che gli ID siano validi.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E ResourceSet non pu\u00f2 essere null.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_ja.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_ja.properties
deleted file mode 100644
index 2347f79..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_ja.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W \u8b66\u544a: {0} \u3092\u66f8\u304d\u623b\u3059\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E \u30cd\u30b9\u30c8\u3055\u308c\u305f\u4f8b\u5916\u306e\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9:
-Enumeration_UI_=\u5217\u6319\u578b
-Double_UI_=\u500d\u7cbe\u5ea6
-Float_UI_=\u6d6e\u52d5
-Long_UI_=\u9577\u5f62\u5f0f
-Short_UI_=\u77ed\u5f62\u5f0f
-Boolean_UI_=\u30d6\u30fc\u30eb
-Integer_UI_=Integer
-Character_UI_=\u6587\u5b57
-Byte_UI_=\u30d0\u30a4\u30c8
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E {0} \u3092 {1} \u306b\u5909\u63db\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-DANGLING_HREF_ERROR_=IWAE0001E HREF {0} \u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093\u3002 \u8a18\u8ff0\u5b50\u30d5\u30a1\u30a4\u30eb\u3092\u8abf\u3079\u3001ID \u304c\u6709\u52b9\u304b\u3069\u3046\u304b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E \u30ea\u30bd\u30fc\u30b9\u30fb\u30bb\u30c3\u30c8\u3092 NULL \u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_ko.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_ko.properties
deleted file mode 100644
index ae4662d..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_ko.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W \uacbd\uace0: {0}\uc744(\ub97c) \ud68c\uc2e0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E \uc911\ucca9\ub41c \uc608\uc678\uc758 \uc2a4\ud0dd \ucd94\uc801:
-Enumeration_UI_=\uc5f4\uac70
-Double_UI_=Double
-Float_UI_=Float
-Long_UI_=Long
-Short_UI_=Short
-Boolean_UI_=\ubd80\uc6b8
-Integer_UI_=\uc815\uc218
-Character_UI_=\ubb38\uc790
-Byte_UI_=\ubc14\uc774\ud2b8
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E {0}\uc744(\ub97c) {1}(\uc73c)\ub85c \ubcc0\ud658\ud558\ub294 \ub370 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4.
-DANGLING_HREF_ERROR_=IWAE0001E {0} HREF\ub97c \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc124\uba85\uc790 \ud30c\uc77c\uc744 \ud655\uc778\ud558\uace0 ID\uac00 \uc62c\ubc14\ub978\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E ResourceSet\uc740 \ub110(null)\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_pt_BR.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_pt_BR.properties
deleted file mode 100644
index 4031f06..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_pt_BR.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W Aviso: N\u00e3o foi poss\u00edvel gravar {0} novamente
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E Rastreio de pilha de exce\u00e7\u00e3o aninhada:
-Enumeration_UI_=Enumera\u00e7\u00e3o
-Double_UI_=Duplo
-Float_UI_=Flutuante
-Long_UI_=Longo
-Short_UI_=Curto
-Boolean_UI_=Booleano
-Integer_UI_=Inteiro
-Character_UI_=Caractere
-Byte_UI_=Byte
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E Falha ao converter {0} em {1}.
-DANGLING_HREF_ERROR_=IWAE0001E N\u00e3o foi poss\u00edvel resolver HREF {0}. Verifique os arquivos descritores e assegure que os IDs sejam v\u00e1lidos.
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E O ResourceSet n\u00e3o pode ser nulo.
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_zh_CN.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_zh_CN.properties
deleted file mode 100644
index 4ac8cec..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_zh_CN.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W \u8b66\u544a\uff1a\u672a\u80fd\u56de\u5199 {0}
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E \u5d4c\u5957\u5f02\u5e38\u7684\u5806\u6808\u8ddf\u8e2a\uff1a
-Enumeration_UI_=\u679a\u4e3e\u578b
-Double_UI_=\u53cc\u7cbe\u5ea6\u578b
-Float_UI_=\u6d6e\u70b9\u578b
-Long_UI_=\u957f\u6574\u578b
-Short_UI_=\u77ed\u6574\u578b
-Boolean_UI_=\u5e03\u5c14\u578b
-Integer_UI_=\u6574\u578b
-Character_UI_=\u5b57\u7b26\u578b
-Byte_UI_=\u5b57\u8282\u578b
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E \u672a\u80fd\u5c06 {0} \u8f6c\u6362\u4e3a {1}\u3002
-DANGLING_HREF_ERROR_=IWAE0001E \u672a\u80fd\u89e3\u6790 HREF {0}\u3002\u68c0\u67e5\u63cf\u8ff0\u7b26\u6587\u4ef6\u5e76\u786e\u4fdd\u6807\u8bc6\u6709\u6548\u3002
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E ResourceSet \u4e0d\u80fd\u4e3a\u7a7a\u3002
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_zh_TW.properties b/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_zh_TW.properties
deleted file mode 100644
index a8179ad..0000000
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/wftutils_zh_TW.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Warning__Could_not_write_b_WARN_=IWAE0008W \u8b66\u544a\uff1a\u7121\u6cd5\u5beb\u56de {0}
-Stack_trace_of_nested_exce_ERROR_=IWAE0009E \u5de2\u72c0\u7570\u5e38\u72c0\u6cc1\u7684\u5806\u758a\u8ffd\u8e64\uff1a
-Enumeration_UI_=Enumeration
-Double_UI_=Double
-Float_UI_=Float
-Long_UI_=Long
-Short_UI_=Short
-Boolean_UI_=Boolean
-Integer_UI_=Integer
-Character_UI_=Character
-Byte_UI_=Byte
-Failed_to_convert_{0}_to_{_ERROR_=IWAE0014E \u7121\u6cd5\u5c07 {0} \u8f49\u63db\u6210 {1}\u3002
-DANGLING_HREF_ERROR_=IWAE0001E \u7121\u6cd5\u89e3\u6790 HREF {0}\u3002\u8acb\u6aa2\u67e5\u63cf\u8ff0\u5b50\u6a94\u6848\uff0c\u4e26\u78ba\u5b9a ID \u662f\u5426\u6709\u6548\u3002
-
-ResourceDependencyRegister_ERROR_0=IWAE0002E ResourceSet \u4e0d\u80fd\u662f\u7a7a\u503c\u3002
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.classpath b/plugins/org.eclipse.wst.common.frameworks.ui/.classpath
deleted file mode 100644
index beda00a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="wtp_ui/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.cvsignore b/plugins/org.eclipse.wst.common.frameworks.ui/.cvsignore
deleted file mode 100644
index 800bb16..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-wtp_ui.jar
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/.project b/plugins/org.eclipse.wst.common.frameworks.ui/.project
deleted file mode 100644
index 47885fd..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.frameworks.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties b/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
deleted file mode 100644
index 72b3e59..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-output.wtp_ui.jar = bin/
-bin.includes = plugin.xml,\
- wtp_ui.jar
-source.wtp_ui.jar = wtp_ui/,\
- property_files/
-src.includes = schema/
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
deleted file mode 100644
index 138194d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Cut=Cut
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml b/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
deleted file mode 100644
index c9c779e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/plugin.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.frameworks.ui"
- name="WTP UI Plug-in"
- version="1.0.0"
- provider-name=""
- description="This is a holding place for common frameworks UI used by components used in WTP currently it includes the following frameworks: Entendable Wizards, Extendable Actions"
- class="org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin">
-
- <runtime>
- <library name="wtp_ui.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- </requires>
-
-
- <extension-point id="wtpuiAction" name="WTP UI Action" schema="schema/wtpuiAction.exsd"/>
- <extension-point id="extendedViewer" name="Extended Viewers" schema="schema/extendedViewer.exsd"/>
- <extension-point id="extendableWizard" name="Extendable Wizard" schema="schema/extendableWizard.exsd"/>
- <extension-point id="wizardPageGroup" name="Extendable Wizard Page" schema="schema/extendableWizardPage.exsd"/>
-
- <extension
- id="UITester"
- point="com.ibm.wtp.common.util.uiTester">
- <uiTester
- className="org.eclipse.wst.common.frameworks.internal.ui.UITesterImpl">
- </uiTester>
- </extension>
- <extension
- id="context.Sensitive.Class.saveHandler"
- name="Save Handler - Headless Context Class"
- point="com.ibm.wtp.common.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="saveHandler"
- context="UI"
- className="org.eclipse.wst.common.frameworks.internal.ui.SaveHandlerUI">
- </uiContextSensitiveClass>
- </extension>
- <extension
- id="org.eclipse.wst.common.frameworks.internal.ui.EnablementDetermination"
- name="UI Enablement Determination"
- point="com.ibm.wtp.common.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="org.eclipse.wst.common.frameworks.internal.EnablementDetermination"
- context="UI"
- className="org.eclipse.wst.common.frameworks.internal.ui.UIEnablementManager">
- </uiContextSensitiveClass>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.WTPActivityBridgeHelper">
- <WTPActivityBridgeHelper
- class="org.eclipse.wst.common.frameworks.internal.ui.WTPActivityBridgeHelperImpl">
- </WTPActivityBridgeHelper>
- </extension>
- <!--
- <extension
- point="org.eclipse.wst.common.frameworks.internals.OperationExtension">
- <operationExtension
- postOperationClass="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.PostPasteActionOperation"
- id="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.PasteActionOperation"/>
- </extension>
- -->
- <extension
- id="PasteActionOperationExtendibleOperation"
- point="org.eclipse.wst.common.frameworks.ExtendableOperation">
- <extendableOperation
- class="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.PasteActionOperation"
- id="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.PasteActionOperation"/>
- </extension>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/prepareforpii.xml b/plugins/org.eclipse.wst.common.frameworks.ui/prepareforpii.xml
deleted file mode 100644
index d2dca48..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.common.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties b/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
deleted file mode 100644
index 9e8a4b5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/property_files/wtpcommonui.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-IActionWTPOperation_UI_0=No action available for execution.
-WTPActionDialog_UI_0=Select the optional dependent actions you would like to execute.
-WTPOptionalOperationDataModel_UI_0=Root tree can not be selected.
-WTPOptionalOperationDataModel_UI_1=No operations are selected.
-MasterDescriptor_ERROR_2=IWAE0005E WTPUIOperation elements require exactly one <selectionEnablement />.
-WTPOperationAction_UI_0=Operation Status
-WTPOperationAction_UI_1=Problem executing operation.
-TimerQueue_ERROR_0=IWAE0006E Can't start a TimerQueue that is already running
-ExtendedWizardPage_ERROR_0=IWAE0007E Cannot modify id after it has already been set.
-ExtendedWizardPage_ERROR_1=IWAE0008E The id cannot be null
-MasterDescriptor_UI_1=No \" {0} \" attribute defined
-Timer_UI_0=Invalid delay: {0}
-Timer_UI_1=Invalid initial delay: {0}
-WTPWizard_UI_0=Wizard Error: {0}
-WTPWizard_UI_1=An error has occurred when {0} finished.
-ExtendableWizard_UI_0=Wizard page failed to be created in {0} {1}
-WizardPageExtensionManager_UI_0=Element: {0} does not allow page insertion after.
-WizardPageExtensionManager_UI_1={0} will not be created
-WizardPageExtensionManager_UI_2=Circular dependancy, element: {0} check: {1}
-WizardPageExtensionManager_UI_3=Editor does not allow page insertions
-WizardPageExtensionManager_UI_4=Parent Class Not Found Error: {0} \r\n for attribute: {1} in plugin {2} \r\nPage not created
-Delete_UI_0=Delete
-Name_=Project Name:
-Browse_=Browse:
-Project_location_=Project Location:
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
deleted file mode 100644
index ba2556d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizard.exsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.etools.emf.workbench.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.etools.emf.workbench.ui" id="editModelEditor" name="Edit Model Editor"/>
- </appInfo>
- <documentation>
- Edit model editors represent the multi page editors that can be used to edit a collection of EMF resources. By declaring an edit model editor, the plugin provider allows the framework to generically obtain the edit model used by the editor.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="extendableWizard" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="extendableWizard">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
deleted file mode 100644
index 9dc6e0c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendableWizardPage.exsd
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.etools.emf.workbench.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.etools.emf.workbench.ui" id="editModelEditor" name="Edit Model Editor"/>
- </appInfo>
- <documentation>
- Edit model editors represent the multi page editors that can be used to edit a collection of EMF resources. By declaring an edit model editor, the plugin provider allows the framework to generically obtain the edit model used by the editor.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <choice>
- <element ref="wizardPageGroup"/>
- </choice>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="wizardPageGroup">
- <complexType>
- <sequence>
- <choice>
- <element ref="factory"/>
- </choice>
- </sequence>
- <attribute name="wizardID" type="string" use="required">
- <annotation>
- <documentation>
- This must match the id defined in the extendableWizard element in the extendableWizard extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="allowsExtendedPagesAfter" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pageGroupInsertionID" type="string">
- <annotation>
- <documentation>
- If this page is to immediately after another page, this must match the pageID of the page to insert after.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pageGroupID" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="factory">
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- This class is an instancof com.ibm.wtp.common.ui.wizard.extensions.WizardExtensionFactory
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
deleted file mode 100644
index 7066b3f..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/extendedViewer.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.wtp.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.wtp.common.ui" id="extendedViewer" name="Extended Viewer"/>
- </appInfo>
- <documentation>
- The extendedViewer Extension point allows the contribution of new function
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="extendedViewer"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="extendedViewer">
- <complexType>
- <attribute name="viewerID" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="parentViewerID" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="factoryClass" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="functionGroupID" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd b/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
deleted file mode 100644
index fcffea2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/schema/wtpuiAction.exsd
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.wtp.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.wtp.common.ui" id="WTPUIOperation" name="WTP UI Operation"/>
- </appInfo>
- <documentation>
- This extension point is for WTP Operations which need to be tied to a generic UI action, such as CUT, COPY, PASTE, DELETE, and RENAME.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <choice>
- <element ref="masterOperation"/>
- <element ref="slaveOperation"/>
- </choice>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="masterOperation">
- <annotation>
- <documentation>
- A masterOperation enables an existing WTP Operation to be used in a UI action. Generic Ids aggregate a set of masterOperations for the same Abstract action (like a "CUT" operation). WTP Operations are themselves extendible, so for any masterOperation defined, there may be any number of pre|post operations. These pre|post operation can have slaveOperation elements defined which indicate the pre|post operation may be run independently.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="selectionEnablement"/>
- </sequence>
- <attribute name="extendedGenericId" type="string" use="required">
- <annotation>
- <documentation>
- The ID of the Generic Action you would like to contribute to. (e.g. The id for CUT, COPY, PASTE, DELETE, RENAME).
- </documentation>
- </annotation>
- </attribute>
- <attribute name="operationClass" type="string">
- <annotation>
- <documentation>
- The fully qualified class of your operation. Your operation must extend com.ibm.wtp.common.operation.WTPOperation and must provide a no-arguments default constructor. If this attribute is not provided, the getDefaultOperation() returned by the dataModel will be used.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A name to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="populatorClass" type="string" use="required">
- <annotation>
- <documentation>
- An implementation of com.ibm.wtp.common.operation.extension.ui.WTPOperationDataModelUICreator. The populatorClass knows how to provide a WTP Operation Data Model based on a given selection. The getDefaultOperation() method of the data model will be ignored if the operationClass is provided.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="alwaysExecute" type="boolean">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="overrideId" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="selectionEnablement">
- <annotation>
- <documentation>
- The selectionEnablement element allows you to filter which kinds of selection your object is applicable to using Standard Eclipse Action Expresions.
- </documentation>
- </annotation>
- <complexType>
- <choice>
- <element ref="objectClass"/>
- <element ref="or"/>
- </choice>
- </complexType>
- </element>
-
- <element name="slaveOperation">
- <annotation>
- <documentation>
- The slaveOperation element defines display information for operations which extend a declared master operation. If a pre|post operation of a master does not have a corresponding slaveOperation element, then the pre|post operation will be consider required, and not be displayed to the user.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="operationClass" type="string" use="required">
- <annotation>
- <documentation>
- The fully qualified class of your operation. Your operation must extend com.ibm.wtp.common.operation.WTPOperation and must provide a no-arguments default constructor. For slave operations, the data model of the master operation will be provided. Therefore, slaves cannot override the data model using a seperate populatorClass.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A name to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description to display in the dialog for your action (if the operation is optional). You can use the standard "%key" for translatable text stored in plugin.properties.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="or">
- <complexType>
- <choice>
- <element ref="objectClass"/>
- <element ref="and"/>
- <element ref="objectState"/>
- </choice>
- </complexType>
- </element>
-
- <element name="objectClass">
- <complexType>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="adaptable" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="and">
- <complexType>
- <choice>
- <element ref="objectClass"/>
- <element ref="or"/>
- </choice>
- </complexType>
- </element>
-
- <element name="objectState">
- <complexType>
- <attribute name="value" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following example declares two Master Operations (<code>com.acme.ui.operation.MasterOperationA</code> and <code>com.acme.ui.operation.MasterOperationB</code>) which are attached to the Generic ID <code>com.acme.ui.WTPOptionalOperationTest</code>.
-The scenario has Master A which has as a pre-operation of Slave A and a post-operation of Slave C. Slave A is made optional by the <code>slaveOperation</code> element, while Slave C will always be run (no <code>slaveOperation</code> is given to run it seperately). Slave A further has an optional pre-operation (Slave B) that can be executed indepently of either Slave A or Master A.
-<pre>
- <extension
- point="com.ibm.wtp.common.ui.wtpuiAction">
- <masterOperation
- populatorClass="com.acme.ui.operation.AcmeOperationPopulator"
- name="%master_a_name"
- operationClass="com.acme.ui.operation.MasterOperationA"
- extendedGenericId="com.acme.ui.WTPOptionalOperationTest"
- description="%master_a_description">
- </masterOperation>
- <slaveOperation
- name="Slave A"
- operationClass="com.acme.ui.operation.SlaveOperationA">
- </slaveOperation>
- <slaveOperation
- name="Slave B"
- operationClass="com.acme.ui.operation.SlaveOperationB">
- </slaveOperation>
- <masterOperation
- populatorClass="com.acme.ui.operation.AcmeOperationPopulator"
- name="EAR Project Action"
- operationClass="com.acme.ui.operation.MasterOperationB"
- extendedGenericId="com.acme.ui.WTPOptionalOperationTest">
- <selectionEnablement>
- <objectState name="projectNature" value="org.eclipse.jst.j2ee.EARNature" />
- </selectionEnablement>
- </masterOperation>
- </extension>
-</pre>
-
-For each of the slaveOperations referenced above, you must have a corresponding WTP Operation Extension declared similar to the following:
-
-<pre>
- <extension
- id="wtpuiAciton.Acme.Extensions"
- point="com.ibm.wtp.common.ExtendableOperation">
- <extendableOperation
- class="com.acme.ui.operation.MasterOperationA"
- id="com.acme.ui.operation.MasterOperationA">
- </extendableOperation>
- <extendableOperation
- class="com.acme.ui.operation.SlaveOperationA"
- id="com.acme.ui.operation.SlaveOperationA">
- </extendableOperation>
- </extension>
- <extension
- point="com.ibm.wtp.common.OperationExtension">
- <!-- Made optional by the above declaration -->
- <operationExtension
- preOperationClass="com.acme.ui.operation.SlaveOperationA"
- id="com.acme.ui.operation.MasterOperationA">
- </operationExtension>
- <!-- Made optional by the above declaration -->
- <operationExtension
- postOperationClass="com.acme.ui.operation.SlaveOperationB"
- id="com.acme.ui.operation.SlaveOperationA">
- </operationExtension>
- <!-- Non-optional operation, will always run -->
- <operationExtension
- postOperationClass="com.acme.ui.operation.SlaveOperationC"
- id="com.acme.ui.operation.MasterOperationA">
- </operationExtension>
- </extension>
-</pre>
-
-In general, users extending existing actions only need to declare the following:
-<pre>
- <extension
- point="com.ibm.wtp.common.OperationExtension">
- <!-- The action referenced must be declared as extensible by the com.ibm.wtp.common.ExtendableOperation extension point -->
- <operationExtension
- preOperationClass="...YOUR CLASS..."
- id="...ID OF EXISTING OPERATION...">
- </operationExtension>
- </extension>
-</pre>
-
-And if your operation is optional declare the slaveOperation:
-
-<pre>
- <extension
- point="com.ibm.wtp.common.ui.wtpuiAction">
- <slaveOperation
- name="..NAME OF YOUR OPERATION..."
- description="...DESCRIPTION OF YOUR ACTION..."
- operationClass="...YOUR CLASS...">
- </slaveOperation>
- </extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/CommonUIPluginConstants.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/CommonUIPluginConstants.java
deleted file mode 100644
index 1aaaa36..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/CommonUIPluginConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 16, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface CommonUIPluginConstants {
- public static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks.internal.ui"; //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtendableWizard.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtendableWizard.java
deleted file mode 100644
index 65d8c71..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtendableWizard.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 16, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code Generation - Code and
- * Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.internal.operations.FailSafeComposedOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public abstract class ExtendableWizard extends WTPWizard {
-
- private IExtendedWizardPage[] extendedPages = null;
- private IExtendedPageHandler[] extendedPageHandlers = null;
-
- public ExtendableWizard(WTPOperationDataModel model) {
- super(model);
- }
-
- public ExtendableWizard() {
- super();
- }
-
- /**
- *
- * @return the wizard ID that clients should extend to add to this wizard
- */
- public abstract String getWizardID();
-
- /**
- * Add all wizard pages that come from this wizard
- */
- protected abstract void doAddPages();
-
- /**
- * Create the operation that should be used by this wizard
- *
- * @return
- */
- protected abstract WTPOperation createBaseOperation();
-
- private void addExtensionPages() {
- String wizardID = getWizardID();
- WizardPageElement wizElement = null;
- if (wizardID == null)
- return;
- WizardPageElement[] elements = WizardPageExtensionManager.getInstance().getPageElements(getWizardID());
- IExtendedWizardPage[] extendedPagesLocal = null;
- IExtendedPageHandler extendedPageHandler = null;
- List extendedPagesList = new ArrayList();
- List extendedPageHandlerList = new ArrayList();
- for (int i = 0; i < elements.length; i++) {
- wizElement = elements[i];
- try {
- extendedPagesLocal = wizElement.createPageGroup(model);
- if (null != extendedPagesLocal) {
- for (int j = 0; j < extendedPagesLocal.length; j++) {
- addPage(extendedPagesLocal[j]);
- extendedPagesList.add(extendedPagesLocal[j]);
- }
- }
- extendedPageHandler = wizElement.createPageHandler(model);
- if (null != extendedPageHandler && !extendedPageHandlerList.contains(extendedPageHandler)) {
- extendedPageHandlerList.add(extendedPageHandler);
- }
- } catch (RuntimeException runtime) {
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString("ExtendableWizard_UI_0", new Object[]{wizElement.getPluginID(), wizElement.pageGroupID})); //$NON-NLS-1$
- Logger.getLogger().logError(runtime);
- }
- }
- extendedPages = new IExtendedWizardPage[extendedPagesList.size()];
- for (int i = 0; i < extendedPages.length; i++) {
- extendedPages[i] = (IExtendedWizardPage) extendedPagesList.get(i);
- }
- extendedPageHandlers = new IExtendedPageHandler[extendedPageHandlerList.size()];
- for (int i = 0; i < extendedPageHandlers.length; i++) {
- extendedPageHandlers[i] = (IExtendedPageHandler) extendedPageHandlerList.get(i);
- }
-
- }
-
- public boolean canFinish() {
- if (!super.canFinish()) {
- return false;
- }
- for (int i = 0; null != extendedPages && i < extendedPages.length; i++) {
- if (!extendedPages[i].canPageFinish()) {
- return false;
- }
- }
- return true;
- }
-
- protected final WTPOperation createOperation() {
- WTPOperation baseOperation = createBaseOperation();
- FailSafeComposedOperation composedOperation = null;
- for (int i = 0; null != extendedPages && i < extendedPages.length; i++) {
- WTPOperation op = extendedPages[i].createOperation();
- if (op != null) {
- if (composedOperation == null) {
- composedOperation = new FailSafeComposedOperation();
- composedOperation.append(baseOperation);
- }
- composedOperation.append(op);
- }
- }
- return composedOperation != null ? composedOperation : baseOperation;
- }
-
- /**
- * The <code>Wizard</code> implementation of this <code>IWizard</code> method creates all
- * the pages controls using <code>IDialogPage.createControl</code>. Subclasses should
- * reimplement this method if they want to delay creating one or more of the pages lazily. The
- * framework ensures that the contents of a page will be created before attempting to show it.
- */
- public void createPageControls(Composite pageContainer) {
- IWizardPage[] pages = getPages();
- // the default behavior is to create all the pages controls
- for (int i = 0; i < pages.length; i++) {
- if (isExtendedPage(pages[i])) {
- try {
- pages[i].createControl(pageContainer);
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- continue;
- }
- } else {
- pages[i].createControl(pageContainer);
- }
- // page is responsible for ensuring the created control is
- // accessable
- // via getControl.
- Assert.isNotNull(pages[i].getControl());
- }
- }
-
- protected boolean isExtendedPage(IWizardPage page) {
- for (int i = 0; null != extendedPages && i < extendedPages.length; i++) {
- if (page == extendedPages[i]) {
- return true;
- }
- }
- return false;
- }
-
-
- public final void addPages() {
- doAddPages();
- addExtensionPages();
- }
-
- public IWizardPage getNextPage(IWizardPage page) {
- IWizardPage expectedPage = super.getNextPage(page);
- String expectedPageName = (null == expectedPage) ? null : expectedPage.getName();
- String nextPageName = null;
- for (int i = 0; null != extendedPageHandlers && i < extendedPageHandlers.length; i++) {
- nextPageName = extendedPageHandlers[i].getNextPage(page.getName(), expectedPageName);
- if (null != nextPageName) {
- if (nextPageName.equals(IExtendedPageHandler.SKIP_PAGE)) {
- return getNextPage(expectedPage);
- } else if (nextPageName.startsWith(IExtendedPageHandler.PAGE_AFTER)) {
- String tempNextPageName = nextPageName.substring(IExtendedPageHandler.PAGE_AFTER.length());
- IWizardPage tempNextPage = getPage(tempNextPageName);
- return null == tempNextPage ? null : super.getNextPage(tempNextPage);
- }
- return getPage(nextPageName);
- }
- }
- return expectedPage;
- }
-
- public IWizardPage getPreviousPage(IWizardPage page) {
- IWizardPage expectedPage = super.getPreviousPage(page);
- String expectedPageName = (null == expectedPage) ? null : expectedPage.getName();
- String previousPageName = null;
- for (int i = 0; null != extendedPageHandlers && i < extendedPageHandlers.length; i++) {
- previousPageName = extendedPageHandlers[i].getPreviousPage(page.getName(), expectedPageName);
- if (null != previousPageName) {
- if (previousPageName.equals(IExtendedPageHandler.SKIP_PAGE)) {
- return getPreviousPage(expectedPage);
- } else if (previousPageName.startsWith(IExtendedPageHandler.PAGE_AFTER)) {
- String tempPreviousPageName = previousPageName.substring(IExtendedPageHandler.PAGE_AFTER.length());
- IWizardPage tempPreviousPage = getPage(tempPreviousPageName);
- return null == tempPreviousPage ? null : super.getPreviousPage(tempPreviousPage);
- }
- return getPage(previousPageName);
- }
- }
- return expectedPage;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtendedWizardPage.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtendedWizardPage.java
deleted file mode 100644
index 43afffb..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtendedWizardPage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-
-import org.eclipse.core.internal.runtime.Assert;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public abstract class ExtendedWizardPage extends WTPWizardPage implements IExtendedWizardPage {
-
- private String id;
-
- protected ExtendedWizardPage(WTPOperationDataModel model, String pageName) {
- super(model, pageName);
- }
-
- /**
- * @return Returns the id.
- */
- public final String getGroupID() {
- return id;
- }
-
- /**
- * Will only set the id once. Further invocations will be ignored.
- *
- * @param id
- * The id to set.
- */
- public final void setGroupID(String id) {
- Assert.isTrue(this.id == null, WTPCommonUIResourceHandler.getString("ExtendedWizardPage_ERROR_0")); //$NON-NLS-1$
- Assert.isNotNull(id, WTPCommonUIResourceHandler.getString("ExtendedWizardPage_ERROR_1")); //$NON-NLS-1$
- this.id = id;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtensibleViewRegistry.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtensibleViewRegistry.java
deleted file mode 100644
index efff496..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/ExtensibleViewRegistry.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-import com.ibm.wtp.common.RegistryReader;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * @author mdelder
- */
-public class ExtensibleViewRegistry extends RegistryReader {
-
- private static ExtensibleViewRegistry INSTANCE = null;
- private Map extendedViewerMap = null;
- private Map descriptorMap = null;
-
- protected interface Elements {
- public static final String EXTENDED_VIEWER = "extendedViewer"; //$NON-NLS-1$
- public static final String VIEWER_ID = "viewerID"; //$NON-NLS-1$
- public static final String PARENT_VIEWER_ID = "parentViewerID"; //$NON-NLS-1$
- public static final String FACTORY_CLASS = "factoryClass"; //$NON-NLS-1$
- public static final String ICON = "icon"; //$NON-NLS-1$
- public static final String LABEL = "label"; //$NON-NLS-1$
- public static final String FUNCTION_GROUP_ID = "functionGroupID"; //$NON-NLS-1$
- }
-
- /**
- *
- */
- private ExtensibleViewRegistry() {
- super(WTPUIPlugin.PLUGIN_ID, WTPUIPlugin.EXTENDED_VIEWER_REGISTRY_EXTENSION_POINT);
- }
-
- public static ExtensibleViewRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ExtensibleViewRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- public Descriptor getDescriptor(String viewerID) {
- return (Descriptor) getDescriptorMap().get(viewerID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.internal.registry.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals(Elements.EXTENDED_VIEWER)) {
- Descriptor descriptor = new Descriptor(element);
- getDescriptorMap().put(descriptor.getViewerID(), descriptor);
- return true;
- }
- return false;
- }
-
- /**
- * @return Returns the extendedViewerMap.
- */
- protected Map getExtendedViewerMap() {
- if (extendedViewerMap == null)
- extendedViewerMap = new HashMap();
- return extendedViewerMap;
- }
-
- /**
- * @return Returns the descriptorMap.
- */
- protected Map getDescriptorMap() {
- if (descriptorMap == null)
- descriptorMap = new HashMap();
- return descriptorMap;
- }
-
- public class Descriptor {
-
- private String viewerID = null;
- private String parentViewerID = null;
- private String factoryClass = null;
- private String icon = null;
- private String label = null;
- private String functionGroupID = null;
-
- private String toStringCache = null;
- private IConfigurationElement element = null;
-
- /**
- *
- */
- public Descriptor(IConfigurationElement element) {
- this.element = element;
-
- this.viewerID = this.element.getAttribute(ExtensibleViewRegistry.Elements.VIEWER_ID);
- this.parentViewerID = this.element.getAttribute(ExtensibleViewRegistry.Elements.PARENT_VIEWER_ID);
- this.factoryClass = this.element.getAttribute(ExtensibleViewRegistry.Elements.FACTORY_CLASS);
- this.icon = this.element.getAttribute(ExtensibleViewRegistry.Elements.ICON);
- this.label = this.element.getAttribute(ExtensibleViewRegistry.Elements.LABEL);
- this.functionGroupID = this.element.getAttribute(ExtensibleViewRegistry.Elements.FUNCTION_GROUP_ID);
- }
-
- public IExtensibleViewFactory createFactoryInstance() {
- IExtensibleViewFactory factoryInstance = null;
- try {
- factoryInstance = (IExtensibleViewFactory) this.element.createExecutableExtension(getFactoryClass());
- } catch (CoreException e) {
- WTPUIPlugin.getLogger().logError(e);
- }
- return factoryInstance;
- }
-
- /**
- * @return Returns the factoryClass.
- */
- public String getFactoryClass() {
- return factoryClass;
- }
-
- /**
- * @return Returns the functionGroupID.
- */
- public String getFunctionGroupID() {
- return functionGroupID;
- }
-
- /**
- * @return Returns the icon.
- */
- public String getIcon() {
- return icon;
- }
-
- /**
- * @return Returns the label.
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @return Returns the parentViewerID.
- */
- public String getParentViewerID() {
- return parentViewerID;
- }
-
- /**
- * @return Returns the viewerID.
- */
- public String getViewerID() {
- return viewerID;
- }
-
- public String toString() {
- if (toStringCache == null)
- toStringCache = "ExtensibleViewRegistry.Info [viewerID=\"" + getViewerID() + "\",parentViewerID=\"" + getParentViewerID() + "\",factoryClass=" + getFactoryClass() + "\",functionGroupID=\"" + getFunctionGroupID() + "\"]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return toStringCache;
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IActionWTPOperation.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IActionWTPOperation.java
deleted file mode 100644
index 8970381..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IActionWTPOperation.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 10, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.wst.common.frameworks.internal.operations.NonConflictingRule;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-
-/**
- * @author mdelder
- *
- */
-public class IActionWTPOperation extends WTPOperation {
-
- private static final ISchedulingRule nonconflictingRule = new NonConflictingRule();
-
- boolean done;
-
- /**
- *
- */
- public IActionWTPOperation() {
- super();
- }
-
- /**
- * @param operationDataModel
- */
- public IActionWTPOperation(WTPOperationDataModel operationDataModel) {
- super(operationDataModel);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- final IAction action = (IAction) getOperationDataModel().getProperty(IActionWTPOperationDataModel.IACTION);
- if (action == null)
- throw new CoreException(new Status(IStatus.WARNING, WTPUIPlugin.PLUGIN_ID, 0, WTPCommonUIResourceHandler.getString("IActionWTPOperation_UI_0"), null)); //$NON-NLS-1$
-
- final ISelection selection = (IStructuredSelection) getOperationDataModel().getProperty(IActionWTPOperationDataModel.ISTRUCTURED_SELECTION);
- final ISelectionProvider selectionProvider = (ISelectionProvider) getOperationDataModel().getProperty(IActionWTPOperationDataModel.ISELECTION_PROVIDER);
-
- /*
- * if(selectionProvider != null) selection = (selection != null) ? selection :
- * selectionProvider.getSelection();
- */
- Shell shell = (Shell) getOperationDataModel().getProperty(IActionWTPOperationDataModel.SHELL);
- done = false;
-
- Runnable executeAction = new Runnable() {
-
- public void run() {
- try {
- if (action instanceof IActionDelegate) {
- ((IActionDelegate) action).selectionChanged(action, selection);
- ((IActionDelegate) action).run(action);
- } else if (action instanceof IViewActionDelegate) {
- ((IViewActionDelegate) action).selectionChanged(action, selection);
- ((IActionDelegate) action).run(action);
- } /*else if (action instanceof SelectionDispatchAction) {
- ((SelectionDispatchAction) action).update(selection);
- ((SelectionDispatchAction) action).run();
- } */
- else if (action instanceof ISelectionChangedListener) {
- ((ISelectionChangedListener)action).selectionChanged(new SelectionChangedEvent(selectionProvider, selection));
- action.run();
- }
-
-
- } catch (RuntimeException e) {
- e.printStackTrace();
- } finally {
- getOperationDataModel().dispose();
- done = true;
- }
- }
- };
-
- Display current = Display.getCurrent();
- if (current != null) {
- executeAction.run();
- } else {
- shell.getDisplay().asyncExec(executeAction);
- }
-
- while (!done) {
- Thread.sleep(100);
- }
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#getSchedulingRule()
- */
- protected ISchedulingRule getSchedulingRule() {
- return nonconflictingRule;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IActionWTPOperationDataModel.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IActionWTPOperationDataModel.java
deleted file mode 100644
index eded3bd..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IActionWTPOperationDataModel.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 10, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class IActionWTPOperationDataModel extends WTPOperationDataModel implements IPropertyChangeListener {
-
- public static final String IACTION = "IActionWTPOperationDataModel.IACTION"; //$NON-NLS-1$
- public static final String ISTRUCTURED_SELECTION = "IActionWTPOperationDataModel.ISTRUCTURED_SELECTION"; //$NON-NLS-1$
- public static final String ISELECTION_PROVIDER = "IActionWTPOperationDataModel.ISELECTION_PROVIDER"; //$NON-NLS-1$
- public static final String SHELL = "IActionWTPOperationDataModel.SHELL"; //$NON-NLS-1$
- public static final String ACTION_RAN_SUCCESSFULLY = "IActionWTPOperationDataModel.ACTION_RAN_SUCCESSFULLY"; //$NON-NLS-1$
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#initValidBaseProperties()
- */
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(IACTION);
- addValidBaseProperty(ISTRUCTURED_SELECTION);
- addValidBaseProperty(ISELECTION_PROVIDER);
- addValidBaseProperty(SHELL);
- addValidBaseProperty(ACTION_RAN_SUCCESSFULLY);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public WTPOperation getDefaultOperation() {
- return new IActionWTPOperation(this);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#isResultProperty(java.lang.String)
- */
- protected boolean isResultProperty(String propertyName) {
- if (ACTION_RAN_SUCCESSFULLY.equals(propertyName))
- return true;
- return super.isResultProperty(propertyName);
- }
-
- /**
- * @param action
- * @param selection
- * @param provider
- * @return
- */
- public static WTPOperationDataModel createDataModel(IActionDelegate action, IStructuredSelection selection, ISelectionProvider provider, Shell shell) {
- WTPOperationDataModel dataModel = new IActionWTPOperationDataModel();
- dataModel.setProperty(IACTION, action);
- dataModel.setProperty(ISTRUCTURED_SELECTION, selection);
- dataModel.setProperty(ISELECTION_PROVIDER, provider);
- dataModel.setProperty(SHELL, shell);
- return dataModel;
- }
-
- /**
- * @param action
- * @param selection
- * @param provider
- * @return
- */
- public static WTPOperationDataModel createDataModel(Action action, IStructuredSelection selection, ISelectionProvider provider, Shell shell) {
- WTPOperationDataModel dataModel = new IActionWTPOperationDataModel();
- dataModel.setProperty(IACTION, action);
- dataModel.setProperty(ISTRUCTURED_SELECTION, selection);
- dataModel.setProperty(ISELECTION_PROVIDER, provider);
- dataModel.setProperty(SHELL, shell);
- return dataModel;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doSetProperty(java.lang.String,
- * java.lang.Object)
- */
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
-
-
- if (IACTION.equals(propertyName)) {
-
- IAction oldAction = (IAction) getProperty(IACTION);
- if (oldAction != null)
- oldAction.removePropertyChangeListener(this);
-
- boolean result = super.doSetProperty(propertyName, propertyValue);
-
- IAction newAction = (IAction) getProperty(IACTION);
- if (newAction != null)
- newAction.addPropertyChangeListener(this);
-
- return result;
- }
- return super.doSetProperty(propertyName, propertyValue);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultProperty(java.lang.String)
- */
- protected Object getDefaultProperty(String propertyName) {
- if (ACTION_RAN_SUCCESSFULLY.equals(propertyName))
- return Boolean.TRUE;
- return super.getDefaultProperty(propertyName);
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#dispose()
- */
- public void dispose() {
- super.dispose();
- IAction action = (IAction) getProperty(IACTION);
- if (action != null)
- action.removePropertyChangeListener(this);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- IAction action = (IAction) getProperty(IACTION);
- if (action == null || action != event.getSource())
- return;
- // TODO MDE Implement this method
- //notifyListeners(event.getProperty(), 0, event.getOldValue(), event.getNewValue());
- if (IAction.RESULT.equals(event.getProperty())) {
- setProperty(ACTION_RAN_SUCCESSFULLY, event.getNewValue());
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtendedPageHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtendedPageHandler.java
deleted file mode 100644
index 5331915..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtendedPageHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 8, 2004
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface IExtendedPageHandler {
-
- /**
- * return this as the page name if the expectedNextPageName or expectedPreviousPageName should
- * be skipped
- */
- public static final String SKIP_PAGE = "IExtendedPageHandler.SKIP_PAGE"; //$NON-NLS-1$
-
- /**
- * prefix this string with the name of the page which occurs before the page that should be
- * returned. E.G. suppose your page contributions know about pages A, B and C, and you want the
- * to skip pages B and C, when going to the next page from A. To do this, return PAGE_AFTER+C.
- * The framework will then ask the wizard for the page that normally comes after page C.
- * PAGE_BEFORE works similarly.
- */
- public static final String PAGE_AFTER = "IExtendedPageHandler.PAGE_AFTER"; //$NON-NLS-1$
-
- /**
- * same as PAGE_AFTER, except for returing the page before.
- */
- public static final String PAGE_BEFORE = "IExtendedPageHandler.PAGE_BEFORE"; //$NON-NLS-1$
-
- /**
- * Return the name of the page that should be next
- *
- * @param currentPageName
- * the page the wizard is currently on
- * @param expectedNextPageName
- * the page that would normally be next
- * @return
- */
- public String getNextPage(String currentPageName, String expectedNextPageName);
-
- /**
- * Return the name of the page that should be previous
- *
- * @param currentPageName
- * the page the wizard is currently on
- * @param expectedNextPageName
- * the page that would normally be previous
- * @return
- */
- public String getPreviousPage(String currentPageName, String expectedPreviousPageName);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtendedWizardPage.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtendedWizardPage.java
deleted file mode 100644
index 4905710..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtendedWizardPage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 21, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface IExtendedWizardPage extends IWizardPage {
-
- WTPOperation createOperation();
-
- boolean canPageFinish();
-
- String getGroupID();
-
- void setGroupID(String id);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtensibleViewFactory.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtensibleViewFactory.java
deleted file mode 100644
index b144f92..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IExtensibleViewFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * @author mdelder
- */
-public interface IExtensibleViewFactory {
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IOperationNode.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IOperationNode.java
deleted file mode 100644
index 747b5ca..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/IOperationNode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public interface IOperationNode {
-
- public IOperationNode[] getChildren();
-
- public boolean isChecked();
-
- /**
- * Same as calling setChecked(checked, true)
- *
- * @param checked
- */
- public void setChecked(boolean checked);
-
- public String getName();
-
- public String getDescription();
-
- public IOperationNode getParent();
-
- /**
- * @return
- */
- public boolean isAlwaysExecute();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/MasterDescriptor.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/MasterDescriptor.java
deleted file mode 100644
index 436f531..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/MasterDescriptor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on May 5, 2004
- *
- * TODO To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.internal.ActionExpression;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-public class MasterDescriptor extends SlaveDescriptor {
-
- public static final String MASTER_OPERATION = "masterOperation"; //$NON-NLS-1$
-
- public static final String ATT_EXTENDED_OPERATION_ID = "extendedGenericId"; //$NON-NLS-1$
-
- public static final String SELECTION_ENABLEMENT = "selectionEnablement"; //$NON-NLS-1$
-
- private static final String ATT_POPULATOR_CLASS = "populatorClass"; //$NON-NLS-1$
-
- private static final String ATT_ALWAYS_EXECUTE = "alwaysExecute"; //$NON-NLS-1$
-
- private ActionExpression enablement;
-
- private String extendedOperationId;
-
- private WTPOperationDataModelUICreator creator;
-
- private boolean alwaysExecute;
-
-
- public MasterDescriptor(IConfigurationElement element) {
- super(element);
- init();
- }
-
- private void init() {
- this.extendedOperationId = getElement().getAttribute(ATT_EXTENDED_OPERATION_ID);
- if (null == extendedOperationId)
- Logger.getLogger().log(WTPCommonUIResourceHandler.getString("MasterDescriptor_UI_0", new Object[]{ATT_EXTENDED_OPERATION_ID})); //$NON-NLS-1$
-
-
- if (Boolean.valueOf(getElement().getAttribute(ATT_ALWAYS_EXECUTE)).booleanValue())
- alwaysExecute = true;
-
- IConfigurationElement[] elements = getElement().getChildren(SELECTION_ENABLEMENT);
- if (elements.length == 1)
- this.enablement = new ActionExpression(elements[0]);
- else
- Logger.getLogger().log(WTPCommonUIResourceHandler.getString("MasterDescriptor_ERROR_2")); //$NON-NLS-1$
-
- }
-
- /**
- * @return Returns the extendedOperationId.
- */
- public String getExtendedOperationId() {
- return extendedOperationId;
- }
-
-
- public boolean isEnabledFor(IStructuredSelection selection) {
- if (getEnablement() == null)
- return true;
- boolean result = false;
- for (Iterator itr = selection.iterator(); itr.hasNext();) {
- result = getEnablement().isEnabledFor(itr.next());
- if (result)
- break;
- }
- return result;
- }
-
- public WTPOperationDataModelUICreator getCreator() {
- if (creator == null) {
- try {
- creator = (WTPOperationDataModelUICreator) getElement().createExecutableExtension(ATT_POPULATOR_CLASS);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- return creator;
- }
-
- protected ActionExpression getEnablement() {
- return enablement;
- }
-
-
- /**
- * @return Returns the alwaysExecute.
- */
- public boolean isAlwaysExecute() {
- return alwaysExecute;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PasteActionOperation.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PasteActionOperation.java
deleted file mode 100644
index c09631c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PasteActionOperation.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 27, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-
-/**
- * @author mdelder
- *
- */
-public class PasteActionOperation extends IActionWTPOperation {
-
- public PasteActionOperation() {
- super();
- }
-
- public PasteActionOperation(PasteActionOperationDataModel opMdl) {
- super(opMdl);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PasteActionOperationDataModel.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PasteActionOperationDataModel.java
deleted file mode 100644
index dc12e79..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PasteActionOperationDataModel.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 26, 2004
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-//TODO This class has code commented out to get compile errors cleanup for Eclipse 3.1 as the internal classes ReorgResult and PasteActions have been removed in 3.1 - VKB
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- *
- */
-public class PasteActionOperationDataModel extends IActionWTPOperationDataModel {
-
- /**
- * Result Property. A java.util.Map of old-types-to-new-types
- */
- public static final String REFACTORED_RESOURCES = "PasteActionOperationDataModel.REFACTORED_RESOURCES"; //$NON-NLS-1$
- public static final String DESTINATION = "PasteActionOperationDataModel.DESTINATION"; //$NON-NLS-1$
- private Map prepasteSnapshot = new HashMap();
- //TODO Needs Clean up of compile errors for Eclipse 3.1 - VKB
- //private ReorgResult cachedResult;
-
- /**
- * @param action
- * @param selection
- * @param provider
- * @return
- */
- public static WTPOperationDataModel createDataModel(IActionDelegate action, IStructuredSelection selection, ISelectionProvider provider, Shell shell) {
- WTPOperationDataModel dataModel = new PasteActionOperationDataModel();
- dataModel.setProperty(IACTION, action);
- dataModel.setProperty(ISTRUCTURED_SELECTION, selection);
- dataModel.setProperty(ISELECTION_PROVIDER, provider);
- dataModel.setProperty(SHELL, shell);
- return dataModel;
- }
-
- /**
- * @param action
- * @param selection
- * @param provider
- * @return
- */
- public static WTPOperationDataModel createDataModel(Action action, IStructuredSelection selection, ISelectionProvider provider, Shell shell) {
- WTPOperationDataModel dataModel = new PasteActionOperationDataModel();
- dataModel.setProperty(IACTION, action);
- dataModel.setProperty(ISTRUCTURED_SELECTION, selection);
- dataModel.setProperty(ISELECTION_PROVIDER, provider);
- dataModel.setProperty(SHELL, shell);
- return dataModel;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IActionWTPOperationDataModel#initValidBaseProperties()
- */
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(REFACTORED_RESOURCES);
- addValidBaseProperty(DESTINATION);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
- */
- public WTPOperation getDefaultOperation() {
- return new PasteActionOperation(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IActionWTPOperationDataModel#isResultProperty(java.lang.String)
- */
- protected boolean isResultProperty(String propertyName) {
- if (REFACTORED_RESOURCES.equals(propertyName) || DESTINATION.equals(propertyName))
- return true;
- return super.isResultProperty(propertyName);
- }
-
-
- /*
- * (non-Javadoc)
- * TODO Needs Clean up of compile errors for Eclipse 3.1 - VKB
- * @see org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IActionWTPOperationDataModel#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
-// public void propertyChange(PropertyChangeEvent event) {
-// if (PasteAction.PASTE_PRE_NOTIFICATION.equals(event.getProperty())) {
-//
-// ReorgResult result = (ReorgResult) event.getNewValue();
-// updatePrepasteSnapshot(result);
-// } else if (PasteAction.PASTE_RESULT_NOTIFICATION.equals(event.getProperty())) {
-// //System.out.println("Caching result");
-// cachedResult = (ReorgResult) event.getNewValue();
-// } else if (IAction.RESULT.equals(event.getProperty()) && cachedResult != null) {
-// //System.out.println("Applying cached result");
-// fillMapAsNecessary(cachedResult);
-//
-// Map refactorMap = cachedResult.getNameChanges();
-// setProperty(REFACTORED_RESOURCES, refactorMap);
-//
-// Object destination = cachedResult.getDestination();
-// if (cachedResult.getResourcesToCopy().length == 1) {
-// if (cachedResult.getResourcesToCopy()[0].equals(destination))
-// destination = cachedResult.getResourcesToCopy()[0].getParent();
-// } else if (cachedResult.getJavaElementsToCopy().length == 1) {
-// if (cachedResult.getJavaElementsToCopy()[0].equals(destination))
-// destination = cachedResult.getJavaElementsToCopy()[0].getParent();
-// }
-// setProperty(DESTINATION, destination);
-// cachedResult = null;
-//
-// }
-// super.propertyChange(event);
-// }
-
-// TODO Needs Clean up of compile errors for Eclipse 3.1 - VKB
-
-// protected void updatePrepasteSnapshot(ReorgResult result) {
-//
-// resetPrepasteSnapshot();
-//
-// IContainer container = getContainerFromResult(result);
-// if (container == null)
-// return;
-//
-// IResource resourceExisting = null;
-//
-// IResource[] resources = result.getResourcesToCopy();
-// if (resources != null) {
-// for (int i = 0; i < resources.length; i++) {
-// resourceExisting = getCorrespondingFileOrFolder(resources[i], new Path(resources[i].getName()), container);
-// if (resourceExisting.exists())
-// prepasteSnapshot.put(resourceExisting, new Long(resourceExisting.getModificationStamp()));
-// }
-// }
-//
-// IJavaElement[] elements = result.getJavaElementsToCopy();
-// if (elements != null) {
-// for (int i = 0; i < elements.length; i++) {
-// try {
-// resourceExisting = getCorrespondingFileOrFolder(elements[i].getCorrespondingResource(), new Path(elements[i].getCorrespondingResource().getName()), container);
-// if (resourceExisting != null && resourceExisting.exists())
-// prepasteSnapshot.put(resourceExisting, new Long(resourceExisting.getModificationStamp()));
-// } catch (JavaModelException e) {
-// }
-// }
-// }
-// }
-
- /**
- *
- */
- private void resetPrepasteSnapshot() {
- if (prepasteSnapshot == null)
- prepasteSnapshot = new HashMap();
- else
- prepasteSnapshot.clear();
- }
-
-// TODO Needs Clean up of compile errors for Eclipse 3.1 - VKB
-
-// protected void fillMapAsNecessary(ReorgResult result) {
-//
-// IContainer container = getContainerFromResult(result);
-//
-// if (container == null)
-// return;
-//
-// /*
-// * If you Ctrl+C -> Ctrl+V a Project, you get no pre-notification and the prepasteSnapshot
-// * is null
-// */
-// if (prepasteSnapshot == null)
-// prepasteSnapshot = new HashMap();
-//
-// Map nameChanges = result.getNameChanges();
-//
-// IResource resourceExisting = null;
-//
-// IResource[] resources = result.getResourcesToCopy();
-// if (resources != null) {
-// for (int i = 0; i < resources.length; i++) {
-// resourceExisting = getCorrespondingFileOrFolder(resources[i], new Path(resources[i].getName()), container);
-//
-// if (prepasteSnapshot.containsKey(resourceExisting)) {
-// Long timestamp = (Long) prepasteSnapshot.get(resourceExisting);
-// if (timestamp.longValue() != resourceExisting.getModificationStamp())
-// nameChanges.put(resources[i], resourceExisting);
-// } else
-// nameChanges.put(resources[i], resourceExisting);
-// }
-// }
-//
-// IJavaElement[] elements = result.getJavaElementsToCopy();
-// if (elements != null) {
-// for (int i = 0; i < elements.length; i++) {
-// try {
-// resourceExisting = getCorrespondingFileOrFolder(elements[i].getCorrespondingResource(), new Path(elements[i].getCorrespondingResource().getName()), container);
-//
-// if (prepasteSnapshot.containsKey(resourceExisting)) {
-// Long timestamp = (Long) prepasteSnapshot.get(resourceExisting);
-// if (timestamp.longValue() != resourceExisting.getModificationStamp())
-// nameChanges.put(elements[i].getCorrespondingResource(), resourceExisting);
-// } else
-// nameChanges.put(elements[i].getCorrespondingResource(), resourceExisting);
-// } catch (JavaModelException e) {
-// }
-// }
-// }
-// resetPrepasteSnapshot();
-// }
-//
-// private IContainer getContainerFromResult(ReorgResult result) {
-//
-// Object destination = result.getDestination();
-//
-// IContainer container = null;
-// if (result.getDestination() instanceof IContainer) {
-// container = (IContainer) destination;
-// } else if (destination instanceof IJavaElement) {
-// IJavaElement containerElement = (IJavaElement) destination;
-// IPackageFragment fragment = null;
-// IPackageFragmentRoot fragmentRoot = null;
-// switch (containerElement.getElementType()) {
-// case IJavaElement.PACKAGE_FRAGMENT :
-// fragment = (IPackageFragment) containerElement;
-// break;
-// case IJavaElement.PACKAGE_FRAGMENT_ROOT :
-// fragmentRoot = (IPackageFragmentRoot) containerElement;
-// break;
-//
-// }
-// try {
-// if (fragmentRoot == null ^ fragment == null) {
-// container = (fragmentRoot != null) ? (IContainer) fragmentRoot.getCorrespondingResource() : (IContainer) fragment.getCorrespondingResource();
-// }
-// } catch (JavaModelException e1) {
-// }
-// }
-// return container;
-// }
-
- private IResource getCorrespondingFileOrFolder(IResource existing, IPath expectedPath, IContainer container) {
- IResource resourceExisting = null;
- switch (existing.getType()) {
- case IResource.FOLDER :
- resourceExisting = container.getFolder(expectedPath);
- break;
- case IResource.FILE :
- resourceExisting = container.getFile(expectedPath);
- break;
- }
- return resourceExisting;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PostPasteActionOperation.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PostPasteActionOperation.java
deleted file mode 100644
index 644f68e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/PostPasteActionOperation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 27, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class PostPasteActionOperation extends WTPOperation {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- PasteActionOperationDataModel dataMdl = (PasteActionOperationDataModel) getOperationDataModel();
-
- Map refactoredResourcesMap = (Map) dataMdl.getProperty(PasteActionOperationDataModel.REFACTORED_RESOURCES);
- System.out.println(getClass().getName());
- System.out.println("Map:" + refactoredResourcesMap); //$NON-NLS-1$
-
- Object destination = dataMdl.getProperty(PasteActionOperationDataModel.DESTINATION);
- System.out.println("Destination:" + destination); //$NON-NLS-1$
-
-
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/SlaveDescriptor.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/SlaveDescriptor.java
deleted file mode 100644
index 3dc34b6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/SlaveDescriptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class SlaveDescriptor {
-
- public static final String SLAVE_OPERATION = "slaveOperation"; //$NON-NLS-1$
-
- public static final String ATT_OPERATION_CLASS = "operationClass"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- private static final String ATT_OVERRIDE_ID = "overrideId"; //$NON-NLS-1$
- public static final String ATT_NAME = "name"; //$NON-NLS-1$
- public static final String ATT_DESCRIPTION = "description"; //$NON-NLS-1$
-
- private String id;
- private String name;
- private String description;
- private String operationClass;
- private String overrideId;
- private final IConfigurationElement element;
-
- public SlaveDescriptor(IConfigurationElement element) {
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
- this.overrideId = this.element.getAttribute(ATT_OVERRIDE_ID);
- this.name = this.element.getAttribute(ATT_NAME);
- this.description = this.element.getAttribute(ATT_DESCRIPTION);
- this.operationClass = this.element.getAttribute(ATT_OPERATION_CLASS);
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getName() {
- return name;
- }
-
- public WTPOperation createOperation() {
- try {
- return (WTPOperation) this.element.createExecutableExtension(ATT_OPERATION_CLASS);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return null;
- }
-
- /**
- * @return Returns the element.
- */
- protected IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * @return Returns the operationClass.
- */
- public String getOperationClass() {
- return operationClass;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getClass() + "[name=" + getName() + ", operationClass=" + getOperationClass() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return Returns the overrideId.
- */
- public String getOverrideId() {
- return overrideId;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/UIOperationExtensionRegistry.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/UIOperationExtensionRegistry.java
deleted file mode 100644
index d6272f5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/UIOperationExtensionRegistry.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.common.frameworks.internal.operations.OperationExtensionRegistry;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-import com.ibm.wtp.common.RegistryReader;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class UIOperationExtensionRegistry extends RegistryReader {
-
- public static final UIOperationExtensionRegistry INSTANCE = new UIOperationExtensionRegistry();
-
- public static final String EXTENSION_POINT = "wtpuiAction"; //$NON-NLS-1$
-
- private Map slaveDescriptorMap;
-
- private Map masterDescriptorMap;
-
- private HashMap overriddingDescriptorMap;
-
- static {
- INSTANCE.readRegistry();
- }
-
- protected UIOperationExtensionRegistry() {
- super(WTPUIPlugin.PLUGIN_ID, EXTENSION_POINT);
- }
-
- public MasterDescriptor[] getExtendedUIOperations(String extendedOperationId, IStructuredSelection selection) {
- if (selection == null || selection.isEmpty())
- return new MasterDescriptor[0];
- List enabledExtendedOperations = new ArrayList();
- List descs = getMasterDescriptorsById(extendedOperationId);
- MasterDescriptor descriptor = null;
- for (Iterator itr = descs.iterator(); itr.hasNext();) {
- descriptor = (MasterDescriptor) itr.next();
- if (descriptor.isEnabledFor(selection) && !isOverridden(descriptor, selection))
- enabledExtendedOperations.add(descriptor);
- }
- if (enabledExtendedOperations.size() == 0)
- return new MasterDescriptor[0];
- MasterDescriptor[] enabledExtendedOperationsArray = new MasterDescriptor[enabledExtendedOperations.size()];
- enabledExtendedOperations.toArray(enabledExtendedOperationsArray);
- return enabledExtendedOperationsArray;
- }
-
- /**
- * @param descriptor
- * @return
- */
- protected boolean isOverridden(MasterDescriptor descriptor, IStructuredSelection selection) {
- MasterDescriptor overriddingDescriptor = getOverriddingDescriptor(descriptor);
- if (overriddingDescriptor == null)
- return false;
- return overriddingDescriptor.isEnabledFor(selection);
- }
-
- /**
- * @param descriptor
- * @return
- */
- protected MasterDescriptor getOverriddingDescriptor(MasterDescriptor descriptor) {
- return (MasterDescriptor) getOverriddingDescriptorMap().get(descriptor.getId());
- }
-
- /**
- * @return
- */
- protected Map getOverriddingDescriptorMap() {
- if (overriddingDescriptorMap == null)
- overriddingDescriptorMap = new HashMap();
- return overriddingDescriptorMap;
- }
-
- public SlaveDescriptor[] getSlaveDescriptors(String parentOperationClass) {
- String[] slaves = OperationExtensionRegistry.getRegisteredOperations(parentOperationClass);
- List slaveDescriptors = new ArrayList();
- SlaveDescriptor slaveDescriptor = null;
- for (int i = 0; null != slaves && i < slaves.length; i++) {
- slaveDescriptor = getSlaveDescriptor(slaves[i]);
- if (slaveDescriptor != null)
- slaveDescriptors.add(slaveDescriptor);
- }
- SlaveDescriptor[] slaveDescriptorsArray = new SlaveDescriptor[slaveDescriptors.size()];
- slaveDescriptors.toArray(slaveDescriptorsArray);
- return slaveDescriptorsArray;
- }
-
- /**
- * @param string
- * @return
- */
- public SlaveDescriptor getSlaveDescriptor(String operationClass) {
- return (SlaveDescriptor) getSlaveDescriptorMap().get(operationClass);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (MasterDescriptor.MASTER_OPERATION.equals(element.getName())) {
- MasterDescriptor md = new MasterDescriptor(element);
- addDescriptor(md);
- if (md.getOverrideId() != null && md.getOverrideId().length() > 0)
- getOverriddingDescriptorMap().put(md.getOverrideId(), md);
- } else if (SlaveDescriptor.SLAVE_OPERATION.equals(element.getName())) {
- addDescriptor(new SlaveDescriptor(element));
- } else {
- return false;
- }
- return true;
- }
-
- /**
- * @param descriptor
- */
- protected void addDescriptor(MasterDescriptor descriptor) {
- getMasterDescriptorsById(descriptor.getExtendedOperationId()).add(descriptor);
- }
-
- /**
- * @param descriptor
- */
- protected void addDescriptor(SlaveDescriptor descriptor) {
- getSlaveDescriptorMap().put(descriptor.getOperationClass(), descriptor);
- }
-
- /**
- * @param string
- * @return
- */
- protected List getMasterDescriptorsById(String extendedOperationId) {
- List descs = (List) getMasterDescriptorMap().get(extendedOperationId);
- if (descs == null) {
- getMasterDescriptorMap().put(extendedOperationId, (descs = new ArrayList()));
- }
- return descs;
- }
-
- /**
- * @return
- */
- protected Map getMasterDescriptorMap() {
- if (masterDescriptorMap == null)
- masterDescriptorMap = new HashMap();
- return masterDescriptorMap;
- }
-
- /**
- * @return Returns the slaveDescriptorMap.
- */
- protected Map getSlaveDescriptorMap() {
- if (slaveDescriptorMap == null)
- slaveDescriptorMap = new HashMap();
- return slaveDescriptorMap;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionContentProvider.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionContentProvider.java
deleted file mode 100644
index 2cd231f..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionContentProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPActionContentProvider implements ITreeContentProvider {
-
- /**
- *
- */
- public WTPActionContentProvider() {
- super();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object parentElement) {
- IOperationNode[] children = null;
- if (parentElement instanceof IOperationNode)
- children = ((IOperationNode) parentElement).getChildren();
- return (children != null) ? WTPOptionalOperationDataModel.filterRequiredChildren(children) : new Object[0];
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object element) {
-
- if (element instanceof IOperationNode)
- return ((IOperationNode) element).getParent();
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object element) {
-
- return getChildren(element).length != 0;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- IOperationNode[] elements = null;
- if (inputElement != null && inputElement instanceof WTPOptionalOperationDataModel) {
- IOperationNode root = ((WTPOptionalOperationDataModel) inputElement).getOperationTree();
- if (root != null)
- elements = root.getChildren();
- }
- return (elements != null) ? WTPOptionalOperationDataModel.filterRequiredChildren(elements) : new Object[0];
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionDialog.java
deleted file mode 100644
index a973f45..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionDialog.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPActionDialog extends Dialog implements WTPOperationDataModelListener {
-
- private ITreeViewerListener actionTreeListener;
-
- private ICheckStateListener checkStateListener;
-
- private ISelectionChangedListener updateDescriptionSelectionListener;
-
- private CheckboxTreeViewer checkboxTreeViewer;
-
- Text descriptionText;
-
- private final WTPOptionalOperationDataModel operationDataModel;
-
- /**
- * This action's id, or <code>null</code> if none.
- */
- private String id;
-
- /**
- * @param arg0
- */
- public WTPActionDialog(Shell arg0, WTPOptionalOperationDataModel operationDataModel) {
- super(arg0);
- this.operationDataModel = operationDataModel;
- this.operationDataModel.addListener(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
- return super.createContents(parent);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- getShell().setText(WTPCommonUIResourceHandler.getString("WTPActionDialog_UI_0")); //$NON-NLS-1$
- Composite superComposite = (Composite) super.createDialogArea(parent);
-
- Composite composite = new Composite(superComposite, SWT.NONE);
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0; //convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = 0; //convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = 0; //convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = 0; //convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- // set infopop based on id if id is set
- if (getId() != null)
- WorkbenchHelp.setHelp(composite, getId());
- Label availableFiltersLabel = new Label(composite, SWT.BOLD);
- GridData availableFiltersLabelGridData = new GridData(GridData.FILL_HORIZONTAL);
- availableFiltersLabelGridData.heightHint = convertHeightInCharsToPixels(1);
- availableFiltersLabel.setLayoutData(availableFiltersLabelGridData);
- availableFiltersLabel.setText(WTPCommonUIResourceHandler.getString("WTPActionDialog_UI_0")); //$NON-NLS-1$
-
- checkboxTreeViewer = new CheckboxTreeViewer(composite, SWT.CHECK | SWT.BORDER);
-
- checkboxTreeViewer.setContentProvider(new WTPActionContentProvider());
- checkboxTreeViewer.setLabelProvider(new WTPActionLabelProvider());
-
- checkboxTreeViewer.setInput(this.operationDataModel);
-
- Tree tree = checkboxTreeViewer.getTree();
- GridLayout treeLayout = new GridLayout();
- treeLayout.marginHeight = 0; //convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- treeLayout.marginWidth = 0; //convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- treeLayout.verticalSpacing = 0; //convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- treeLayout.horizontalSpacing = 0; //convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- treeLayout.numColumns = 1;
- GridData treeGridData = new GridData(GridData.FILL_HORIZONTAL);
- treeGridData.widthHint = convertHorizontalDLUsToPixels(225);
- treeGridData.heightHint = convertVerticalDLUsToPixels(150);
- tree.setLayout(treeLayout);
- tree.setLayoutData(treeGridData);
-
- descriptionText = new Text(composite, SWT.BORDER | SWT.WRAP);
- GridData descriptionTextGridData = new GridData(GridData.FILL_HORIZONTAL);
- descriptionTextGridData.heightHint = convertHeightInCharsToPixels(3);
- descriptionText.setLayoutData(descriptionTextGridData);
- descriptionText.setBackground(superComposite.getBackground());
-
- initListeners();
- updateCheckedItems();
-
- return composite;
- }
-
- /**
- *
- */
- protected void initListeners() {
- checkboxTreeViewer.addCheckStateListener(getCheckStateListener());
- checkboxTreeViewer.addSelectionChangedListener(getSelectionListener());
- checkboxTreeViewer.addTreeListener(getActionTreeListener());
- }
-
- /**
- * @return
- */
- protected ICheckStateListener getCheckStateListener() {
- if (checkStateListener == null)
- checkStateListener = new CheckStateListener();
- return checkStateListener;
- }
-
-
-
- public class CheckStateListener implements ICheckStateListener {
-
- public void checkStateChanged(CheckStateChangedEvent event) {
- boolean checked = event.getChecked();
- IOperationNode node = (IOperationNode) event.getElement();
- node.setChecked(checked);
- }
- }
-
- public class TreeViewerListener implements ITreeViewerListener {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeViewerListener#treeCollapsed(org.eclipse.jface.viewers.TreeExpansionEvent)
- */
- public void treeCollapsed(TreeExpansionEvent event) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeViewerListener#treeExpanded(org.eclipse.jface.viewers.TreeExpansionEvent)
- */
- public void treeExpanded(TreeExpansionEvent event) {
- }
- }
-
- public class SelectionChangedListener implements ISelectionChangedListener {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- IStructuredSelection structuredSelection = (IStructuredSelection) event.getSelection();
- Object element = structuredSelection.getFirstElement();
- String text = ""; //$NON-NLS-1$
- if (element instanceof IOperationNode)
- text = ((IOperationNode) element).getDescription();
- descriptionText.setText(text != null ? text : ""); //$NON-NLS-1$
- }
-
- }
-
- /**
- * @return
- */
- private ISelectionChangedListener getSelectionListener() {
- if (updateDescriptionSelectionListener == null)
- updateDescriptionSelectionListener = new SelectionChangedListener();
- return updateDescriptionSelectionListener;
- }
-
- /**
- * @return
- */
- private ITreeViewerListener getActionTreeListener() {
- if (actionTreeListener == null)
- actionTreeListener = new TreeViewerListener();
- return actionTreeListener;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModelListener#propertyChanged(org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModelEvent)
- */
- public void propertyChanged(WTPOperationDataModelEvent event) {
- switch (event.getFlag()) {
- case WTPOperationDataModelEvent.PROPERTY_CHG :
- if (WTPOptionalOperationDataModel.OPERATION_TREE.equals(event.getPropertyName()))
- updateCheckedItems();
- break;
- }
- }
-
- /**
- *
- */
- private void updateCheckedItems() {
- IOperationNode root = (IOperationNode) this.operationDataModel.getProperty(WTPOptionalOperationDataModel.OPERATION_TREE);
- updateCheckedState(root);
-
- }
-
- /**
- * @param root
- */
- private void updateCheckedState(IOperationNode root) {
- if (root == null)
- return;
-
- IOperationNode[] children = root.getChildren();
- if (children == null)
- return;
- for (int i = 0; i < children.length; i++) {
- checkboxTreeViewer.setChecked(children[i], children[i].isChecked());
- boolean disabled = (children[i].getParent() != null) ? children[i].getParent().isChecked() : false;
- checkboxTreeViewer.setGrayed(children[i], disabled);
- updateCheckedState(children[i]);
- }
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionLabelProvider.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionLabelProvider.java
deleted file mode 100644
index 06bfdc4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPActionLabelProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPActionLabelProvider implements ILabelProvider {
-
- /**
- *
- */
- public WTPActionLabelProvider() {
- super();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
-
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object element) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object element) {
- if (element instanceof IOperationNode)
- return ((IOperationNode) element).getName();
-
- return element.toString();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPOperationDataModelUICreator.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPOperationDataModelUICreator.java
deleted file mode 100644
index e8109ac..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPOperationDataModelUICreator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public interface WTPOperationDataModelUICreator {
-
- WTPOperationDataModel createDataModel(String extendedOperationId, String operationClass, IStructuredSelection selection, IWorkbenchSite site);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPOptionalOperationDataModel.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPOptionalOperationDataModel.java
deleted file mode 100644
index 994a92f..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WTPOptionalOperationDataModel.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.common.frameworks.internal.operations.ComposedOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-
-/**
- * @author jsholl
- *
- */
-public class WTPOptionalOperationDataModel extends WTPOperationDataModel {
-
-
-
- /**
- * String, this is required along with a STRUCTURED_SELECTION unless MASTER_OPERATION_LIST is
- * set
- */
- public static final String EXTENDED_OPERATION_ID = "WTPOptionalOperationDataModel.EXTENDED_OPERATION_ID"; //$NON-NLS-1$
-
- /**
- * IStructuredSelection, this is required along with a EXTENDED_OPERATION_ID unless
- * MASTER_OPERATION_LIST is set
- */
- public static final String STRUCTURED_SELECTION = "WTPOptionalOperationDataModel.STRUCTURED_SELECTION"; //$NON-NLS-1$
-
- /**
- * List of MasterDescriptor, required unless both EXTENDED_OPERATION_ID and STRUCTURED_SELECTION
- * are set
- */
- public static final String MASTER_OPERATION_LIST = "WTPOptionalOperationDataModel.MASTER_OPERATION_LIST"; //$NON-NLS-1$
-
- /**
- * A root IOperationNode whose operation is null and children are the contents of the
- * MASTER_OPERATION_LIST
- */
- public static final String OPERATION_TREE = "WTPOptionalOperationDataModel.OPERATION_TREE"; //$NON-NLS-1$
-
- /**
- * Optional. Allow the WTPOperationDataModelUICreators access to the workbench site for
- * additional initializations.
- */
- public static final String IWORKBENCH_SITE = "IWORKBENCH_SITE"; //$NON-NLS-1$
-
- public static WTPOptionalOperationDataModel createDataModel(String extendedOperationId, IStructuredSelection selection) {
- WTPOptionalOperationDataModel dataModel = new WTPOptionalOperationDataModel();
- dataModel.setProperty(EXTENDED_OPERATION_ID, extendedOperationId);
- dataModel.setProperty(STRUCTURED_SELECTION, selection);
- return dataModel;
- }
-
- private class OperationNode implements IOperationNode {
-
- private WTPOperationDataModel dataModel = null;
-
- private SlaveDescriptor descriptor = null;
-
- private List children = null;
-
- private OperationNode parent = null;
-
- private boolean checked = false;
-
- public OperationNode(OperationNode parent, SlaveDescriptor descriptor) {
- this.parent = parent;
- this.descriptor = descriptor;
- verifyRoot();
- }
-
- private void verifyRoot() {
- if (null == parent) {
- return;
- }
- IOperationNode root = getOperationTree();
- OperationNode node = this;
- while (node.parent != null) {
- node = node.parent;
- }
- if (node != root) {
- throw new RuntimeException();
- }
- }
-
- public String getName() {
- return descriptor.getName();
- }
-
- public String getDescription() {
- return descriptor.getDescription();
- }
-
- public WTPOperationDataModel getDataModel() {
- IWorkbenchSite site = (IWorkbenchSite) getProperty(IWORKBENCH_SITE);
- if (dataModel == null) {
- IOperationNode root = getOperationTree();
- if (this.parent == root) {
- MasterDescriptor masterDescriptor = (MasterDescriptor) descriptor;
- dataModel = masterDescriptor.getCreator().createDataModel(masterDescriptor.getExtendedOperationId(), masterDescriptor.getOperationClass(), getStructuredSelection(), site);
- } else
- dataModel = parent.getDataModel();
- }
- return dataModel;
- }
-
- public WTPOperation getOperation() {
- WTPOperation operation = descriptor.createOperation();
- WTPOperationDataModel dataModel1 = getDataModel();
- if (dataModel1 != null) {
- if (operation == null)
- operation = dataModel.getDefaultOperation();
- else
- operation.setOperationDataModel(dataModel);
- }
- return operation;
- }
-
- public IOperationNode[] getChildren() {
- verifyRoot();
- return getChildren(true);
- }
-
- public IOperationNode[] getChildren(boolean expandChildren) {
- if (expandChildren && null == children && null != parent) {
- children = new ArrayList();
- SlaveDescriptor[] slaveDescriptors = UIOperationExtensionRegistry.INSTANCE.getSlaveDescriptors(descriptor.getOperationClass());
- for (int i = 0; null != slaveDescriptors && i < slaveDescriptors.length; i++) {
- OperationNode child = new OperationNode(this, slaveDescriptors[i]);
- child.checked = checked;
- addChild(child);
- }
- }
- if (null == children) {
- return null;
- }
- OperationNode[] childNodes = new OperationNode[children.size()];
- children.toArray(childNodes);
- return childNodes;
- }
-
- public void clearChildren() {
- if (null != children) {
- children.clear();
- }
- }
-
- public void addChild(OperationNode childNode) {
- if (null == children) {
- children = new ArrayList();
- }
- children.add(childNode);
- }
-
- public boolean isChecked() {
- verifyRoot();
- if (descriptor instanceof MasterDescriptor && ((MasterDescriptor) descriptor).isAlwaysExecute())
- return true;
- return checked;
- }
-
- public void setChecked(boolean checked) {
- if (descriptor instanceof MasterDescriptor && ((MasterDescriptor) descriptor).isAlwaysExecute())
- return;
- internalSetChecked(checked);
- Object root = getProperty(OPERATION_TREE);
- notifyListeners(OPERATION_TREE, root, root);
- }
-
- public IOperationNode getParent() {
- return parent;
- }
-
- protected void internalSetChecked(boolean checked1) {
- this.checked = checked1;
- if (checked) {
- OperationNode[] children1 = (OperationNode[]) getChildren(false);
- for (int i = 0; null != children && i < children1.length; i++)
- children1[i].internalSetChecked(checked);
- } else {
- if (this.parent != null)
- this.parent.internalSetChecked(checked);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IOperationNode#isAlwaysExecute()
- */
- public boolean isAlwaysExecute() {
- if (descriptor instanceof MasterDescriptor && ((MasterDescriptor) descriptor).isAlwaysExecute())
- return true;
- return false;
- }
- }
-
- protected void init() {
- super.init();
- setProperty(OPERATION_TREE, new OperationNode(null, null));
- }
-
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(MASTER_OPERATION_LIST);
- addValidBaseProperty(OPERATION_TREE);
- addValidBaseProperty(STRUCTURED_SELECTION);
- addValidBaseProperty(EXTENDED_OPERATION_ID);
- addValidBaseProperty(IWORKBENCH_SITE);
- }
-
- IStructuredSelection getStructuredSelection() {
- return (IStructuredSelection) getProperty(STRUCTURED_SELECTION);
- }
-
- public IOperationNode getOperationTree() {
- return (IOperationNode) getProperty(OPERATION_TREE);
- }
-
- public static IOperationNode[] getOptionalChildren(IOperationNode node) {
- IOperationNode[] children = node.getChildren();
- children = filterRequiredChildren(children);
- return children;
- }
-
- /**
- * @param children
- * @return
- */
- public static IOperationNode[] filterRequiredChildren(IOperationNode[] children) {
- List filteredChildren = new ArrayList(Arrays.asList(children));
- for (int i = 0; i < children.length; i++)
- if (children[i].isAlwaysExecute())
- filteredChildren.remove(children[i]);
- filteredChildren.toArray((children = new IOperationNode[filteredChildren.size()]));
- return children;
- }
-
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- boolean returnVal = super.doSetProperty(propertyName, propertyValue);
- if (propertyName.equals(STRUCTURED_SELECTION) || propertyName.equals(EXTENDED_OPERATION_ID)) {
- String extendedOperationID = getStringProperty(EXTENDED_OPERATION_ID);
- IStructuredSelection selection = (IStructuredSelection) getProperty(STRUCTURED_SELECTION);
- setProperty(MASTER_OPERATION_LIST, UIOperationExtensionRegistry.INSTANCE.getExtendedUIOperations(extendedOperationID, selection));
- }
- if (propertyName.equals(MASTER_OPERATION_LIST)) {
- OperationNode rootNode = (OperationNode) getOperationTree();
- rootNode.clearChildren();
- MasterDescriptor[] descriptors = (MasterDescriptor[]) propertyValue;
- if (null != descriptors) {
- for (int i = 0; i < descriptors.length; i++) {
- OperationNode child = new OperationNode(rootNode, descriptors[i]);
- child.setChecked(true);
- rootNode.addChild(child);
- }
- }
- notifyListeners(OPERATION_TREE, rootNode, rootNode);
- }
- return returnVal;
- }
-
- public WTPOperation getDefaultOperation() {
- ComposedOperation operation = new ComposedOperation();
- OperationNode root = (OperationNode) getOperationTree();
- addOperationIfNecessary(operation, root);
- return operation;
- }
-
- private void addOperationIfNecessary(ComposedOperation operation, OperationNode node) {
- if (node.isAlwaysExecute() || node.isChecked()) {
- WTPOperation op = node.getOperation();
- if (op != null)
- operation.addRunnable(op);
- } else {
- IOperationNode[] children = node.getChildren(false);
- for (int i = 0; null != children && i < children.length; i++)
- addOperationIfNecessary(operation, (OperationNode) children[i]);
- }
- }
-
- private boolean hasSelectedNodes(OperationNode node) {
- if (node.isChecked()) {
- return true;
- }
- boolean foundSelection = false;
- OperationNode[] children = (OperationNode[]) node.getChildren(false);
- for (int i = 0; !foundSelection && null != children && i < children.length; i++) {
- foundSelection = hasSelectedNodes(children[i]);
- }
- return foundSelection;
- }
-
- protected IStatus doValidateProperty(String propertyName) {
- if (propertyName.equals(OPERATION_TREE)) {
- OperationNode root = (OperationNode) getOperationTree();
- if (root.isChecked()) {
- return WTPUIPlugin.createErrorStatus(WTPCommonUIResourceHandler.getString("WTPOptionalOperationDataModel_UI_0")); //$NON-NLS-1$
- } else if (!hasSelectedNodes(root)) {
- return WTPUIPlugin.createErrorStatus(WTPCommonUIResourceHandler.getString("WTPOptionalOperationDataModel_UI_1"));} //$NON-NLS-1$
- }
- return super.doValidateProperty(propertyName);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardExtensionFactory.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardExtensionFactory.java
deleted file mode 100644
index d539adf..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardExtensionFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-public abstract class WizardExtensionFactory {
-
- public WizardExtensionFactory() {
- super();
- }
-
- public abstract IExtendedWizardPage[] createPageGroup(WTPOperationDataModel dataModel, String pageGroupID);
-
- /*
- * this is optional
- */
- public IExtendedPageHandler createPageHandler(WTPOperationDataModel dataModel, String pageGroupID) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageElement.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageElement.java
deleted file mode 100644
index 76f5be1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageElement.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclispe.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-public class WizardPageElement extends AbstractRegistryDescriptor implements Comparable {
- /** Type designation for an {@link ExtendedEditorPage} */
- public static final int EXTENDED_EDITOR_PAGE = 0;
- /** Type designation for a nested editor */
- public static final int NESTED_EDITOR = 1;
- static final String[] EMPTY_STRING_ARRAY = new String[0];
- static final String ELEMENT_PAGE_GROUP = "wizardPageGroup"; //$NON-NLS-1$
- static final String ATT_PAGE_ID = "pageGroupID"; //$NON-NLS-1$
- static final String ATT_WIZARD_ID = "wizardID"; //$NON-NLS-1$
- static final String ATT_GROUP_ID = "groupID"; //$NON-NLS-1$
- static final String ATT_ALLOWS_EXTENDED_PAGES_AFTER = "allowsExtendedPagesAfter"; //$NON-NLS-1$
- static final String ATT_PAGE_INSERTION_ID = "pageGroupInsertionID"; //$NON-NLS-1$
- static final String ELEMENT_FACTORY = "factory"; //$NON-NLS-1$
-
- protected WizardPageFactoryElement wizardPageFactoryElement;
- protected String pluginID;
- protected String wizardID;
- protected String pageGroupID;
- protected String wizardFactoryElement;
- protected boolean allowsExtendedPagesAfter;
- protected String pageInsertionID;
- private int loadOrder;
- private static int loadOrderCounter;
-
-
- private int type;
-
- public WizardPageElement(IConfigurationElement element1) {
- super(element1);
- pluginID = element1.getDeclaringExtension().getDeclaringPluginDescriptor().getUniqueIdentifier();
- wizardID = element1.getAttribute(ATT_WIZARD_ID);
- pageGroupID = element1.getAttribute(ATT_PAGE_ID);
- readAllowsExtendedPageAfter(element1);
- pageInsertionID = element1.getAttribute(ATT_PAGE_INSERTION_ID);
- readFactory(element1);
- validateSettings();
- loadOrder = loadOrderCounter++;
- }
-
- private void validateSettings() {
- if (wizardID == null || wizardPageFactoryElement == null) {
- Logger.getLogger().logError("Incomplete page extension specification."); //$NON-NLS-1$
- }
- }
-
-
- private void readAllowsExtendedPageAfter(IConfigurationElement element1) {
- String allowsPageAfterValue = element1.getAttribute(ATT_ALLOWS_EXTENDED_PAGES_AFTER);
- allowsExtendedPagesAfter = allowsPageAfterValue == null ? false : Boolean.valueOf(allowsPageAfterValue).booleanValue();
- }
-
- private void readFactory(IConfigurationElement element1) {
- IConfigurationElement[] factories = element1.getChildren(ELEMENT_FACTORY);
- if (factories != null && factories.length > 0) {
- wizardPageFactoryElement = new WizardPageFactoryElement(factories[0], pageGroupID);
- }
- }
-
- public IExtendedPageHandler createPageHandler(WTPOperationDataModel dataModel) {
- if (wizardPageFactoryElement != null)
- return wizardPageFactoryElement.createPageHandler(dataModel);
- return null;
- }
-
- public IExtendedWizardPage[] createPageGroup(WTPOperationDataModel dataModel) {
- if (wizardPageFactoryElement != null)
- return wizardPageFactoryElement.createPageGroup(dataModel);
- return null;
- }
-
-
- public int compareTo(Object o) {
- return IdentifiableComparator.getInstance().compare(this, o);
- /*
- * if (o == null) return GREATER_THAN; WizardPageElement element = (WizardPageElement) o; if
- * (getID() == null && element.getID() == null) return compareLoadOrder(element); if
- * (getID() == null) return GREATER_THAN; else if (element.getID() == null) return
- * LESS_THAN;
- *
- * int priority = getPriority(); int elementPriority =element.getPriority();
- *
- * if (priority == elementPriority) return compareLoadOrder(element); if (priority <
- * elementPriority) return GREATER_THAN; if (priority > elementPriority) return LESS_THAN;
- * return EQUAL;
- */
- }
-
- /**
- * @return
- */
- public boolean allowsExtendedPagesAfter() {
- return allowsExtendedPagesAfter;
- }
-
- /**
- * @return
- */
- public String getPluginID() {
- return pluginID;
- }
-
- /**
- * @return
- */
- public String getPageID() {
- return pageGroupID;
- }
-
- /**
- * @return
- */
- public String getPageInsertionID() {
- return pageInsertionID;
- }
-
- /**
- * @return
- */
- public int getType() {
- return type;
- }
-
- /**
- * @return
- */
- public int getLoadOrder() {
- return loadOrder;
- }
-
-
- /**
- * @return Returns the allowsExtendedPagesAfter.
- */
- public boolean isAllowsExtendedPagesAfter() {
- return allowsExtendedPagesAfter;
- }
-
- /**
- * @param allowsExtendedPagesAfter
- * The allowsExtendedPagesAfter to set.
- */
- public void setAllowsExtendedPagesAfter(boolean allowsExtendedPagesAfter) {
- this.allowsExtendedPagesAfter = allowsExtendedPagesAfter;
- }
-
- /**
- * @return Returns the wizardFactoryElement.
- */
- public String getWizardFactoryElement() {
- return wizardFactoryElement;
- }
-
- /**
- * @param wizardFactoryElement
- * The wizardFactoryElement to set.
- */
- public void setWizardFactoryElement(String wizardFactoryElement) {
- this.wizardFactoryElement = wizardFactoryElement;
- }
-
- /**
- * @return Returns the wizardID.
- */
- public String getWizardID() {
- return wizardID;
- }
-
- /**
- * @param wizardID
- * The wizardID to set.
- */
- public void setWizardID(String wizardID) {
- this.wizardID = wizardID;
- }
-
- /**
- * @return Returns the wizardPageFactoryElement.
- */
- public WizardPageFactoryElement getWizardPageFactoryElement() {
- return wizardPageFactoryElement;
- }
-
- /**
- * @param wizardPageFactoryElement
- * The wizardPageFactoryElement to set.
- */
- public void setWizardPageFactoryElement(WizardPageFactoryElement wizardPageFactoryElement) {
- this.wizardPageFactoryElement = wizardPageFactoryElement;
- }
-
-
- /**
- * @param pageID
- * The pageID to set.
- */
- public void setPageID(String pageID) {
- this.pageGroupID = pageID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.AbstractRegistryDescriptor#getID()
- */
- public String getID() {
- return getPageID();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageExtensionManager.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageExtensionManager.java
deleted file mode 100644
index 7e97e40..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageExtensionManager.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPCommonUIResourceHandler;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementManager;
-
-import com.ibm.wtp.common.RegistryReader;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-public class WizardPageExtensionManager {
-
- public static final String ORG_ECLIPSE_UI = "org.eclipse.ui"; //$NON-NLS-1$
-
- protected static WizardPageExtensionManager instance = null;
-
- HashMap wizardPluginIDMap = null;
-
- TreeMap wizardPageElements = null;
-
- //private TreeSet wizardExtPageElements = null;
- List nonSyncedPageElementList = null;
-
- private WizardPageExtensionReader reader = null;
-
- private WizardPageExtensionManager() {
- setupWizardPluginIDMap();
- readFromRegistry();
- postReadFromRegistry();
- }
-
- private void setupWizardPluginIDMap() {
- wizardPluginIDMap = new HashMap();
- // get editor plugin and save it to a hash map
- // Note: editors extension id is different from editor id
-
- IExtensionPoint[] point = new IExtensionPoint[]{Platform.getPluginRegistry().getExtensionPoint(ORG_ECLIPSE_UI, "exportWizards"), //$NON-NLS-1$
- Platform.getPluginRegistry().getExtensionPoint(ORG_ECLIPSE_UI, "importWizards"), //$NON-NLS-1$
- Platform.getPluginRegistry().getExtensionPoint(ORG_ECLIPSE_UI, "newWizards"), //$NON-NLS-1$
- Platform.getPluginRegistry().getExtensionPoint("org.eclipse.wst.common.frameworks.ui", "extendableWizard")}; //$NON-NLS-1$ //$NON-NLS-2$
-
- for (int x = 0; x < point.length; x++) {
- IConfigurationElement[] elements = point[x].getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- String wizardID = elements[i].getAttribute("id"); //$NON-NLS-1$
- String pluginID = elements[i].getDeclaringExtension().getDeclaringPluginDescriptor().getUniqueIdentifier();
- wizardPluginIDMap.put(wizardID, pluginID);
- }
- }
- }
-
- private void readFromRegistry() {
- wizardPageElements = new TreeMap();
- //wizardExtPageElements = new TreeSet();
- nonSyncedPageElementList = new ArrayList();
- // Read all page extensions into editorPageElements
- reader = new WizardPageExtensionReader();
- reader.readRegistry();
-
- }
-
- protected class WizardPageExtensionReader extends RegistryReader {
-
- public WizardPageExtensionReader() {
- super(CommonUIPluginConstants.PLUGIN_ID, WizardPageElement.ELEMENT_PAGE_GROUP);
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (!WizardPageElement.ELEMENT_PAGE_GROUP.equals(element.getName()))
- return false;
- WizardPageElement newElement = new WizardPageElement(element);
-
- // put the element into a hashmap, wizardID as key,
- // list of page elements as object
- String wizardID = newElement.getWizardID();
- if (!wizardPageElements.containsKey(wizardID)) {
- wizardPageElements.put(wizardID, createPageMapEntry(newElement));
- } else {
- TreeMap pageMap = (TreeMap) wizardPageElements.get(wizardID);
- insertPageElement(pageMap, newElement);
- }
-
- return true;
- }
-
- public void insertPageElement(TreeMap pageMap, WizardPageElement newElement) {
- if (newElement.pageInsertionID == null) {
- pageMap.put(newElement, new TreeSet());
- } else {
- String elementName = newElement.pageInsertionID;
- WizardPageElement parentElement = getPageElement(elementName, pageMap);
- insertExtPageElement(pageMap, parentElement, newElement);
- }
-
- newElement.getPageInsertionID();
-
- }
-
- private void insertExtPageElement(TreeMap pageMap, WizardPageElement parentElement, WizardPageElement newElement) {
- if (parentElement == null) {
- nonSyncedPageElementList.add(newElement);
- return;
- }
- if (!parentElement.allowsExtendedPagesAfter()) {
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString("WizardPageExtensionManager_UI_0", new Object[]{parentElement.getPageID()})); //$NON-NLS-1$
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString("WizardPageExtensionManager_UI_1", new Object[]{newElement.getPageID()})); //$NON-NLS-1$
- return;
- }
- TreeSet set = (TreeSet) pageMap.get(parentElement);
- set.add(newElement);
-
- if (newElement.allowsExtendedPagesAfter)
- pageMap.put(newElement, new TreeSet());
-
- if (nonSyncedPageElementList.contains(newElement))
- nonSyncedPageElementList.remove(newElement);
- }
-
- private WizardPageElement getPageElement(String elementName, TreeMap map) {
- Set keySet = map.keySet();
- for (Iterator iter = keySet.iterator(); iter.hasNext();) {
- WizardPageElement element = (WizardPageElement) iter.next();
- if (element.getPageID().equals(elementName))
- return element;
- }
- return null;
-
- }
-
- private TreeMap createPageMapEntry(WizardPageElement newElement) {
- TreeMap pageMap = new TreeMap();
- TreeSet pageExtensionSet = new TreeSet();
- pageMap.put(newElement, pageExtensionSet);
- return pageMap;
-
- }
-
- }
-
- public boolean hasExtensionElements(String wizardID) {
- TreeMap treeMap = (TreeMap) wizardPageElements.get(wizardID);
- return treeMap.isEmpty();
- }
-
- public WizardPageElement[] getPageElements(String wizardID) {
- TreeMap elementMap = (TreeMap) wizardPageElements.get(wizardID);
- if (elementMap == null || elementMap.isEmpty()) {
- return new WizardPageElement[0];
- }
- ArrayList alreadyVistedList = new ArrayList(elementMap.size());
- Set allPageElementsList = elementMap.keySet();
- ArrayList orderedPageList = new ArrayList(elementMap.size());
-
- for (Iterator iter = allPageElementsList.iterator(); iter.hasNext();) {
- WizardPageElement element = (WizardPageElement) iter.next();
- if (alreadyVistedList.contains(element))
- continue;
- if (EnablementManager.INSTANCE.getIdentifier(element.getID(), null).isEnabled()) {
- orderedPageList.add(element);
- TreeSet treeSet = (TreeSet) elementMap.get(element);
- if (treeSet != null && !treeSet.isEmpty())
- flatenTreeSet(treeSet, allPageElementsList, alreadyVistedList, orderedPageList, elementMap);
- }
- }
- return getPageArray(orderedPageList);
-
- }
-
- private WizardPageElement[] getPageArray(ArrayList orderedPageList) {
- WizardPageElement[] pageElements = new WizardPageElement[orderedPageList.size()];
- for (int i = 0; i < orderedPageList.size(); i++) {
- pageElements[i] = (WizardPageElement) orderedPageList.get(i);
- }
- return pageElements;
- }
-
- private void flatenTreeSet(TreeSet treeSet, Set allPageElementsList, ArrayList alreadyVistedList, ArrayList orderedPageList, TreeMap elementMap) {
- for (Iterator iter = treeSet.iterator(); iter.hasNext();) {
- WizardPageElement element = (WizardPageElement) iter.next();
- if (alreadyVistedList.contains(element)) {
- Logger.getLogger().logError(WTPCommonUIResourceHandler.getString("WizardPageExtensionManager_UI_2", new Object[]{element.getPageID(), WizardPageElement.ATT_PAGE_INSERTION_ID})); //$NON-NLS-1$
- return;
- }
- if (allPageElementsList.contains(element)) {
- TreeSet set = (TreeSet) elementMap.get(element);
- orderedPageList.add(element);
- alreadyVistedList.add(element);
- flatenTreeSet(set, allPageElementsList, alreadyVistedList, orderedPageList, elementMap);
- } else {
- orderedPageList.add(element);
- alreadyVistedList.add(element);
- }
-
- }
-
- }
-
- // if child elements are read in before parent element. Do post read.
- protected ArrayList listRemoveObjects;
-
- private void postReadFromRegistry() {
- listRemoveObjects = new ArrayList(nonSyncedPageElementList.size());
- for (int i = 0; i < nonSyncedPageElementList.size(); i++) {
- WizardPageElement element = (WizardPageElement) nonSyncedPageElementList.get(i);
- TreeMap pageMap = (TreeMap) wizardPageElements.get(element.wizardID);
- if (element.pageInsertionID == null) {
- addToFirstAvialiable(pageMap, element);
- } else if (reader != null && pageMap != null)
- reader.insertPageElement(pageMap, element);
- }
- nonSyncedPageElementList.removeAll(listRemoveObjects);
- if (!nonSyncedPageElementList.isEmpty())
- logMissingClassError();
- nonSyncedPageElementList.clear();
-
- }
-
- /**
- * @param pageMap
- * @param element
- */
- private void addToFirstAvialiable(TreeMap pageMap, WizardPageElement newElement) {
- boolean insertNotFound = true;
- for (Iterator iter = pageMap.keySet().iterator(); iter.hasNext();) {
- WizardPageElement element = (WizardPageElement) iter.next();
- if (element.allowsExtendedPagesAfter) {
- TreeSet set = (TreeSet) pageMap.get(element);
- set.add(newElement);
- listRemoveObjects.add(newElement);
- return;
- }
- }
- if (insertNotFound) {
- Logger logger = Logger.getLogger();
- logger.logError(WTPCommonUIResourceHandler.getString("WizardPageExtensionManager_UI_3")); //$NON-NLS-1$
- }
-
- }
-
- private void logMissingClassError() {
- Logger logger = Logger.getLogger();
- for (int i = 0; i < nonSyncedPageElementList.size(); i++) {
- WizardPageElement element = (WizardPageElement) nonSyncedPageElementList.get(i);
- logger.logError(WTPCommonUIResourceHandler.getString("WizardPageExtensionManager_UI_4", new Object[]{element.pageInsertionID, element.getPageID(), element.pluginID})); //$NON-NLS-1$
- }
- nonSyncedPageElementList.clear();
-
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a EjbPageExtensionRegistry
- */
- public static WizardPageExtensionManager getInstance() {
- if (instance == null) {
- instance = new WizardPageExtensionManager();
- }
- return instance;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageFactoryElement.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageFactoryElement.java
deleted file mode 100644
index 802ae5d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/WizardPageFactoryElement.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 20, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operation.extensionui;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.ConfigurationElementWrapper;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WizardPageFactoryElement extends ConfigurationElementWrapper {
-
- static final String ATT_CLASS_NAME = "className"; //$NON-NLS-1$
-
- protected String className;
- protected WizardExtensionFactory wizardPageFactory;
- protected boolean isPageFactoryInitialized;
- protected String pageGroupID;
-
- /**
- * @param element
- */
- public WizardPageFactoryElement(IConfigurationElement element, String pageGroupID) {
- super(element);
- className = element.getAttribute(ATT_CLASS_NAME);
- this.pageGroupID = pageGroupID;
- }
-
- public IExtendedPageHandler createPageHandler(WTPOperationDataModel dataModel) {
- if (!isPageFactoryInitialized)
- initPageFactory();
- if (wizardPageFactory == null)
- return null;
-
- IExtendedPageHandler handler = wizardPageFactory.createPageHandler(dataModel, pageGroupID);
- return handler;
- }
-
- public IExtendedWizardPage[] createPageGroup(WTPOperationDataModel dataModel) {
- if (!isPageFactoryInitialized)
- initPageFactory();
-
- if (wizardPageFactory == null)
- return null;
-
- IExtendedWizardPage[] pages = wizardPageFactory.createPageGroup(dataModel, pageGroupID);
- for (int i = 0; i < pages.length; i++) {
- pages[i].setGroupID(pageGroupID);
- }
- return pages;
- }
-
- private void initPageFactory() {
- try {
- wizardPageFactory = (WizardExtensionFactory) element.createExecutableExtension(ATT_CLASS_NAME);
- } catch (CoreException e) {
- Logger.getLogger().logError("Error getting page factory: " + className); //$NON-NLS-1$
- Logger.getLogger().logError(e);
- } finally {
- isPageFactoryInitialized = true;
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/AbstractWTPUIPlugin.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/AbstractWTPUIPlugin.java
deleted file mode 100644
index b2477db..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/AbstractWTPUIPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Dec 10, 2003
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-import com.ibm.wtp.logger.proxyrender.DefaultPluginTraceRenderer;
-import com.ibm.wtp.logger.proxyrender.IMsgLogger;
-
-public abstract class AbstractWTPUIPlugin extends AbstractUIPlugin implements IMsgLogger {
- protected static Logger logger = null;
-
- /**
- * @param descriptor
- */
- public AbstractWTPUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- }
-
- public Logger getMsgLogger() {
- if (logger == null) {
- logger = Logger.getLogger(getPluginID());
- setRenderer(logger);
- }
- return logger;
- }
-
- public abstract String getPluginID();
-
- /**
- * @param aLogger
- */
- protected void setRenderer(Logger aLogger) {
- new DefaultPluginTraceRenderer(aLogger);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ClosableWizardDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ClosableWizardDialog.java
deleted file mode 100644
index 7316c8b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ClosableWizardDialog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 24, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ClosableWizardDialog extends WizardDialog {
- /**
- * @param parentShell
- * @param newWizard
- */
- public ClosableWizardDialog(Shell parentShell, IWizard newWizard) {
- super(parentShell, newWizard);
- }
-
- public void finishAndClose() {
- super.finishPressed();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DisplayUtility.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DisplayUtility.java
deleted file mode 100644
index 647f58e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/DisplayUtility.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 19, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author mdelder
- */
-public class DisplayUtility {
-
- public static void asyncExec(Runnable runnable) {
-
- Display d = Display.getCurrent();
- if (d == null)
- Display.getDefault().asyncExec(runnable);
- else
- runnable.run();
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ErrorDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ErrorDialog.java
deleted file mode 100644
index 9cd3cf1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ErrorDialog.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Added a Details button to the MessageDialog to show the exception stack trace.
- *
- * Borrowed from an eclipse InternalErrorDialog
- */
-public class ErrorDialog extends MessageDialog {
- protected static final String[] LABELS_OK = {IDialogConstants.OK_LABEL};
- protected static final String[] LABELS_OK_CANCEL = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL};
- protected static final String[] LABELS_OK_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- protected static final String[] LABELS_OK_CANCEL_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- private Throwable detail;
- private int detailButtonID = -1;
- private Text text;
- private String message;
- //Workaround. SWT does not seem to set the default button if
- //there is not control with focus. Bug: 14668
- private int defaultButtonIndex = 0;
- /**
- * Size of the text in lines.
- */
- private static final int TEXT_LINE_COUNT = 15;
-
- public ErrorDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, Throwable detail, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- defaultButtonIndex = defaultIndex;
- this.detail = detail;
- message = dialogMessage;
- setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.RESIZE);
- }
-
- //Workaround. SWT does not seem to set rigth the default button if
- //there is not control with focus. Bug: 14668
- public int open() {
- create();
- Button b = getButton(defaultButtonIndex);
- b.setFocus();
- b.getShell().setDefaultButton(b);
- return super.open();
- }
-
- /**
- * Set the detail button;
- */
- public void setDetailButton(int index) {
- detailButtonID = index;
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == detailButtonID) {
- toggleDetailsArea();
- } else {
- setReturnCode(buttonId);
- close();
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- private void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- if (text != null) {
- text.dispose();
- text = null;
- getButton(detailButtonID).setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- createDropDownText((Composite) getContents());
- getButton(detailButtonID).setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
- Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- /**
- * Create this dialog's drop-down list component.
- *
- * @param parent
- * the parent composite
- * @return the drop-down list component
- */
- protected void createDropDownText(Composite parent) {
- // create the list
- text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- // print the stacktrace in the text field
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(baos);
- detail.printStackTrace(ps);
- if ((detail instanceof SWTError) && (((SWTError) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTError) detail).throwable.printStackTrace(ps);
- } else if ((detail instanceof SWTException) && (((SWTException) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTException) detail).throwable.printStackTrace(ps);
- }
- ps.flush();
- baos.flush();
- text.setText(baos.toString());
- } catch (IOException e) {
- }
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- data.heightHint = text.getLineHeight() * TEXT_LINE_COUNT;
- text.setLayoutData(data);
- }
-
- public static boolean openError(Shell parent, String title, String message, Throwable detail, int defaultIndex, boolean showCancel) {
- String[] labels;
- if (detail == null)
- labels = showCancel ? LABELS_OK_CANCEL : LABELS_OK;
- else
- labels = showCancel ? LABELS_OK_CANCEL_DETAILS : LABELS_OK_DETAILS;
- ErrorDialog dialog = new ErrorDialog(parent, title, null, // accept
- // the
- // default
- // window
- // icon
- message, detail, ERROR, labels, defaultIndex);
- if (detail != null)
- dialog.setDetailButton(labels.length - 1);
- return dialog.open() == 0;
- }
-
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- ((GridLayout) composite.getLayout()).numColumns = 2;
- // create image
- Image image = composite.getDisplay().getSystemImage(SWT.ICON_ERROR);
- if (image != null) {
- Label label = new Label(composite, 0);
- image.setBackground(label.getBackground());
- label.setImage(image);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING));
- }
- // create message
- if (message != null) {
- Label label = new Label(composite, SWT.WRAP);
- label.setText(message);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
- ;
- label.setLayoutData(data);
- label.setFont(parent.getFont());
- }
- return composite;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/GenericWizardNode.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/GenericWizardNode.java
deleted file mode 100644
index 62d4cec..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/GenericWizardNode.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * @version 1.0
- * @author
- */
-public abstract class GenericWizardNode implements IWizardNode {
-
- protected IWizard wizard;
-
- /**
- * Constructor for GenericWizardNode.
- */
- public GenericWizardNode() {
- super();
- }
-
- /*
- * @see IWizardNode#dispose()
- */
- public void dispose() {
- if (wizard != null)
- wizard.dispose();
- }
-
- /*
- * @see IWizardNode#getContents()
- */
- public Point getContents() {
- return null;
- }
-
- public final IWizard getWizard() {
- if (wizard == null)
- wizard = createWizard();
- return wizard;
- }
-
- /**
- * Subclasses must override to create the wizard
- */
- protected abstract IWizard createWizard();
-
- /*
- * @see IWizardNode#isContentCreated()
- */
- public boolean isContentCreated() {
- return wizard != null;
- }
-
- /**
- * @see org.eclipse.jface.wizard.IWizardNode#getExtent()
- */
- public Point getExtent() {
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListMessageDialog.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListMessageDialog.java
deleted file mode 100644
index aed38af..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListMessageDialog.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 5, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author dfholt
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class ListMessageDialog extends MessageDialog {
- protected String[] listItems;
- protected List list;
-
- /**
- * EJBSelectiveImportDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- }
-
- /**
- * ListMessageDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex, String[] names) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- listItems = names;
- }
-
- /**
- * Creates and returns the contents of an area of the dialog which appears below the message and
- * above the button bar.
- * <p>
- * The default implementation of this framework method returns <code>null</code>. Subclasses
- * may override.
- * </p>
- *
- * @param the
- * parent composite to contain the custom area
- * @return the custom area control, or <code>null</code>
- */
- protected Control createCustomArea(Composite parent) {
-
- Composite composite = new Composite(parent, 0);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- if (listItems != null) {
- list = new List(composite, SWT.BORDER);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- list.setLayoutData(data);
- list.setItems(listItems);
- }
-
- return composite;
-
- }
-
- /**
- * Convenience method to open a simple confirm (OK/Cancel) dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openConfirm(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0, items); // OK
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard error dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openError(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, ERROR, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is the
- // default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a standard information dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openInformation(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, INFORMATION, new String[]{IDialogConstants.OK_LABEL}, 0, items);
- // ok is the default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a simple Yes/No question dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openQuestion(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0, items); // yes
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard warning dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openWarning(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, WARNING, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is
- // the
- // default
- dialog.open();
- return;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListenerList.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListenerList.java
deleted file mode 100644
index ce56714..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ListenerList.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-
-
-import java.awt.event.ActionListener;
-
-public class ListenerList {
- private final static ActionListener[] NULL_ARRAY = new ActionListener[0];
- protected transient ActionListener[] listenerList = NULL_ARRAY;
-
- /**
- * Add the listener as a listener of the specified type.
- *
- * @param t
- * the type of the listener to be added
- * @param l
- * the listener to be added
- */
- public synchronized void add(ActionListener l) {
- if (l == null)
- return;
- if (listenerList == NULL_ARRAY) {
- // if this is the first listener added,
- // initialize the lists
- listenerList = new ActionListener[]{l};
- } else {
- // Otherwise copy the array and add the new listener
- int i = listenerList.length;
- ActionListener[] tmp = new ActionListener[i + 1];
- System.arraycopy(listenerList, 0, tmp, 0, i);
-
- tmp[i + 1] = l;
-
- listenerList = tmp;
- }
- }
-
- /**
- * Return the total number of listeners for this listenerlist
- */
- public int getListenerCount() {
- return listenerList.length;
- }
-
- public ActionListener[] getListenerList() {
- return listenerList;
- }
-
- public synchronized void remove(ActionListener l) {
- if (l == null)
- return;
- int index = -1;
- for (int i = listenerList.length - 1; i >= 0; i -= 1) {
- if (listenerList[i].equals(l)) {
- index = i;
- break;
- }
- }
- if (index != -1) {
- ActionListener[] tmp = new ActionListener[listenerList.length - 1];
- // Copy the list up to index
- System.arraycopy(listenerList, 0, tmp, 0, index);
- // Copy from two past the index, up to
- // the end of tmp (which is two elements
- // shorter than the old list)
- if (index < tmp.length)
- System.arraycopy(listenerList, index + 1, tmp, index, tmp.length - index);
- // set the listener array to the new array or null
- listenerList = (tmp.length == 0) ? NULL_ARRAY : tmp;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/NewProjectGroup.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/NewProjectGroup.java
deleted file mode 100644
index 3faf52d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/NewProjectGroup.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.io.File;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class NewProjectGroup {
- private ProjectCreationDataModel model;
- public Text projectNameField = null;
- protected Text locationPathField = null;
- protected Button browseButton = null;
- // constants
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- // default values
- private String defProjectNameLabel = WTPCommonUIResourceHandler.getString("Name_"); //$NON-NLS-1$
- private String defBrowseButtonLabel = WTPCommonUIResourceHandler.getString("Browse_");//$NON-NLS-1$
- private static final String defDirDialogLabel = "Directory"; //$NON-NLS-1$
-
- private WTPDataModelSynchHelper synchHelper;
-
- /**
- * @param parent
- * @param style
- */
- public NewProjectGroup(Composite parent, int style, ProjectCreationDataModel model) {
- this.model = model;
- synchHelper = new WTPDataModelSynchHelper(model);
- buildComposites(parent);
- }
-
- /**
- * Create the controls within this composite
- */
- public void buildComposites(Composite parent) {
- createProjectNameGroup(parent);
- createProjectLocationGroup(parent);
- projectNameField.setFocus();
- }
-
- /**
- *
- */
- private void createProjectNameGroup(Composite parent) {
- // set up project name label
- Label projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(defProjectNameLabel);
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameField = new Text(parent, SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- projectNameField.setLayoutData(data);
- new Label(parent, SWT.NONE); // pad
- synchHelper.synchText(projectNameField, ProjectCreationDataModel.PROJECT_NAME, new Control[]{projectNameLabel});
- }
-
- /**
- *
- */
- private void createProjectLocationGroup(Composite parent) {
- // set up location path label
- Label locationPathLabel = new Label(parent, SWT.NONE);
- locationPathLabel.setText(WTPCommonUIResourceHandler.getString("Project_location_"));//$NON-NLS-1$
- GridData data = new GridData();
- locationPathLabel.setLayoutData(data);
- // set up location path entry field
- locationPathField = new Text(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- locationPathField.setLayoutData(data);
- // set up browse button
- browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- handleLocationBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
- synchHelper.synchText(locationPathField, ProjectCreationDataModel.PROJECT_LOCATION, null);
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleLocationBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
- dialog.setMessage(defDirDialogLabel);
- String dirName = model.getStringProperty(ProjectCreationDataModel.PROJECT_LOCATION);
- if ((dirName != null) && (dirName.length() != 0)) {
- File path = new File(dirName);
- if (path.exists()) {
- dialog.setFilterPath(dirName);
- }
- }
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null) {
- model.setProperty(ProjectCreationDataModel.PROJECT_LOCATION, selectedDirectory);
- }
- }
-
- public void dispose() {
- model.removeListener(synchHelper);
- synchHelper.dispose();
- model = null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/OverlayIcon.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/OverlayIcon.java
deleted file mode 100644
index a52cbe9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/OverlayIcon.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2000, 2001, 2002 - All Rights
- * Reserved. US Government Users Restricted Rights - Use, duplication or disclosure restricted by
- * GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-public class OverlayIcon extends org.eclipse.jface.resource.CompositeImageDescriptor {
- // //$NON-NLS-1$
- static final int DEFAULT_WIDTH = 16;
- static final int DEFAULT_HEIGHT = 16;
- private Point fSize = null;
- private ImageDescriptor fBase;
- private ImageDescriptor fOverlays[][];
-
- public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays) {
- fBase = base;
- if (fBase == null)
- fBase = ImageDescriptor.getMissingImageDescriptor();
- fOverlays = overlays;
- fSize = new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
- }
-
- public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays, Point size) {
- fBase = base;
- if (fBase == null)
- fBase = ImageDescriptor.getMissingImageDescriptor();
- fOverlays = overlays;
- fSize = size;
- }
-
- protected void drawBottomLeft(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = 0;
- for (int i = 0; i < 3; i++) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- drawImage(id, x, getSize().y - id.height);
- x += id.width;
- }
- }
- }
-
- protected void drawBottomRight(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = getSize().x;
- for (int i = 2; i >= 0; i--) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- x -= id.width;
- drawImage(id, x, getSize().y - id.height);
- }
- }
- }
-
- protected void drawCompositeImage(int width, int height) {
- ImageData bg = fBase.getImageData();
- drawImage(bg, 0, 0);
-
- if (fOverlays != null) {
- if (fOverlays.length > 0)
- drawTopRight(fOverlays[0]);
-
- if (fOverlays.length > 1)
- drawBottomRight(fOverlays[1]);
-
- if (fOverlays.length > 2)
- drawBottomLeft(fOverlays[2]);
-
- if (fOverlays.length > 3)
- drawTopLeft(fOverlays[3]);
- }
- }
-
- protected void drawTopLeft(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = 0;
- for (int i = 0; i < 3; i++) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- drawImage(id, x, 0);
- x += id.width;
- }
- }
- }
-
- protected void drawTopRight(ImageDescriptor[] overlays) {
- if (overlays == null)
- return;
- int length = overlays.length;
- int x = getSize().x;
- for (int i = 2; i >= 0; i--) {
- if (i < length && overlays[i] != null) {
- ImageData id = overlays[i].getImageData();
- x -= id.width;
- drawImage(id, x, 0);
- }
- }
- }
-
- protected Point getSize() {
- return fSize;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableWithProgressWrapper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableWithProgressWrapper.java
deleted file mode 100644
index 9a91f1f..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/RunnableWithProgressWrapper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-
-/**
- * This is a wrapper for our IHeadlessRunnableWithProgress to the IRunnableWithProgress. This class
- * needs to be used when running the operation from a IRunnableContext.
- *
- * @see IRunnableContext
- * @see JavaUIPlugin#getRunnableWithProgress Creation date: (5/8/2001 1:28:45 PM)
- * @author: Administrator
- */
-public class RunnableWithProgressWrapper implements org.eclipse.jface.operation.IRunnableWithProgress {
- // //$NON-NLS-1$
- private IHeadlessRunnableWithProgress headlessRunnable;
-
- /**
- * RunnableWithProgressWrapper constructor comment.
- */
- public RunnableWithProgressWrapper(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- setHeadlessRunnable(aHeadlessRunnableWithProgress);
- }
-
- /**
- * Insert the method's description here. Creation date: (5/8/2001 1:29:52 PM)
- *
- * @return com.ibm.etools.j2ee.operations.IHeadlessRunnableWithProgress
- */
- protected org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress getHeadlessRunnable() {
- return headlessRunnable;
- }
-
- /**
- * Runs this operation. Progress should be reported to the given progress monitor. This method
- * is usually invoked by an <code>IRunnableContext</code>'s<code>run</code> method, which
- * supplies the progress monitor. A request to cancel the operation should be honored and
- * acknowledged by throwing <code>InterruptedException</code>.
- *
- * @param monitor
- * the progress monitor to use to display progress and receive requests for
- * cancelation
- * @exception InvocationTargetException
- * if the run method must propagate a checked exception, it should wrap it inside
- * an <code>InvocationTargetException</code>; runtime exceptions are
- * automatically wrapped in an <code>InvocationTargetException</code> by the
- * calling context
- * @exception InterruptedException
- * if the operation detects a request to cancel, using
- * <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableContext#run
- */
- public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, java.lang.InterruptedException {
- getHeadlessRunnable().run(monitor);
- }
-
- /**
- * Insert the method's description here. Creation date: (5/8/2001 1:29:52 PM)
- *
- * @param newHeadlessRunnable
- * com.ibm.etools.j2ee.operations.IHeadlessRunnableWithProgress
- */
- protected void setHeadlessRunnable(org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress newHeadlessRunnable) {
- headlessRunnable = newHeadlessRunnable;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SaveHandlerUI.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SaveHandlerUI.java
deleted file mode 100644
index 2309b78..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/SaveHandlerUI.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.frameworks.internal.ISaveHandler;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-public class SaveHandlerUI implements ISaveHandler {
- public static final String SAVE_FAILED = WTPCommonPlugin.getResourceString("16"); //$NON-NLS-1$
- public static final String BEGINNING_MESSAGE = WTPCommonPlugin.getResourceString("17"); //$NON-NLS-1$
- protected boolean isYesToAll = false;
- protected int referenceCount = 0;
-
- /**
- * SaveHandlerUI constructor comment.
- */
- public SaveHandlerUI() {
- super();
- }
-
- /**
- * access method comment.
- */
- public void access() {
- referenceCount++;
- }
-
- protected Shell getParentShellForDialog() {
- if (Display.getCurrent() != null)
- return Display.getCurrent().getActiveShell();
-
- return null;
- }
-
- protected Display getDisplay() {
- Display result = Display.getCurrent();
- return result == null ? Display.getDefault() : result;
- }
-
- public void handleSaveFailed(SaveFailedException ex, IProgressMonitor monitor) {
- if (referenceCount > 1)
- //Let the outermost reference handle it
- throw ex;
- String exMsg = ex.getInnerMostNestedException() == null ? ex.getMessage() : ex.getInnerMostNestedException().getMessage();
- final String message = BEGINNING_MESSAGE + ":\n" + exMsg;//$NON-NLS-1$
- getDisplay().syncExec(new Runnable() {
- public void run() {
- MessageDialog.openError(getParentShellForDialog(), SAVE_FAILED, message);
- }
- });
- if (monitor != null)
- monitor.setCanceled(true);
- else
- throw ex;
- }
-
- protected boolean promptUserToSaveReadOnly(IFile aFile) {
-
- String[] buttonStrings = {WTPCommonPlugin.getResourceString("Yes_UI_"), WTPCommonPlugin.getResourceString("Yes_To_All_UI_"), WTPCommonPlugin.getResourceString("No_UI_")}; //$NON-NLS-3$ = "No" //$NON-NLS-2$ = "Yes To All" //$NON-NLS-1$ = "Yes"
- String title = WTPCommonPlugin.getResourceString("Saving_Read-Only_File_UI_"); //$NON-NLS-1$ = "Saving Read-Only File"
- String message = WTPCommonPlugin.getResourceString("2concat_INFO_", (new Object[]{aFile.getFullPath()})); //$NON-NLS-1$ = "The file {0} is read-only and cannot be saved. Would you like to make it editable and save anyway?"
-
- final MessageDialog dialog = new MessageDialog(getParentShellForDialog(), title, null, // accept
- // the
- // default
- // window
- // icon
- message, MessageDialog.QUESTION, buttonStrings, 0); // Yes is the default
-
- final int[] ret = new int[1];
- getDisplay().syncExec(new Runnable() {
- public void run() {
- dialog.setBlockOnOpen(true);
- ret[0] = dialog.open();
- }
- });
-
- switch (ret[0]) {
- case 0 : {
- return true;
- }
- case 1 : {
- isYesToAll = true;
- return true;
- }
- case 2 : {
- return false;
- }
- }
- return false;
- }
-
- /**
- * release method comment.
- */
- public void release() {
- referenceCount--;
- if (referenceCount == 0)
- isYesToAll = false;
-
- }
-
- /**
- * shouldContinueAndMakeFileEditable method comment.
- */
- public boolean shouldContinueAndMakeFileEditable(IFile aFile) {
- boolean yes = isYesToAll || promptUserToSaveReadOnly(aFile);
- if (yes)
- aFile.setReadOnly(false);
-
- return yes;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedKeyListener.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedKeyListener.java
deleted file mode 100644
index 0106d52..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedKeyListener.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import java.awt.event.ActionListener;
-
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseTrackListener;
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * Insert the type's description here. Creation date: (8/30/2001 4:00:28 PM)
- *
- * @author: Administrator
- */
-public class TimedKeyListener extends Timer implements KeyListener, MouseListener, MouseTrackListener, ModifyListener {
-
- protected Widget monitoringTarget;
-
- private final static int TIME_LIMIT = 200;
-
- /**
- * J2EETimedKeyListener constructor comment.
- *
- * @param delay
- * int
- * @param listener
- * java.awt.event.ActionListener
- */
- public TimedKeyListener(int delay, ActionListener listener) {
- super(delay, listener);
- setRepeats(false);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/30/2001 4:43:33 PM)
- *
- * @param a
- * java.awt.event.ActionListener
- */
- public TimedKeyListener(ActionListener listener) {
- this(TIME_LIMIT, listener);
- }
-
- /**
- * Sent when a key is pressed on the system keyboard.
- *
- * @param e
- * an event containing information about the key press
- */
- public void keyPressed(org.eclipse.swt.events.KeyEvent e) {
- }
-
- /**
- * Sent when a key is released on the system keyboard.
- *
- * @param e
- * an event containing information about the key release
- */
- public void keyReleased(org.eclipse.swt.events.KeyEvent e) {
- // Replaced with SWT.Modify -- see modifyText() in this class
- // monitoringTarget = (Widget) e.getSource();
- // restart();
- }
-
- /**
- * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(MouseEvent)
- */
- public void mouseDoubleClick(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseListener#mouseDown(MouseEvent)
- */
- public void mouseDown(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseListener#mouseUp(MouseEvent)
- */
- public void mouseUp(MouseEvent e) {
- monitoringTarget = (Widget) e.getSource();
- restart();
- }
-
- /**
- * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter(MouseEvent)
- */
- public void mouseEnter(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseTrackListener#mouseExit(MouseEvent)
- */
- public void mouseExit(MouseEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.MouseTrackListener#mouseHover(MouseEvent)
- */
- public void mouseHover(MouseEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.util.Timer#getSource()
- */
- protected Object getSource() {
- return monitoringTarget;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
- */
- public void modifyText(ModifyEvent e) {
- monitoringTarget = (Widget) e.getSource();
- restart();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedModifyListener.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedModifyListener.java
deleted file mode 100644
index 72b1ab6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimedModifyListener.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * This class perform the same function as the J2EETimedKeyListener but using the Modify SWT event
- * instead of the KeyUp. Creation date: (9/10/2001 11:46:51 AM)
- *
- * @author: Administrator
- */
-import java.awt.event.ActionListener;
-
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Widget;
-
-public class TimedModifyListener extends TimedKeyListener implements ModifyListener {
- /**
- * J2EETimedModefyListener constructor comment.
- *
- * @param delay
- * int
- * @param listener
- * java.awt.event.ActionListener
- */
- public TimedModifyListener(int delay, ActionListener listener) {
- super(delay, listener);
- }
-
- /**
- * J2EETimedModefyListener constructor comment.
- *
- * @param listener
- * java.awt.event.ActionListener
- */
- public TimedModifyListener(ActionListener listener) {
- super(listener);
- }
-
- /*
- * Re/Start the timer
- */
- public void modifyText(org.eclipse.swt.events.ModifyEvent e) {
- monitoringTarget = (Widget) e.getSource();
- restart();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/Timer.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/Timer.java
deleted file mode 100644
index 6cbb548..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/Timer.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-
-public class Timer {
- /**
- * DoPostEvent is a runnable class that fires actionEvents to the listeners on the
- * EventDispatchThread, via invokeLater.
- *
- * @see #post
- */
- class DoPostEvent implements Runnable {
- public void run() {
- if (eventQueued) {
- fireActionPerformed(new ActionEvent(getSource(), 0, null));
- cancelEvent();
- }
- }
-
- Timer getTimer() {
- return Timer.this;
- }
- }
-
- protected ListenerList listenerList = new ListenerList();
- boolean eventQueued = false;
- int initialDelay, delay;
- boolean repeats = true, coalesce = true;
- private Runnable doPostEvent;
- // These fields are maintained by TimerQueue.
- // eventQueued can also be reset by the TimerQueue, but will only ever
- // happen in applet case when TimerQueues thread is destroyed.
- long expirationTime;
- Timer nextTimer;
- boolean running;
-
- /**
- * Creates a Timer that will notify its listeners every <i>delay </i> milliseconds.
- *
- * @param delay
- * The number of milliseconds between listener notification
- * @param listener
- * An initial listener
- * @see #setInitialDelay
- * @see #setRepeats
- */
- public Timer(int delay, ActionListener listener) {
- super();
- this.delay = delay;
- this.initialDelay = delay;
-
- doPostEvent = new DoPostEvent();
-
- if (listener != null) {
- addActionListener(listener);
- }
- }
-
- /**
- * Adds an actionListener to the Timer
- */
- public void addActionListener(ActionListener listener) {
- listenerList.add(listener);
- }
-
- synchronized void cancelEvent() {
- eventQueued = false;
- }
-
- /**
- * Notify all listeners that have registered interest for notification on this event type. The
- * event instance is lazily created using the parameters passed into the fire method.
- *
- * @see EventListenerList
- */
- protected void fireActionPerformed(ActionEvent e) {
- // Guaranteed to return a non-null array
- ActionListener[] listeners = listenerList.getListenerList();
-
- // Process the listeners last to first, notifying
- // those that are interested in this event
- for (int i = listeners.length - 1; i >= 0; i -= 1) {
- listeners[i].actionPerformed(e);
- }
- }
-
- /**
- * Returns the Timer's delay.
- *
- * @see #setDelay
- */
- public int getDelay() {
- return delay;
- }
-
- /**
- * Returns the Timer's initial delay.
- *
- * @see #setDelay
- */
- public int getInitialDelay() {
- return initialDelay;
- }
-
- /**
- * Returns <b>true </b> if the Timer coalesces multiple pending <b>performCommand() </b>
- * messages.
- *
- * @see #setCoalesce
- */
- public boolean isCoalesce() {
- return coalesce;
- }
-
- /**
- * Returns <b>true </b> if the Timer will send a <b>actionPerformed() </b> message to its
- * listeners multiple times.
- *
- * @see #setRepeats
- */
- public boolean isRepeats() {
- return repeats;
- }
-
- /**
- * Returns <b>true </b> if the Timer is running.
- *
- * @see #start
- */
- public boolean isRunning() {
- return timerQueue().containsTimer(this);
- }
-
- synchronized void post() {
- if (!eventQueued) {
- eventQueued = true;
- org.eclipse.swt.widgets.Display.getDefault().asyncExec(doPostEvent);
- }
- }
-
- /**
- * Removes an ActionListener from the Timer.
- */
- public void removeActionListener(ActionListener listener) {
- listenerList.remove(listener);
- }
-
- /**
- * Restarts a Timer, canceling any pending firings, and causing it to fire with its initial
- * dely.
- */
- public void restart() {
- stop();
- start();
- }
-
- /**
- * Sets whether the Timer coalesces multiple pending ActionEvent firings. A busy application may
- * not be able to keep up with a Timer's message generation, causing multiple
- * <b>actionPerformed() </b> message sends to be queued. When processed, the application sends
- * these messages one after the other, causing the Timer's listeners to receive a sequence of
- * <b>actionPerformed() </b> messages with no delay between them. Coalescing avoids this
- * situation by reducing multiple pending messages to a single message send. Timers coalesce
- * their message sends by default.
- */
- public void setCoalesce(boolean flag) {
- coalesce = flag;
- }
-
- /**
- * Sets the Timer's delay, the number of milliseconds between successive <b>actionPerfomed()
- * </b> messages to its listeners
- *
- * @see #setInitialDelay
- */
- public void setDelay(int delay) {
- if (delay < 0) {
- String msg = WTPCommonUIResourceHandler.getString("Timer_UI_0", new Object[]{Integer.toString(delay)}); //$NON-NLS-1$
- throw new IllegalArgumentException(msg);
- }
- this.delay = delay;
- }
-
- /**
- * Sets the Timer's initial delay. This will be used for the first "ringing" of the Timer only.
- * Subsequent ringings will be spaced using the delay property.
- *
- * @see #setDelay
- */
- public void setInitialDelay(int initialDelay) {
- if (initialDelay < 0) {
- String msg = WTPCommonUIResourceHandler.getString("Timer_UI_1", new Object[]{Integer.toString(initialDelay)}); //$NON-NLS-1$
- throw new IllegalArgumentException(msg);
- }
- this.initialDelay = initialDelay;
- }
-
- /**
- * If <b>flag </b> is <b>false </b>, instructs the Timer to send <b>actionPerformed() </b> to
- * its listeners only once, and then stop.
- */
- public void setRepeats(boolean flag) {
- repeats = flag;
- }
-
- /**
- * Starts the Timer, causing it to send <b>actionPerformed() </b> messages to its listeners.
- *
- * @see #stop
- */
- public void start() {
- timerQueue().addTimer(this, System.currentTimeMillis() + getInitialDelay());
- }
-
- /**
- * Stops a Timer, causing it to stop sending <b>actionPerformed() </b> messages to its Target.
- *
- * @see #start
- */
- public void stop() {
- timerQueue().removeTimer(this);
- cancelEvent();
- }
-
- /**
- * Returns the timer queue.
- */
- TimerQueue timerQueue() {
- return TimerQueue.singleton();
- }
-
- /**
- * Return the source for the ActionEvent that is fired.
- *
- * @return
- */
- protected Object getSource() {
- return this;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimerQueue.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimerQueue.java
deleted file mode 100644
index 3ca9284..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/TimerQueue.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-
-
-
-class TimerQueue implements Runnable {
- private static TimerQueue singleton;
- Timer firstTimer;
- boolean running;
- private static final Object classLock = new Object();
-
- /**
- * Constructor for TimerQueue.
- */
- public TimerQueue() {
- super();
-
- // Now start the TimerQueue thread.
- start();
- }
-
- synchronized void addTimer(Timer timer, long expirationTime) {
- Timer previousTimer;
- Timer nextTimer;
-
- // If the Timer is already in the queue, then ignore the add.
- if (timer.running) {
- return;
- }
-
- previousTimer = null;
- nextTimer = firstTimer;
-
- // Insert the Timer into the linked list in the order they will
- // expire. If two timers expire at the same time, put the newer entry
- // later so they expire in the order they came in.
-
- while (nextTimer != null) {
- if (nextTimer.expirationTime > expirationTime)
- break;
-
- previousTimer = nextTimer;
- nextTimer = nextTimer.nextTimer;
- }
-
- if (previousTimer == null) {
- firstTimer = timer;
- } else {
- previousTimer.nextTimer = timer;
- }
-
- timer.expirationTime = expirationTime;
- timer.nextTimer = nextTimer;
- timer.running = true;
- notify();
- }
-
- synchronized boolean containsTimer(Timer timer) {
- return timer.running;
- }
-
- /**
- * If there are a ton of timers, this method may never return. It loops checking to see if the
- * head of the Timer list has expired. If it has, it posts the Timer and reschedules it if
- * necessary.
- */
- synchronized long postExpiredTimers() {
- Timer timer;
- long currentTime;
- long timeToWait;
-
- // The timeToWait we return should never be negative and only be zero
- // when we have no Timers to wait for.
-
- do {
- timer = firstTimer;
- if (timer == null)
- return 0;
-
- currentTime = System.currentTimeMillis();
- timeToWait = timer.expirationTime - currentTime;
-
- if (timeToWait <= 0) {
- try {
- timer.post(); // have timer post an event
- } catch (SecurityException e) {
- }
-
- // Remove the timer from the queue
- removeTimer(timer);
-
- // This tries to keep the interval uniform at
- // the cost of drift.
- if (timer.isRepeats()) {
- addTimer(timer, currentTime + timer.getDelay());
- }
- }
-
- // Allow other threads to call addTimer() and removeTimer()
- // even when we are posting Timers like mad. Since the wait()
- // releases the lock, be sure not to maintain any state
- // between iterations of the loop.
-
- try {
- wait(1);
- } catch (InterruptedException e) {
- }
- } while (timeToWait <= 0);
-
- return timeToWait;
- }
-
- synchronized void removeTimer(Timer timer) {
- Timer previousTimer;
- Timer nextTimer;
- boolean found;
-
- if (!timer.running)
- return;
-
- previousTimer = null;
- nextTimer = firstTimer;
- found = false;
-
- while (nextTimer != null) {
- if (nextTimer == timer) {
- found = true;
- break;
- }
-
- previousTimer = nextTimer;
- nextTimer = nextTimer.nextTimer;
- }
-
- if (!found)
- return;
-
- if (previousTimer == null) {
- firstTimer = timer.nextTimer;
- } else {
- previousTimer.nextTimer = timer.nextTimer;
- }
-
- timer.expirationTime = 0;
- timer.nextTimer = null;
- timer.running = false;
- }
-
- public synchronized void run() {
- long timeToWait;
-
- try {
- while (running) {
- timeToWait = postExpiredTimers();
- try {
- wait(timeToWait);
- } catch (InterruptedException e) {
- }
- }
- } catch (ThreadDeath td) {
- running = false;
- // Mark all the timers we contain as not being queued.
- Timer timer = firstTimer;
- while (timer != null) {
- timer.eventQueued = false;
- timer = timer.nextTimer;
- }
- synchronized (this) {
- if (!this.running)
- start();
- }
- throw td;
- }
- }
-
- public static TimerQueue singleton() {
- if (singleton == null)
- synchronized (classLock) {
- singleton = new TimerQueue();
- }
- return singleton;
- }
-
- synchronized void start() {
- if (running) {
- throw new RuntimeException(WTPCommonUIResourceHandler.getString("TimerQueue_ERROR_0")); //$NON-NLS-1$
- }
- Thread timerThread = new Thread(this, "TimerQueue");//$NON-NLS-1$
- try {
- timerThread.setDaemon(true);
- } catch (SecurityException e) {
- }
- timerThread.start();
- running = true;
- }
-
- synchronized void stop() {
- running = false;
- notify();
- }
-
- public synchronized String toString() {
- StringBuffer buf;
- Timer nextTimer;
-
- buf = new StringBuffer();
- buf.append("TimerQueue (");//$NON-NLS-1$
-
- nextTimer = firstTimer;
- while (nextTimer != null) {
- buf.append(nextTimer.toString());
-
- nextTimer = nextTimer.nextTimer;
- if (nextTimer != null)
- buf.append(", ");//$NON-NLS-1$
- }
-
- buf.append(")");//$NON-NLS-1$
- return buf.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementIdentifier.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementIdentifier.java
deleted file mode 100644
index c46f4d6..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementIdentifier.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 12, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ui.activities.IActivityManager;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IIdentifierListener;
-import org.eclipse.ui.activities.IdentifierEvent;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclispe.wst.common.frameworks.internal.enablement.IEnablementManager;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-class UIEnablementIdentifier extends EnablementIdentifier implements IIdentifierListener {
-
- private IIdentifier activityIdentifier;
-
- /**
- * @param id
- * @param project
- */
- public UIEnablementIdentifier(String id, IProject project) {
- super(id, project);
- activityIdentifier = getActivityManager().getIdentifier(id);
- activityIdentifier.addIdentifierListener(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.activities.IIdentifierListener#identifierChanged(org.eclipse.ui.activities.IdentifierEvent)
- */
- public void identifierChanged(IdentifierEvent identifierEvent) {
- boolean enabledChanged = resetEnabled();
- EnablementIdentifierEvent evt = new EnablementIdentifierEvent(this, false, enabledChanged);
- fireIdentifierChanged(evt);
- }
-
- protected IActivityManager getActivityManager() {
- return ((UIEnablementManager) IEnablementManager.INSTANCE).getActivityManager();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclispe.wst.common.frameworks.internal.enablement.EnablementIdentifier#getNewEnabled()
- */
- protected boolean getNewEnabled() {
- return activityIdentifier.isEnabled() && super.getNewEnabled();
- }
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementManager.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementManager.java
deleted file mode 100644
index 47a1930..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIEnablementManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IActivityManager;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementManager;
-
-/**
- * @author mdelder
- */
-public class UIEnablementManager extends EnablementManager {
-
- private IWorkbenchActivitySupport activitySupport = null;
-
- public UIEnablementManager() {
- super();
- }
-
- protected IActivityManager getActivityManager() {
- return getActivitySupport().getActivityManager();
- }
-
- /**
- * @return Returns the activitySupport.
- */
- protected IWorkbenchActivitySupport getActivitySupport() {
- if (activitySupport == null)
- activitySupport = PlatformUI.getWorkbench().getActivitySupport();
- return activitySupport;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager#createIdentifier(java.lang.String,
- * org.eclipse.core.resources.IProject)
- */
- protected EnablementIdentifier createIdentifier(String identifierId, IProject project) {
- return new UIEnablementIdentifier(identifierId, project);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIOperationHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIOperationHandler.java
deleted file mode 100644
index b596e8a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UIOperationHandler.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 5, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler;
-
-
-/**
- * @author dfholt
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class UIOperationHandler implements IOperationHandler {
- protected Shell parentShell;
- final public static String DEFAULT_INFORMATION = "Information";//EMFWorkbenchUIResourceHandler.getString("Information_UI__UI_");
- // //$NON-NLS-1$
- // //$NON-NLS-1$ = "Information"
- final public static String DEFAULT_ERROR = "Error";// EMFWorkbenchUIResourceHandler.getString("Error_UI_");
- // //$NON-NLS-1$
- // //$NON-NLS-1$ = "Error"
- final public static String DEFAULT_CONFIRM = "Confirm";//EMFWorkbenchUIResourceHandler.getString("Confirm_UI_");
- // //$NON-NLS-1$
- // //$NON-NLS-1$ = "Confirm"
- protected String informationTitle = DEFAULT_INFORMATION;
- protected String confirmTitle = DEFAULT_CONFIRM;
- protected String errorTitle = DEFAULT_ERROR;
-
- /**
- * UIOperationHandler constructor comment.
- */
- public UIOperationHandler() {
- super();
- }
-
- /**
- * UIOperationHandler constructor comment.
- */
- public UIOperationHandler(Shell parent) {
- super();
- parentShell = parent;
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message) {
- return MessageDialog.openQuestion(getParentShell(), getConfirmTitle(), message);
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message, String[] items) {
- return ListMessageDialog.openQuestion(getParentShell(), getConfirmTitle(), message, items);
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue. The boolean array
- * will return two booleans. The first indicates their response to the original question and the
- * second indicates if they selected the apply to all check box.
- *
- * Return the return code for the dialog. 0 = Yes, 1 = Yes to all, 2 = No
- */
- public int canContinueWithAllCheck(String message) {
- MessageDialog dialog = new MessageDialog(getParentShell(), getConfirmTitle(), null, // accept
- // the
- // default
- // window
- // icon
- message, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.NO_LABEL}, 1); // yes
- // is
- // the
- // default
- return dialog.open();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.operations.IOperationHandler#canContinueWithAllCheckAllowCancel(java.lang.String)
- */
- public int canContinueWithAllCheckAllowCancel(String message) {
- MessageDialog dialog = new MessageDialog(getParentShell(), getConfirmTitle(), null, // accept
- // the
- // default
- // window
- // icon
- message, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL}, 1); // yes
- // is
- // the
- // default
- return dialog.open();
- }
-
- /**
- * An error has occurred
- */
- public void error(String message) {
- MessageDialog.openError(getParentShell(), getErrorTitle(), message);
- }
-
- /**
- * The dialog title to be used for confirmations
- */
- public java.lang.String getConfirmTitle() {
- return confirmTitle;
- }
-
- /**
- * The dialog title to be used for errors
- */
- public java.lang.String getErrorTitle() {
- return errorTitle;
- }
-
- /**
- * The dialog title to be used for information
- */
- public java.lang.String getInformationTitle() {
- return informationTitle;
- }
-
- public Shell getParentShell() {
- if (parentShell == null)
- parentShell = WTPUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow().getShell();
-
- return parentShell;
- }
-
- /**
- * An informational message needs to be presented
- */
- public void inform(String message) {
- MessageDialog.openInformation(getParentShell(), getInformationTitle(), message);
- }
-
- /**
- * Insert the method's description here. Creation date: (8/9/2001 11:51:36 AM)
- *
- * @param newConfirmTitle
- * java.lang.String
- */
- public void setConfirmTitle(java.lang.String newConfirmTitle) {
- confirmTitle = newConfirmTitle;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/9/2001 11:51:36 AM)
- *
- * @param newErrorTitle
- * java.lang.String
- */
- public void setErrorTitle(java.lang.String newErrorTitle) {
- errorTitle = newErrorTitle;
- }
-
- /**
- * Insert the method's description here. Creation date: (8/9/2001 11:51:36 AM)
- *
- * @param newInformationTitle
- * java.lang.String
- */
- public void setInformationTitle(java.lang.String newInformationTitle) {
- informationTitle = newInformationTitle;
- }
-
- /**
- * @see com.ibm.etools.j2ee.operations.IOperationHandler#getContext()
- */
- public Object getContext() {
- return getParentShell();
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UITesterImpl.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UITesterImpl.java
deleted file mode 100644
index e22ce99..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/UITesterImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 27, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.Workbench;
-
-import com.ibm.wtp.common.UITester;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class UITesterImpl implements UITester {
-
- /**
- *
- */
- public UITesterImpl() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.UITester#isCurrentContextUI()
- */
- public boolean isCurrentContextUI() {
- try {
- return PlatformUI.isWorkbenchRunning() || ((Workbench) PlatformUI.getWorkbench()).isClosing();
- } catch (RuntimeException e) {
- return false;
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ValidationStatus.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ValidationStatus.java
deleted file mode 100644
index 926f899..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/ValidationStatus.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.swt.widgets.Control;
-
-/**
- * This object encompas a set of Validation status Creation date: (9/10/2001 5:35:12 PM)
- *
- * @author: Administrator
- */
-public class ValidationStatus {
- Hashtable errMsgs = new Hashtable();
- Hashtable errStatus = new Hashtable();
- Hashtable tControls = new Hashtable();
- Map warnMsgs;
- Map warnStatus;
-
- /**
- * ValidationStatus constructor comment.
- */
- public ValidationStatus() {
- super();
- }
-
- /*
- * Look for any error. If there is more than one, return errors according to their key. i.e.,
- * lower key errors will be returned first.
- */
- public String getLastErrMsg() {
-
- Enumeration e = errStatus.keys();
- String[] errs = new String[errStatus.size()];
- for (int i = 0; i < errs.length; i++)
- errs[i] = null;
- boolean foundOne = false;
- while (e.hasMoreElements()) {
- Integer key = (Integer) e.nextElement();
- if (!((Boolean) errStatus.get(key)).booleanValue()) {
- errs[key.intValue() % errs.length] = (String) errMsgs.get(key);
- foundOne = true;
- }
- }
- if (foundOne)
- for (int i = 0; i < errs.length; i++)
- if (errs[i] != null)
- return errs[i];
- return null;
- }
-
- private Map getWarningMsgs() {
- if (warnMsgs == null)
- warnMsgs = new HashMap();
- return warnMsgs;
- }
-
- private Map getWarningStatusMap() {
- if (warnStatus == null)
- warnStatus = new HashMap();
- return warnStatus;
- }
-
- /*
- * Look for any warning. If there is more than one, return warnings according to their key.
- * i.e., lower key errors will be returned first.
- */
- public String getLastWarningMsg() {
- if (warnStatus == null)
- return null;
- Iterator e = warnStatus.keySet().iterator();
- String[] warns = new String[warnStatus.size()];
- for (int i = 0; i < warns.length; i++)
- warns[i] = null;
- boolean foundOne = false;
- while (e.hasNext()) {
- Integer key = (Integer) e.next();
- if (!((Boolean) warnStatus.get(key)).booleanValue()) {
- warns[key.intValue() % warns.length] = (String) warnMsgs.get(key);
- foundOne = true;
- }
- }
- if (foundOne)
- for (int i = 0; i < warns.length; i++)
- if (warns[i] != null)
- return warns[i];
- return null;
- }
-
- public String getLastErrMsgAndFocus() {
-
- Enumeration e = errStatus.keys();
-
- Integer theOne = null;
- while (e.hasMoreElements()) {
- Integer key = (Integer) e.nextElement();
- if (!((Boolean) errStatus.get(key)).booleanValue()) {
- if (theOne == null || key.intValue() < theOne.intValue()) {
- theOne = key;
- }
- }
- }
- if (theOne != null) {
- Control control = (Control) tControls.get(theOne);
- if (control != null) {
- control.setFocus();
- }
- return ((String) errMsgs.get(theOne));
- }
- return null;
- }
-
- public boolean hasError(Integer key) {
- Boolean stat = (Boolean) errStatus.get(key);
- if (stat != null)
- return stat.booleanValue();
- return true;
- }
-
- public void setControl(Integer key, Control control) {
- tControls.put(key, control);
- }
-
- public void setErrorStatus(Integer key, Boolean status, String msg) {
- errMsgs.put(key, msg);
- errStatus.put(key, status);
- }
-
- public void setErrorStatus(Integer key, String msg) {
- errMsgs.put(key, msg);
- errStatus.put(key, new Boolean(false));
- }
-
- public void setWarningStatus(Integer key, String msg) {
- getWarningMsgs().put(key, msg);
- getWarningStatusMap().put(key, new Boolean(false));
- }
-
- public void setOKStatus(Integer key) {
- errMsgs.put(key, ""); //$NON-NLS-1$
- errStatus.put(key, new Boolean(true));
- if (warnMsgs != null)
- warnMsgs.put(key, ""); //$NON-NLS-1$
- if (warnStatus != null)
- warnStatus.put(key, new Boolean(true));
- }
-
- public void setStatus(Integer key, boolean ok, String msg) {
- errMsgs.put(key, msg);
- errStatus.put(key, new Boolean(ok));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityBridgeHelperImpl.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityBridgeHelperImpl.java
deleted file mode 100644
index a8440eb..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityBridgeHelperImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IActivityManager;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.wst.common.frameworks.internal.activities.WTPActivityBridgeHelper;
-
-
-/**
- * @author jsholl
- *
- */
-public class WTPActivityBridgeHelperImpl implements WTPActivityBridgeHelper {
-
- private IWorkbenchActivitySupport workbenchActivitySupport = null;
- private IActivityManager activityManager = null;
-
- public WTPActivityBridgeHelperImpl() {
- workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
- activityManager = workbenchActivitySupport.getActivityManager();
- }
-
- public void enableActivity(String activityID, boolean enabled) {
- Set enabledActivities = activityManager.getEnabledActivityIds();
- Set newEnabledActivities = null;
- if (enabled && !enabledActivities.contains(activityID)) {
- newEnabledActivities = new HashSet();
- newEnabledActivities.addAll(enabledActivities);
- newEnabledActivities.add(activityID);
- }
- if (!enabled && enabledActivities.contains(activityID)) {
- newEnabledActivities = new HashSet();
- newEnabledActivities.addAll(enabledActivities);
- newEnabledActivities.remove(activityID);
- }
- if (null != newEnabledActivities) {
- workbenchActivitySupport.setEnabledActivityIds(newEnabledActivities);
- }
- }
-
- public Set getEnabledActivityIds() {
- return activityManager.getEnabledActivityIds();
- }
-
- public void setEnabledActivityIds(Set activityIDs) {
- workbenchActivitySupport.setEnabledActivityIds(activityIDs);
- }
-
- public Set getActivityIDsFromContribution(final String localID, final String pluginID) {
- IIdentifier identifier = activityManager.getIdentifier(WorkbenchActivityHelper.createUnifiedId(new IPluginContribution() {
- public String getLocalId() {
- return localID;
- }
-
- public String getPluginId() {
- return pluginID;
- }
- }));
- return identifier.getActivityIds();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityHelper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityHelper.java
deleted file mode 100644
index 37a0221..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPActivityHelper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.activities.IIdentifier;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WTPActivityHelper {
-
- /**
- * @return whether the UI is set up to filter contributions (has defined activity categories).
- */
- public static final boolean isFiltering() {
- return !PlatformUI.getWorkbench().getActivitySupport().getActivityManager().getDefinedActivityIds().isEmpty();
- }
-
- public static boolean allowUseOf(Object object) {
- if (!isFiltering())
- return true;
- if (object instanceof IPluginContribution) {
- IPluginContribution contribution = (IPluginContribution) object;
- if (contribution.getPluginId() != null) {
- IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
- IIdentifier identifier = workbenchActivitySupport.getActivityManager().getIdentifier(createUnifiedId(contribution));
- return identifier.isEnabled();
- }
- }
- return true;
- }
-
-
- public static final String createUnifiedId(IPluginContribution contribution) {
- if (contribution.getPluginId() != null)
- return contribution.getPluginId() + '/' + contribution.getLocalId();
- return contribution.getLocalId();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPCommonUIResourceHandler.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPCommonUIResourceHandler.java
deleted file mode 100644
index 00eb1f0..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPCommonUIResourceHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 23, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author vijayb
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class WTPCommonUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("wtpcommonui"); //$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!"; //$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
- return getString(key);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPDataModelSynchHelper.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPDataModelSynchHelper.java
deleted file mode 100644
index 3b06e3b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPDataModelSynchHelper.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and
- * Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WTPDataModelSynchHelper implements WTPOperationDataModelListener {
- protected WTPOperationDataModel dataModel;
- protected Map widgetToPropertyHash;
- protected Map propertyToWidgetHash;
- protected Map widgetToDepControls;
- /**
- * @deprecated
- */
- private Map deprecatedConvertPropertyNames; //TODO delete this
- /**
- * @deprecated
- */
- private HashSet deprecatedCombos; //TODO delete this
-
- protected String currentProperty;
- protected Widget currentWidget;
- protected boolean ignoreModifyEvent = false;
-
- private class ModifyTextListener implements ModifyListener {
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- Text text = (Text) e.getSource();
- if (currentWidget == text)
- return;
- String propertyName = (String) widgetToPropertyHash.get(text);
- setProperty(propertyName, text.getText());
- }
- }
-
- private ModifyTextListener modifyTextListener;
- private TimedModifyListener timedModifyListener;
-
- /**
- * @deprecated
- * @author jsholl
- */
- private class ComboListenerDeprecated implements SelectionListener, ModifyListener { //TODO delete this
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- Combo combo = (Combo) e.getSource();
- if (currentWidget == combo)
- return;
- String propertyName = (String) widgetToPropertyHash.get(combo);
- setProperty(propertyName, combo.getText());
- }
-
- public void widgetSelected(SelectionEvent e) {
- Combo combo = (Combo) e.getSource();
- if (currentWidget == combo)
- return;
- String propertyName = (String) widgetToPropertyHash.get(combo);
- if (combo.getSelectionIndex() >= 0)
- setProperty(propertyName, combo.getItem(combo.getSelectionIndex()));
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- /**
- * @deprecated
- */
- private ComboListenerDeprecated comboListenerDeprecated; //TODO delete this
-
- private class ComboListener implements SelectionListener, ModifyListener {
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- Combo combo = (Combo) e.getSource();
- if (currentWidget == combo)
- return;
- String propertyName = (String) widgetToPropertyHash.get(combo);
- WTPPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
- String description = combo.getText();
- for (int i = 0; i < descriptors.length; i++) {
- if (description.equals(descriptors[i].getPropertyDescription())) {
- setProperty(propertyName, descriptors[i].getPropertyValue());
- return;
- }
- }
- setProperty(propertyName, combo.getText());
- }
-
- public void widgetSelected(SelectionEvent e) {
- Combo combo = (Combo) e.getSource();
- if (currentWidget == combo)
- return;
- String propertyName = (String) widgetToPropertyHash.get(combo);
- if (combo.getSelectionIndex() >= 0) {
- WTPPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
- String description = combo.getItem(combo.getSelectionIndex());
- for (int i = 0; i < descriptors.length; i++) {
- if (description.equals(descriptors[i].getPropertyDescription())) {
- setProperty(propertyName, descriptors[i].getPropertyValue());
- return;
- }
- }
- setProperty(propertyName, combo.getItem(combo.getSelectionIndex()));
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- private ComboListener comboListener;
-
-
- private class CheckboxSelectionListener implements SelectionListener {
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.getSource();
- if (currentWidget == button)
- return;
- String propertyName = (String) widgetToPropertyHash.get(button);
- setProperty(propertyName, new Boolean(button.getSelection()));
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- private CheckboxSelectionListener checkboxSelectionListener;
-
- public WTPDataModelSynchHelper(WTPOperationDataModel model) {
- this.dataModel = model;
- dataModel.addListener(this);
- }
-
-
- private CheckBoxViewerListener checkBoxViewerStateListener;
-
- private class CheckBoxViewerListener implements ICheckStateListener {
- public void checkStateChanged(CheckStateChangedEvent event) {
- StructuredViewer viewer = (StructuredViewer) event.getSource();
- CheckboxTableViewer checkBoxTableViewer;
- CheckboxTreeViewer checkBoxTreeViewer;
- Object[] items = null;
- if (viewer instanceof CheckboxTableViewer) {
- checkBoxTableViewer = (CheckboxTableViewer) viewer;
- items = checkBoxTableViewer.getCheckedElements();
- } else if (viewer instanceof CheckboxTreeViewer) {
- checkBoxTreeViewer = (CheckboxTreeViewer) viewer;
- items = checkBoxTreeViewer.getCheckedElements();
- }
- String propertyName = (String) widgetToPropertyHash.get(viewer.getControl());
- setPropertyItems(propertyName, items);
- }
- }
-
- public void propertyChanged(WTPOperationDataModelEvent event) {
- String propertyName = event.getPropertyName();
- int flag = event.getFlag();
- if (currentProperty != null) {
- String convertedProp = propertyName;
- if (flag == WTPOperationDataModelListener.PROPERTY_CHG)
- convertedProp = getConvertedProperty(propertyName);
- if (currentProperty.equals(convertedProp))
- return;
- }
- if (flag == WTPOperationDataModelListener.ENABLE_CHG)
- setEnablement(propertyName, ((Boolean) event.getNewValue()).booleanValue());
- else
- synchUIWithModel(propertyName, flag);
- }
-
- protected void setProperty(String propertyName, Object value) {
- currentProperty = propertyName;
- try {
- dataModel.setProperty(propertyName, value);
- } finally {
- currentProperty = null;
- }
- }
-
- protected void setPropertyItems(String propertyName, Object[] items) {
- currentProperty = propertyName;
- try {
- dataModel.setProperty(propertyName, items);
- } finally {
- currentProperty = null;
- }
- }
-
- /**
- * Sets the UI to have the property value defined in the model
- *
- * @param propertyName
- * @link WTPOperationDataModelListener for the flag values.
- */
- public void synchUIWithModel(String propertyName, int flag) {
- if (null != propertyToWidgetHash && propertyToWidgetHash.containsKey(propertyName)) {
- try {
- dataModel.setIgnorePropertyChanges(true);
- currentWidget = (Widget) propertyToWidgetHash.get(propertyName);
- if (currentWidget != null) {
- ignoreModifyEvent = true;
- try {
- if (currentWidget instanceof Text)
- setWidgetValue(propertyName, flag, (Text) currentWidget);
- else if (currentWidget instanceof Combo){
- if(null != deprecatedCombos && deprecatedCombos.contains(currentWidget)){
- setWidgetValueDeprecated(propertyName, flag, (Combo) currentWidget);
- } else {
- setWidgetValue(propertyName, flag, (Combo) currentWidget);
- }
- }else if (currentWidget instanceof Button)
- setWidgetValue(propertyName, flag, (Button) currentWidget);
- else if (currentWidget instanceof Label)
- setWidgetValue(propertyName, flag, (Label) currentWidget);
- else if (currentWidget instanceof List)
- setWidgetValue(propertyName, flag, (List) currentWidget);
- else if (currentWidget instanceof Table)
- setWidgetValue(propertyName, flag, (Table) currentWidget);
- else if (currentWidget instanceof Tree)
- setWidgetValue(propertyName, flag, (Tree) currentWidget);
- } finally {
- ignoreModifyEvent = false;
- }
- setEnablement(propertyName);
- }
- } finally {
- currentWidget = null;
- dataModel.setIgnorePropertyChanges(false);
- }
- }
- }
-
- /**
- * @param control
- */
- private void setEnablement(String propertyName) {
- if (currentWidget == null)
- return;
- Boolean enabled = dataModel.isEnabled(propertyName);
- if (enabled != null)
- setEnablement((Control) currentWidget, enabled.booleanValue());
- }
-
- /**
- * @param control
- * @param enabled
- */
- private void setEnablement(Control control, boolean enabled) {
- if (control.isEnabled() != enabled)
- control.setEnabled(enabled);
- setDependentControlEnablement(control, enabled);
- }
-
- private void setEnablement(String propertyName, boolean enabled) {
- if (propertyToWidgetHash != null) {
- Control control = (Control) propertyToWidgetHash.get(propertyName);
- if (control != null) {
- setEnablement(control, enabled);
- }
- }
- }
-
- /**
- * @param control
- * @param enabled
- */
- private void setDependentControlEnablement(Control control, boolean enabled) {
- if (widgetToDepControls != null) {
- Control[] dependents = (Control[]) widgetToDepControls.get(control);
- if (dependents != null) {
- Control dep = null;
- for (int i = 0; i < dependents.length; i++) {
- dep = dependents[i];
- if (dep.isEnabled() != enabled)
- dep.setEnabled(enabled);
- }
- }
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Button button) {
- if ((button.getStyle() & SWT.CHECK) == SWT.CHECK || (button.getStyle() & SWT.RADIO) == SWT.RADIO) {
- boolean checked = dataModel.getBooleanProperty(propertyName);
- if (button.getSelection() != checked) {
- button.setSelection(checked);
- }
- }
- }
-
- /**
- * @deprecated
- * @param propertyName
- * @param flag
- * @param combo
- */
- private void setWidgetValueDeprecated(String propertyName, int flag, Combo combo) {
- String prop = getConvertedProperty(propertyName);
- if (flag == WTPOperationDataModelListener.VALID_VALUES_CHG || combo.getItemCount() == 0) {
- // Display properties should only fire if the contents change.
- String[] items = dataModel.getValidStringPropertyValues(prop);
- combo.setItems(items);
- }
- String newText = dataModel.getStringProperty(prop);
- int selIndex = combo.getSelectionIndex();
- if (selIndex < 0 || !newText.equals(combo.getItem(selIndex))) {
- String[] items = combo.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i].equals(newText)) {
- combo.select(i);
- return;
- }
- }
- }
- combo.setText(newText);
- }
-
- protected void setWidgetValue(String propertyName, int flag, Combo combo) {
- if (flag == WTPOperationDataModelListener.VALID_VALUES_CHG || combo.getItemCount() == 0) {
- // Display properties should only fire if the contents change.
- WTPPropertyDescriptor[] descriptors = dataModel.getValidPropertyDescriptors(propertyName);
- String[] items = new String[descriptors.length];
- for (int i = 0; i < descriptors.length; i++) {
- items[i] = descriptors[i].getPropertyDescription();
- }
- combo.setItems(items);
- }
- String newText = dataModel.getPropertyDescriptor(propertyName).getPropertyDescription();
- int selIndex = combo.getSelectionIndex();
- if (selIndex < 0 || !newText.equals(combo.getItem(selIndex))) {
- String[] items = combo.getItems();
- for (int i = 0; i < items.length; i++) {
- if (items[i].equals(newText)) {
- combo.select(i);
- return;
- }
- }
- }
- combo.setText(newText);
- }
-
- /**
- * @param propertyName
- * @return
- * @deprecated
- */
- private String getConvertedProperty(String propertyName) {
- if (deprecatedConvertPropertyNames != null) {
- String prop = (String) deprecatedConvertPropertyNames.get(propertyName);
- if (prop != null)
- return prop;
- }
- return propertyName;
- }
-
- protected void setWidgetValue(String propertyName, int flag, Text text) {
- String newText = dataModel.getStringProperty(propertyName);
- if (!newText.equals(text.getText())) {
- text.setText(newText);
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Table table) {
- Object[] elements = (Object[]) dataModel.getProperty(propertyName);
- if (elements == null || elements.length == 0) {
- setTableItemsChecked(table.getItems(), false);
- return;
- }
- java.util.List elementList = Arrays.asList(elements);
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++) {
- TableItem item = tableItems[i];
- if (elementList.contains(item.getData()))
- item.setChecked(true);
- else
- item.setChecked(false);
- }
- }
-
- protected void setTableItemsChecked(TableItem[] tableItems, boolean b) {
- for (int i = 0; i < tableItems.length; i++)
- tableItems[i].setChecked(b);
- }
-
- protected void setWidgetValue(String propertyName, int flag, Tree tree) {
- Object[] elements = (Object[]) dataModel.getProperty(propertyName);
- if (elements == null)
- return;
- java.util.List elementList = Arrays.asList(elements);
- TreeItem[] treeItems = tree.getItems();
- if (elementList.size() == 0) {
- setTreeItemsGrey(treeItems, false);
- return;
- }
- if (treeItems.length > 0)
- setTreeItemChecked(treeItems, elementList);
- }
-
- public void setTreeItemsGrey(TreeItem[] treeItems, boolean b) {
- for (int i = 0; i < treeItems.length; i++) {
- TreeItem item = treeItems[i];
- item.setGrayed(b);
- setTreeItemsGrey(treeItems[i].getItems(), b);
- }
- }
-
- protected void setTreeItemChecked(TreeItem[] treeItems, java.util.List items) {
- for (int i = 0; i < treeItems.length; i++) {
- if (items.contains(treeItems[i].getData()))
- treeItems[i].setChecked(true);
- else
- treeItems[i].setGrayed(true);
- TreeItem[] childernItems = treeItems[i].getItems();
- if (childernItems.length > 0) {
- treeItems[i].setExpanded(true);
- setTreeItemChecked(childernItems, items);
- }
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, Label label) {
- String newText = dataModel.getStringProperty(propertyName);
- if (!newText.equals(label.getText())) {
- label.setText(newText);
- }
- }
-
- protected void setWidgetValue(String propertyName, int flag, List list) {
- Object newContents = dataModel.getProperty(propertyName);
- if (newContents == null) {
- list.setItems(new String[0]);
- return;
- }
- if (newContents instanceof java.util.List) {
- java.util.List modelContents = (java.util.List) newContents;
- String[] items = new String[modelContents.size()];
- for (int i = 0; i < modelContents.size(); i++) {
- items[i] = modelContents.get(i).toString();
- }
- list.setItems(items);
- } else if (newContents instanceof String[]) {
- list.setItems((String[]) newContents);
- }
- }
-
- public void synchAllUIWithModel() {
- if (null != propertyToWidgetHash) {
- Collection keys = propertyToWidgetHash.keySet();
- if (!keys.isEmpty()) {
- Iterator propertyNames = keys.iterator();
- String propertyName = null;
- while (propertyNames.hasNext()) {
- propertyName = (String) propertyNames.next();
- synchUIWithModel(propertyName, WTPOperationDataModelListener.PROPERTY_CHG);
- }
- }
- }
- }
-
- protected void synchComposite(Widget widget, String propertyName, Control[] depControls) {
- if (null == widgetToPropertyHash)
- widgetToPropertyHash = new HashMap();
- if (propertyToWidgetHash == null)
- propertyToWidgetHash = new HashMap();
- widgetToPropertyHash.put(widget, propertyName);
- propertyToWidgetHash.put(propertyName, widget);
- if (depControls != null) {
- if (widgetToDepControls == null)
- widgetToDepControls = new HashMap();
- widgetToDepControls.put(widget, depControls);
- }
- synchUIWithModel(propertyName, WTPOperationDataModelListener.PROPERTY_CHG);
- }
-
- public void synchText(Text text, String propertyName, Control[] dependentControls) {
- synchText(text, propertyName, false, dependentControls);
- }
-
- public void synchText(Text text, String propertyName, boolean isTimeModified, Control[] dependentControls) {
- synchComposite(text, propertyName, dependentControls);
- if (isTimeModified)
- text.addModifyListener(getTimedListener());
- else
- text.addModifyListener(getModifyTextListener());
- }
-
- public void synchLabel(Label label, String propertyName, Control[] dependentControls) {
- synchComposite(label, propertyName, dependentControls);
- }
-
- /**
- * Use this to synch the contents of the <code>list</code> to the List elements returned from
- * the <code>propertyName</code>.
- */
- public void synchList(List list, String propertyName, Control[] dependentControls) {
- synchComposite(list, propertyName, dependentControls);
- }
-
- /**
- * @deprecated use syncCombo(Combo, String, Control[])
- * @param combo
- * @param propertyName
- * @param actualProperty
- * @param dependentControls
- */
- public void synchCombo(Combo combo, String propertyName, String actualProperty, Control[] dependentControls) {
- if (actualProperty != null) {
- if (propertyToWidgetHash == null)
- propertyToWidgetHash = new Hashtable();
- propertyToWidgetHash.put(actualProperty, combo);
- setConvertProperty(actualProperty, propertyName);
- if (null == deprecatedCombos) {
- deprecatedCombos = new HashSet();
- }
- deprecatedCombos.add(combo);
- }
- synchComposite(combo, propertyName, dependentControls);
- if (null == comboListenerDeprecated) {
- comboListenerDeprecated = new ComboListenerDeprecated();
- }
- combo.addSelectionListener(comboListenerDeprecated);
- combo.addModifyListener(comboListenerDeprecated);
- }
-
- public void synchCombo(Combo combo, String propertyName, Control[] dependentControls) {
- synchComposite(combo, propertyName, dependentControls);
- if (null == comboListener) {
- comboListener = new ComboListener();
- }
- combo.addSelectionListener(comboListener);
- combo.addModifyListener(comboListener);
- }
-
-
- public void synchCheckbox(Button checkbox, String propertyName, Control[] dependentControls) {
- synchComposite(checkbox, propertyName, dependentControls);
- if (null == checkboxSelectionListener) {
- checkboxSelectionListener = new CheckboxSelectionListener();
- }
- checkbox.addSelectionListener(checkboxSelectionListener);
- }
-
- public void synchCheckBoxTableViewer(CheckboxTableViewer tableViewer, String propertyName, Control[] dependentControls) {
- synchComposite(tableViewer.getControl(), propertyName, dependentControls);
- if (null == checkBoxViewerStateListener) {
- checkBoxViewerStateListener = new CheckBoxViewerListener();
- }
- tableViewer.addCheckStateListener(checkBoxViewerStateListener);
- }
-
- public void synchCheckBoxTreeViewer(CheckboxTreeViewer treeViewer, String propertyName, Control[] dependentControls) {
- treeViewer.expandAll();
- synchComposite(treeViewer.getControl(), propertyName, dependentControls);
- if (null == checkBoxViewerStateListener) {
- checkBoxViewerStateListener = new CheckBoxViewerListener();
- }
- treeViewer.addCheckStateListener(checkBoxViewerStateListener);
- }
-
- public void synchRadio(Button radio, String propertyName, Control[] dependentControls) {
- // Uses checkbox syncher
- synchCheckbox(radio, propertyName, dependentControls);
- }
-
- /**
- * This is necessary when a property is not actually persisted in the model but converted to
- * another property. @param actualProperty @param convertProperty
- * @deprecated
- */
- private void setConvertProperty(String actualProperty, String convertProperty) {
- if (deprecatedConvertPropertyNames == null)
- deprecatedConvertPropertyNames = new HashMap();
- deprecatedConvertPropertyNames.put(actualProperty, convertProperty);
- }
-
- private TimedModifyListener getTimedListener() {
- if (timedModifyListener == null)
- timedModifyListener = new TimedModifyListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- Widget w = (Widget) e.getSource();
- if (currentWidget == w || w.isDisposed())
- return;
- String propertyName = (String) widgetToPropertyHash.get(w);
- setTextProperty(propertyName, (Text) w);
- }
- }) {
- public void modifyText(ModifyEvent e) {
- if (ignoreModifyEvent)
- return;
- super.modifyText(e);
- }
- };
- return timedModifyListener;
- }
-
- protected void setTextProperty(String propertyName, Text text) {
- setProperty(propertyName, text.getText());
- }
-
- private ModifyTextListener getModifyTextListener() {
- if (null == modifyTextListener)
- modifyTextListener = new ModifyTextListener();
- return modifyTextListener;
- }
-
- public WTPOperationDataModel getDataModel() {
- return dataModel;
- }
-
- public void dispose() {
- dataModel.removeListener(this);
- checkboxSelectionListener = null;
- deprecatedConvertPropertyNames = null;
- deprecatedCombos = null;
- currentWidget = null;
- modifyTextListener = null;
- propertyToWidgetHash = null;
- timedModifyListener = null;
- widgetToDepControls = null;
- widgetToPropertyHash = null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPGenericActionIds.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPGenericActionIds.java
deleted file mode 100644
index faaa453..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPGenericActionIds.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 16, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public interface WTPGenericActionIds {
-
- String CUT = "org.eclipse.wst.common.generic.Cut"; //$NON-NLS-1$
- String COPY = "org.eclipse.wst.common.generic.Copy"; //$NON-NLS-1$
- String PASTE = "org.eclipse.wst.common.generic.Paste"; //$NON-NLS-1$
- String RENAME = "org.eclipse.wst.common.generic.Rename"; //$NON-NLS-1$
- String DELETE = "org.eclipse.wst.common.generic.Delete"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPOperationAction.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPOperationAction.java
deleted file mode 100644
index ed0f12e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPOperationAction.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 29, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.MasterDescriptor;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.UIOperationExtensionRegistry;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.WTPOptionalOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ComposedOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPOperationAction extends Action implements IActionDelegate, IViewActionDelegate {
-
- private IStructuredSelection selection;
-
- private IViewPart viewPart;
-
- private IWorkbenchSite workbenchSite;
-
- public WTPOperationAction() {
- }
-
- public WTPOperationAction(String id, String name) {
- super(name);
- init(id, null);
- }
-
- public WTPOperationAction(String id, String name, ImageDescriptor imgDescriptor) {
- super(name, imgDescriptor);
- init(id, null);
- }
-
- public WTPOperationAction(String id, String name, IWorkbenchSite site) {
- super(name);
- init(id, site);
- }
-
- public WTPOperationAction(String id, String name, ImageDescriptor imgDescriptor, IWorkbenchSite site) {
- super(name, imgDescriptor);
- init(id, site);
- }
-
- /**
- * @param id
- * @param site
- */
- private void init(String id, IWorkbenchSite site) {
- this.setId(id);
- this.setWorkbenchSite(site);
- }
-
- /**
- * @param selection
- * @return
- */
- protected boolean updateSelection(IAction action, IStructuredSelection selection1) {
- this.selection = selection1;
- MasterDescriptor[] masters = UIOperationExtensionRegistry.INSTANCE.getExtendedUIOperations(action.getId(), selection);
- action.setEnabled(masters.length > 0);
- return masters.length > 0;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- run(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public final void run(IAction action) {
-
- if (action == null)
- return;
-
- WTPOptionalOperationDataModel operationDataModel = WTPOptionalOperationDataModel.createDataModel(action.getId(), this.selection);
- operationDataModel.setProperty(WTPOptionalOperationDataModel.IWORKBENCH_SITE, getWorkbenchSite());
-
- executeCompoundOperation(operationDataModel);
- }
-
- /**
- * @return
- */
- public IWorkbenchSite getWorkbenchSite() {
- if (workbenchSite != null)
- return workbenchSite;
- if (viewPart != null)
- return viewPart.getSite();
- return null;
- }
-
- /**
- * @param shell
- * @param operationDataModel
- * @param exec
- */
- protected void executeCompoundOperation(WTPOptionalOperationDataModel operationDataModel) {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- try {
- WTPOperation operation = operationDataModel.getDefaultOperation();
- operationDataModel.setOperationValidationEnabled(true);
- final List runnables = ((ComposedOperation) operation).getRunnables();
- /*
- * PlatformUI.getWorkbench().getProgressService().run(true, false, new
- * IRunnableWithProgress() {
- *
- *
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
- *
- * public void run(IProgressMonitor monitor) throws InvocationTargetException,
- * InterruptedException {
- */
- /* monitor.beginTask("Executing compound operation", runnables.size()); */
- SubProgressMonitor submonitor = null;
- for (int i = 0; i < runnables.size(); i++) {
- final WTPOperation op = (WTPOperation) runnables.get(i);
- if (op != null) {
- /* submonitor = new SubProgressMonitor(monitor, 3); */
- op.run(submonitor);
- }
- /* monitor.worked(1); */
- }
- /* monitor.done(); */
- /*
- * } });
- */
- /* operation.run(new NullProgressMonitor()); */
- status = operation.getStatus();
- if (!status.isOK()) {
- ErrorDialog.openError(shell, WTPCommonUIResourceHandler.getString("WTPOperationAction_UI_0"), WTPCommonUIResourceHandler.getString("WTPOperationAction_UI_1"), status); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- status = new Status(IStatus.ERROR, WTPUIPlugin.PLUGIN_ID, 0, e.toString(), e);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection1) {
- if (selection1 instanceof IStructuredSelection)
- setEnabled(updateSelection(action, (IStructuredSelection) selection1));
- else {
- action.setEnabled(false);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
- */
- public void init(IViewPart view) {
- this.viewPart = view;
- }
-
- /**
- * @param workbenchSite
- * The workbenchSite to set.
- */
- public void setWorkbenchSite(IWorkbenchSite workbenchSite) {
- this.workbenchSite = workbenchSite;
- }
-
- protected IStatus status;
-
- /**
- * @return Returns the status.
- */
- public IStatus getStatus() {
- return status;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPOptionalOperationAction.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPOptionalOperationAction.java
deleted file mode 100644
index a2d36d3..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPOptionalOperationAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 29, 2004
- *
- * TODO To change the template for this generated file go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.IOperationNode;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.WTPActionDialog;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.WTPOptionalOperationDataModel;
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPOptionalOperationAction extends WTPOperationAction {
-
- public WTPOptionalOperationAction() {
- }
-
-
- public WTPOptionalOperationAction(String id, String name) {
- super(id, name);
- }
-
- public WTPOptionalOperationAction(String id, String name, ImageDescriptor imgDescriptor) {
- super(id, name, imgDescriptor);
- }
-
-
- public WTPOptionalOperationAction(String id, String name, IWorkbenchSite site) {
- super(id, name, site);
- }
-
- public WTPOptionalOperationAction(String id, String name, ImageDescriptor imgDescriptor, IWorkbenchSite site) {
- super(id, name, imgDescriptor, site);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.WTPOperationAction#executeCompoundOperation(org.eclipse.wst.common.frameworks.internal.operation.extension.ui.WTPOptionalOperationDataModel)
- */
- protected void executeCompoundOperation(WTPOptionalOperationDataModel operationDataModel) {
- if (operationDataModel != null) {
- IOperationNode root = (IOperationNode) operationDataModel.getProperty(WTPOptionalOperationDataModel.OPERATION_TREE);
- if (WTPOptionalOperationDataModel.getOptionalChildren(root).length > 0) {
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- WTPActionDialog optionalDialog = new WTPActionDialog(shell, operationDataModel);
- optionalDialog.setId(getId());
- if (optionalDialog.open() == Window.OK)
- super.executeCompoundOperation(operationDataModel);
- else
- status = Status.CANCEL_STATUS;
- } else
- super.executeCompoundOperation(operationDataModel);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPUIPlugin.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPUIPlugin.java
deleted file mode 100644
index c831bb7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPUIPlugin.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WTPUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks.internal.ui"; //$NON-NLS-1$
- public static final String EXTENDED_VIEWER_REGISTRY_EXTENSION_POINT = "extendedViewer"; //$NON-NLS-1$
- //The shared instance.
- private static WTPUIPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public WTPUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.frameworks.internal.ui.WTPUIPluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message) {
- return createErrorStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message, Throwable exception) {
- return new Status(IStatus.ERROR, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * Returns the shared instance.
- */
- public static WTPUIPlugin getDefault() {
- return plugin;
- }
-
- public static Logger getLogger() {
- return Logger.getLogger(PLUGIN_ID);
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Return the workbench
- *
- * This method is internal to the j2ee plugin and must not be called by any other plugins.
- */
-
- public static IWorkbench getPluginWorkbench() {
- return getDefault().getWorkbench();
-
- }
-
- public static IRunnableWithProgress getRunnableWithProgress(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- return new RunnableWithProgressWrapper(aHeadlessRunnableWithProgress);
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = WTPUIPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizard.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizard.java
deleted file mode 100644
index a22012e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizard.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.wst.common.frameworks.internal.operation.extensionui.IExtendedWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementManager;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-
-public abstract class WTPWizard extends Wizard {
- protected WTPOperationDataModel model;
-
- public WTPWizard(WTPOperationDataModel model) {
- this.model = model;
- }
-
- public WTPWizard() {
- this.model = createDefaultModel();
- }
-
- /**
- * Return a new default WTPOperationDataModel.
- *
- * @return
- */
- protected abstract WTPOperationDataModel createDefaultModel();
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#canFinish()
- */
- public boolean canFinish() {
- if (super.canFinish())
- return model.isValid();
- return false;
- }
-
- protected void resetAfterFinishError() {
- IWizardPage[] pages = getPages();
- for (int i = 0; i < pages.length; i++) {
- WTPWizardPage wtpPage = (WTPWizardPage) pages[i];
- wtpPage.validatePage(true);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public final boolean performFinish() {
- WTPOperation op = null;
- boolean wasSuccessful = false;
- try {
- model.setProperty(WTPOperationDataModel.UI_OPERATION_HANLDER, new UIOperationHandler(getShell()));
- if (prePerformFinish()) {
- storeDefaultSettings();
- op = createOperation();
- if (!model.getBooleanProperty(WTPOperationDataModel.RUN_OPERATION)) {
- model.setProperty(WTPOperationDataModel.CACHED_DELAYED_OPERATION, op);
- wasSuccessful = isSuccessfulFinish(op);
- return wasSuccessful;
- }
- if (op != null) {
- IRunnableWithProgress runnable = WTPUIPlugin.getRunnableWithProgress(op);
- try {
- getContainer().run(runForked(), isCancelable(), runnable);
- postPerformFinish();
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- ErrorDialog.openError(getShell(), WTPCommonUIResourceHandler.getString("WTPWizard_UI_0", new Object[]{getWindowTitle()}), WTPCommonUIResourceHandler.getString("WTPWizard_UI_1", new Object[]{getWindowTitle()}), e, 0, false); //$NON-NLS-1$ //$NON-NLS-2$
- wasSuccessful = false;
- return wasSuccessful;
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- wasSuccessful = false;
- return wasSuccessful;
- }
- }
- }
- wasSuccessful = isSuccessfulFinish(op);
- return wasSuccessful;
- } finally {
- if (!wasSuccessful) {
- resetAfterFinishError();
- }
- }
- }
-
- /**
- * @param op
- * @return
- */
- protected boolean isSuccessfulFinish(WTPOperation op) {
- return op != null;
- }
-
- /**
- * Subclass can override to perform any tasks prior to running the operation. Return true to
- * have the operation run and false to stop the execution of the operation.
- *
- * @return
- */
- protected boolean prePerformFinish() {
- return true;
- }
-
- /**
- * Subclasses should override to perform any actions necessary after performing Finish.
- */
- protected void postPerformFinish() throws InvocationTargetException {
- }
-
- protected void storeDefaultSettings() {
- IWizardPage[] pages = getPages();
- for (int i = 0; i < pages.length; i++)
- storeDefaultSettings(pages[i], i);
- }
-
- /**
- * Subclasses may override if they need to do something special when storing the default
- * settings for a particular page.
- *
- * @param page
- * @param pageIndex
- */
- protected void storeDefaultSettings(IWizardPage page, int pageIndex) {
- if (page instanceof WTPWizardPage)
- ((WTPWizardPage) page).storeDefaultSettings();
- }
-
- /**
- * Subclasses should override if the running operation is allowed to be cancelled. The default
- * is false.
- *
- * @return
- */
- protected boolean isCancelable() {
- return false;
- }
-
- /**
- * Subclasses should override to return false if the running operation cannot be run forked.
- *
- * @return
- */
- protected boolean runForked() {
- return false;
- }
-
- /**
- * Return the operation that will perform the task suported by this wizard.
- *
- * @return IHeadlessRunnableWithProgress
- */
- protected abstract WTPOperation createOperation();
-
- /**
- * @return Returns the model.
- */
- public WTPOperationDataModel getModel() {
- return model;
- }
-
- public void dispose() {
- super.dispose();
- if (null != model) {
- model.dispose();
- }
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public IWizardPage getNextPage(IWizardPage page) {
- IWizardPage nextPage = super.getNextPage(page);
-
- if (nextPage instanceof IExtendedWizardPage) {
- IExtendedWizardPage extendedWizardPage = (IExtendedWizardPage) nextPage;
- if (!EnablementManager.INSTANCE.getIdentifier(extendedWizardPage.getGroupID(), getModel().getTargetProject()).isEnabled())
- return getNextPage(nextPage);
- }
- return nextPage;
- }
-
- public void addPage(IWizardPage page) {
- if (model.isProperty(WTPWizardSkipPageDataModel.SKIP_PAGES) && null != page.getName()) {
- List pagesToSkip = (List) model.getProperty(WTPWizardSkipPageDataModel.SKIP_PAGES);
- if (null != pagesToSkip && pagesToSkip.contains(page.getName())) {
- return;
- }
- }
- super.addPage(page);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardPage.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardPage.java
deleted file mode 100644
index b1a4baa..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardPage.java
+++ /dev/null
@@ -1,435 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener;
-
-
-public abstract class WTPWizardPage extends WizardPage implements Listener, WTPOperationDataModelListener {
- protected static final int NEXT = 1;
- protected static final int PREVIOUS = 2;
- protected static final int COMPOSITE_BORDER = SWT.NULL;
- private ValidationStatus status = new ValidationStatus();
- private boolean isValidating = false;
- protected boolean isFirstTimeToPage = true;
- protected WTPOperationDataModel model;
- private Map validationMap;
- private String[] validationPropertyNames;
- protected WTPDataModelSynchHelper synchHelper;
- private String infopopID;
-
- /**
- * J2EEWizardPage constructor comment.
- *
- * @param pageName
- * java.lang.String
- */
- protected WTPWizardPage(WTPOperationDataModel model, String pageName) {
- super(pageName);
- this.model = model;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
- /**
- * @return
- */
- public WTPDataModelSynchHelper initializeSynchHelper(WTPOperationDataModel dm) {
- return new WTPDataModelSynchHelper(dm);
- }
-
- /**
- * J2EEWizardPage constructor comment.
- *
- * @param pageName
- * java.lang.String
- * @param title
- * java.lang.String
- * @param titleImage
- * org.eclipse.jface.resource.ImageDescriptor
- */
- protected WTPWizardPage(WTPOperationDataModel model, String pageName, String title, org.eclipse.jface.resource.ImageDescriptor titleImage) {
- super(pageName, title, titleImage);
- this.model = model;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
- protected IPath convertPackageNameToPath(String qualifiedName) {
- String name = qualifiedName.replace('.', '/');
- return new Path(name);
- }
-
- /**
- * Creates the top level control for this dialog page under the given parent composite. This
- * method has been abstract and it uses the template pattern to get the correct items setup in
- * the correct order. See the set of methods below that are called in this method.
- * <p>
- * Implementors are responsible for ensuring that the created control can be accessed via
- * <code>getControl</code>
- * </p>
- *
- * @param parent
- * the parent composite
- */
- public final void createControl(org.eclipse.swt.widgets.Composite parent) {
- Composite top = createTopLevelComposite(parent);
- setControl(top);
- setupInfopop(top);
- setDefaults();
- addListeners();
- initializeValidationProperties();
- }
-
- private void initializeValidationProperties() {
- validationPropertyNames = getValidationPropertyNames();
- if (validationPropertyNames == null || validationPropertyNames.length == 0)
- validationMap = Collections.EMPTY_MAP;
- else {
- validationMap = new HashMap(validationPropertyNames.length);
- for (int i = 0; i < validationPropertyNames.length; i++)
- validationMap.put(validationPropertyNames[i], new Integer(i));
- }
- }
-
- /**
- * Subclass should return the model property names that need to be validated on this page in the
- * order that they should present their messages.
- *
- * @return
- */
- protected abstract String[] getValidationPropertyNames();
-
- /**
- * Return true of the property validation status is OK.
- *
- * @param propertyKey
- * @return
- */
- protected boolean getPropertyOKStatus(String propertyKey) {
- Integer validationKey = getValidationKey(propertyKey);
- if (validationKey != null)
- return getStatus(validationKey);
- return true;
- }
-
- /**
- * @param propertyKey
- * @return
- */
- private Integer getValidationKey(String propertyKey) {
- return (Integer) validationMap.get(propertyKey);
- }
-
- /**
- * Return the top level Composite for this page.
- */
- protected abstract Composite createTopLevelComposite(Composite parent);
-
- /**
- * Set up info pop hooks if set.
- */
- protected void setupInfopop(Control parent) {
- if (getInfopopID() != null)
- WorkbenchHelp.setHelp(parent, getInfopopID());
- }
-
- /**
- * Setup the default values for this page. Subclasses should override to provide appropriate
- * defaults.
- */
- protected void setDefaults() {
- restoreDefaultSettings();
- }
-
- /**
- * Subclasses should implement this method if they have default settings that have been stored
- * and need to be restored.
- *
- * @see storeDefaultSettings()
- */
- protected void restoreDefaultSettings() {
- }
-
- /**
- * Add Listeners to controls at this point to avoid unnecessary events. Subclasses should
- * override to add listeners to its controls.
- */
- protected void addListeners() {
- }
-
- /**
- * The page is being made current and visible. Subclasses may extend.
- */
- protected void enter() {
- try {
- validatePage(showValidationErrorsOnEnter());
- } finally {
- isFirstTimeToPage = false;
- }
- }
-
- /**
- * The default behavior is to return true unless it is the first time entering this page in
- * which case we check to see if there is a previous page and return true if there is not.
- * Subclasses should override if they do not want this default behavior.
- */
- protected boolean showValidationErrorsOnEnter() {
- return !isFirstTimeToPage();
- }
-
- /**
- * The default behavior is to return true unless it is the first time entering this page in
- * which case we check to see if there is a previous page and return true if there is not.
- * Subclasses should override if they do not want this default behavior.
- *
- * @deprecated - use showValidatoinErrorsOnEnter instead
- */
- protected boolean shouldValidateOnEnter() {
- return showValidationErrorsOnEnter();
- }
-
- /**
- * Exiting the page. Subclasses may extend.
- */
- protected void exit() {
- }
-
- protected boolean getStatus(Integer key) {
- return status.hasError(key);
- }
-
- /**
- * Sent when an event that the receiver has registered for occurs. If a subclass overrides this
- * method, it must call super.
- *
- * @param event
- * the event which occurred
- */
- public void handleEvent(org.eclipse.swt.widgets.Event event) {
- //validatePage();
- }
-
- /**
- * Set the error message for this page based on the last error in the ValidationStatus.
- */
- protected void setErrorMessage() {
- String error = status.getLastErrMsg();
- if (error == null) {
- if (getErrorMessage() != null)
- setErrorMessage((String) null);
- String warning = status.getLastWarningMsg();
- if (warning == null) {
- if (getMessage() != null && getMessageType() == IMessageProvider.WARNING)
- setMessage(null, IMessageProvider.WARNING);
- } else if (!warning.equals(getMessage()))
- setMessage(warning, IMessageProvider.WARNING);
- } else if (!error.equals(getErrorMessage()))
- setErrorMessage(error);
- }
-
- protected void setErrorStatus(Integer key, String errorMessage) {
- status.setErrorStatus(key, errorMessage);
- }
-
- protected void setWarningStatus(Integer key, String warningMessage) {
- status.setWarningStatus(key, warningMessage);
- }
-
- protected void setOKStatus(Integer key) {
- status.setOKStatus(key);
- }
-
- /**
- * The <code>DialogPage</code> implementation of this <code>IDialogPage</code> method sets
- * the control to the given visibility state. Subclasses may extend.
- */
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible)
- enter();
- else
- exit();
- }
-
- /**
- * This should be called by the Wizard just prior to running the performFinish operation.
- * Subclasses should override to store their default settings.
- */
- public void storeDefaultSettings() {
- }
-
- /**
- * The page is now being validated. At this time, each control is validated and then the
- * controls are updated based on the results in the ValidationStatus which was updated during
- * <code>validateControls()</code>. Finally, it will display the last error message and it
- * will set the page complete. Subclasses will not typically override this method.
- */
- protected void validatePage() {
- validatePage(true);
- }
-
- protected void validatePage(boolean showMessage) {
- if (!isValidating) {
- isValidating = true;
- try {
- validateControlsBase();
- updateControls();
- if (showMessage)
- setErrorMessage();
- setPageComplete(status.getLastErrMsg() == null);
- } finally {
- isValidating = false;
- }
- }
- }
-
- /**
- * Validate individual controls. Use validation keys to keep track of errors.
- *
- * @see setOKStatus(Integer) and setErrorMessage(Integer, String)
- */
- protected final String validateControlsBase() {
- if (!validationMap.isEmpty()) {
- String propName;
- for (int i = 0; i < validationPropertyNames.length; i++) {
- propName = validationPropertyNames[i];
- Integer valKey = (Integer) validationMap.get(propName);
- if (valKey != null)
- validateProperty(propName, valKey);
- if (!getStatus(valKey))
- return propName;
- }
- }
- return null;
- }
-
- /**
- * @param propertyName
- * @param validationkey
- */
- private void validateProperty(String propertyName, Integer validationKey) {
- setOKStatus(validationKey);
- IStatus status1 = model.validateProperty(propertyName);
- if (!status1.isOK()) {
- String message = status1.isMultiStatus() ? status1.getChildren()[0].getMessage() : status1.getMessage();
- switch (status1.getSeverity()) {
- case IStatus.ERROR :
- setErrorStatus(validationKey, message);
- break;
- case IStatus.WARNING :
- setWarningStatus(validationKey, message);
- break;
- }
- }
- }
-
- /**
- * Update the enablement of controls after validation. Sublcasses should check the status of
- * validation keys to determine enablement.
- */
- protected void updateControls() {
- }
-
- /**
- * Gets the isFirstTimeToPage.
- *
- * @return Returns a boolean
- */
- protected boolean isFirstTimeToPage() {
- return isFirstTimeToPage;
- }
-
- protected void setJavaStatusMessage(IStatus javaStatus, Integer statusKey, String message) {
- if (javaStatus.getSeverity() == IStatus.WARNING)
- setWarningStatus(statusKey, message);
- else
- setErrorStatus(statusKey, message);
- }
-
- /**
- * @param b
- */
- public void setFirstTimeToPage(boolean b) {
- isFirstTimeToPage = b;
- }
-
- /*
- * If a property changes that we want to validate, force validation on this page.
- *
- * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModelListener#propertyChanged(java.lang.String,
- * java.lang.Object, java.lang.Object)
- */
- public void propertyChanged(WTPOperationDataModelEvent event) {
- String propertyName = event.getPropertyName();
- if (validationPropertyNames != null && (event.getFlag() == PROPERTY_CHG || (!isPageComplete() && event.getFlag() == VALID_VALUES_CHG))) {
- for (int i = 0; i < validationPropertyNames.length; i++) {
- if (validationPropertyNames[i].equals(propertyName)) {
- validatePage();
- break;
- }
- }
- }
- }
-
- protected void addSpacers(Composite comp, int spacers) {
- for (int i = 0; i < spacers; i++)
- new Label(comp, SWT.NONE);
- }
-
- /**
- * @return Returns the model.
- */
- protected WTPOperationDataModel getModel() {
- return model;
- }
-
- /**
- * @return Returns the synchHelper.
- */
- protected WTPDataModelSynchHelper getSynchHelper() {
- return synchHelper;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
- public void dispose() {
- super.dispose();
- if (synchHelper != null) {
- synchHelper.dispose();
- synchHelper = null;
- }
- }
-
- protected String getInfopopID() {
- return infopopID;
- }
-
- public void setInfopopID(String infopopID) {
- this.infopopID = infopopID;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardSelectionPage.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardSelectionPage.java
deleted file mode 100644
index 4382c0e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardSelectionPage.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 27, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class WTPWizardSelectionPage extends WTPWizardPage {
- /**
- * @param model
- * @param pageName
- */
- public WTPWizardSelectionPage(WTPOperationDataModel model, String pageName) {
- super(model, pageName);
- }
-
- /**
- * @param model
- * @param pageName
- * @param title
- * @param titleImage
- */
- public WTPWizardSelectionPage(WTPOperationDataModel model, String pageName, String title, ImageDescriptor titleImage) {
- super(model, pageName, title, titleImage);
- }
-
- /**
- * The selected node; <code>null</code> if none.
- */
- private IWizardNode selectedNode = null;
-
- /**
- * List of wizard nodes that have cropped up in the past (element type: <code>IWizardNode</code>).
- */
- private List selectedWizardNodes = new ArrayList();
-
- /**
- * Adds the given wizard node to the list of selected nodes if it is not already in the list.
- *
- * @param node
- * the wizard node, or <code>null</code>
- */
- private void addSelectedNode(IWizardNode node) {
- if (node == null)
- return;
-
- if (selectedWizardNodes.contains(node))
- return;
-
- selectedWizardNodes.add(node);
- }
-
- /**
- * The <code>WizardSelectionPage</code> implementation of this <code>IWizardPage</code>
- * method returns <code>true</code> if there is a selected node.
- */
- public boolean canFlipToNextPage() {
- return isPageComplete() && selectedNode != null;
- }
-
- /**
- * The <code>WizardSelectionPage</code> implementation of an <code>IDialogPage</code> method
- * disposes of all nested wizards. Subclasses may extend.
- */
- public void dispose() {
- super.dispose();
- // notify nested wizards
- for (int i = 0; i < selectedWizardNodes.size(); i++) {
- ((IWizardNode) selectedWizardNodes.get(i)).dispose();
- }
- }
-
- /**
- * The <code>WizardSelectionPage</code> implementation of this <code>IWizardPage</code>
- * method returns the first page of the currently selected wizard if there is one.
- */
- public IWizardPage getNextPage() {
- if (selectedNode == null)
- return null;
-
- boolean isCreated = selectedNode.isContentCreated();
-
- IWizard wizard = selectedNode.getWizard();
-
- if (wizard == null) {
- setSelectedNode(null);
- return null;
- }
-
- if (!isCreated)
- // Allow the wizard to create its pages
- wizard.addPages();
-
- return wizard.getStartingPage();
- }
-
- /**
- * Returns the currently selected wizard node within this page.
- *
- * @return the wizard node, or <code>null</code> if no node is selected
- */
- public IWizardNode getSelectedNode() {
- return selectedNode;
- }
-
- /**
- * Sets or clears the currently selected wizard node within this page.
- *
- * @param node
- * the wizard node, or <code>null</code> to clear
- */
- protected void setSelectedNode(IWizardNode node) {
- addSelectedNode(node);
- selectedNode = node;
- if (isCurrentPage())
- getContainer().updateButtons();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardSkipPageDataModel.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardSkipPageDataModel.java
deleted file mode 100644
index 22532f4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WTPWizardSkipPageDataModel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 25, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-import java.util.Collections;
-
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-
-
-/**
- * @author jsholl
- *
- */
-public class WTPWizardSkipPageDataModel extends WTPOperationDataModel {
-
- /**
- * A List of Strings identifying the page id's to skip
- */
- public static final String SKIP_PAGES = "WTPWizardSkipPageDataModel.SKIP_PAGES"; //$NON-NLS-1$
-
- public WTPOperation getDefaultOperation() {
- return null;
- }
-
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(SKIP_PAGES);
- }
-
- protected Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(SKIP_PAGES)) {
- return Collections.EMPTY_LIST;
- }
- return super.getDefaultProperty(propertyName);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index 82aea76..0000000
--- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.ui;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * An operation which delegates its work to a runnable that modifies the workspace.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.ui.actions.WorkspaceModifyOperation {
- protected List fRunnables;
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
- super(rule);
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- */
- public WorkspaceModifyComposedOperation() {
- super();
- }
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
- super(rule);
- fRunnables = nestedRunnablesWithProgress;
- }
-
- public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
- super();
- fRunnables = nestedRunnablesWithProgress;
- }
-
- /**
- * Creates a new operation which will delegate its work to the given runnable.
- *
- * @param content
- * the runnable to delegate to when this operation is executed
- */
- public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
- super();
- getRunnables().add(nestedOp);
- }
-
- public boolean addRunnable(IRunnableWithProgress nestedOp) {
- return getRunnables().add(nestedOp);
- }
-
- protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- int size = fRunnables.size();
- monitor.beginTask("", size);//$NON-NLS-1$
- for (int i = 0; i < fRunnables.size(); i++) {
- IRunnableWithProgress op = (IRunnableWithProgress) fRunnables.get(i);
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- }
- }
-
- protected List getRunnables() {
- if (fRunnables == null)
- fRunnables = new ArrayList(3);
- return fRunnables;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/.classpath b/plugins/org.eclipse.wst.common.frameworks/.classpath
deleted file mode 100644
index da6dc6b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="src-non_workbench/"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.frameworks/.cvsignore b/plugins/org.eclipse.wst.common.frameworks/.cvsignore
deleted file mode 100644
index ce4d9ca..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-common_core.jar
-common.jar
diff --git a/plugins/org.eclipse.wst.common.frameworks/.options b/plugins/org.eclipse.wst.common.frameworks/.options
deleted file mode 100644
index 2eaab8a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.wtp.common/debug/logtrace=false
-org.eclipse.wtp.common/debug/logtracefile=false
-org.eclipse.wtp.common/debug/loglevel=WARNING
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/.project b/plugins/org.eclipse.wst.common.frameworks/.project
deleted file mode 100644
index 30f458a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.frameworks</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.frameworks/build.properties b/plugins/org.eclipse.wst.common.frameworks/build.properties
deleted file mode 100644
index 69bbf71..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-output.common_core.jar = bin/
-bin.includes = plugin.xml,\
- common_core.jar,\
- common.jar,\
- .options
-jars.compile.order = common_core.jar,\
- common.jar
-src.includes = schema/
-source.common_core.jar = src-non_workbench/
-source.common.jar = src/
diff --git a/plugins/org.eclipse.wst.common.frameworks/plugin.xml b/plugins/org.eclipse.wst.common.frameworks/plugin.xml
deleted file mode 100644
index 96b726e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.frameworks"
- name="org.eclipse.wst.common.frameworks"
- version="1.0.0"
- description="This is a holding place for common frameworks used by components used in WTP currently it includes the following frameworks: operation/data model,function groups framework"
- class="org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin">
-
- <runtime>
- <library name="common.jar">
- <export name="*"/>
- </library>
- <library name="common_core.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="com.ibm.wtp.common.util" export="true"/>
- </requires>
-
-
- <extension-point id="ExtendableOperation" name="Extendable Operation" schema="schema/ExtendableOperation.exsd"/>
- <extension-point id="OperationExtension" name="OperationExtension" schema="schema/OperationExtension.exsd"/>
- <extension-point id="functionGroup" name="Function Extension Group" schema="schema/functionGroup.exsd"/>
- <extension-point id="WTPActivityBridgeHelper" name="WTPActivityBridgeHelper" schema="schema/WTPActivityBridgeHelper.exsd"/>
- <extension-point id="validationSelectionHandler" name="validationSelectionHandler" schema="schema/validationSelectionHandler.exsd"/>
-
- <extension
- id="context.Sensitive.Class.saveHandler"
- name="Save Handler - Headless Context Class"
- point="com.ibm.wtp.common.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="saveHandler"
- context="Headless"
- className="org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless">
- </uiContextSensitiveClass>
- </extension>
- <extension
- id="org.eclipse.wst.common.frameworks.internal.enablement"
- point="com.ibm.wtp.common.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="org.eclipse.wst.common.frameworks.internal.EnablementDetermination"
- context="Headless"
- className="org.eclispe.wst.common.frameworks.internal.enablement.EnablementManager">
- </uiContextSensitiveClass>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.frameworks/prepareforpii.xml b/plugins/org.eclipse.wst.common.frameworks/prepareforpii.xml
deleted file mode 100644
index 638c7dc..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/prepareforpii.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.common"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/src" >
- <fileset dir="${plugindir}/src">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/ExtendableOperation.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/ExtendableOperation.exsd
deleted file mode 100644
index af71234..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/ExtendableOperation.exsd
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.etools.j2ee">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.etools.j2ee" id="ExtendableOperation" name="ExtendabledOperation"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="extendableOperation"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="extendableOperation">
- <complexType>
- <sequence>
- </sequence>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
deleted file mode 100644
index 1af334f..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/OperationExtension.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.etools.j2ee.com.ibm.etools.operations">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.etools.j2ee.com.ibm.etools.operations" id="extension" name="OperationExtension"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="operationExtension"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="operationExtension">
- <complexType>
- <sequence>
- </sequence>
- <attribute name="preOperationClass" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="postOperationClass" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
deleted file mode 100644
index 42ce152..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/WTPActivityBridgeHelper.exsd
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.wtp.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks" id="WTPActivityBridge" name="WTPActivityBridge"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="WTPActivityBridgeHelper"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="WTPActivityBridgeHelper">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
deleted file mode 100644
index aafd7e3..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/functionGroup.exsd
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.ibm.etools.emf.workbench">
-<annotation>
- <appInfo>
- <meta.schema plugin="com.ibm.etools.emf.workbench" id="group" name="Grouping for function contribution"/>
- </appInfo>
- <documentation>
- A functionGroup provides a grouping of related function that can be contributed to the tools. For example, a third party component may want to contribute actions, editor pages, edit model resources, and many other functions specific to a given product. By associating all these functions with a group id, a mechanism is exposed for users to selectively enable and disable baskets of function. Extension points that allow for a "groupID" attribute generally will hide those functions when the group id is disabled.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <choice>
- <element ref="functionGroup" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="functionGroupPatternBinding" minOccurs="1" maxOccurs="unbounded"/>
- </choice>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="functionGroup">
- <annotation>
- <documentation>
- Extension point definition for a group.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="functionGroupID" type="string" use="required">
- <annotation>
- <documentation>
- A unique id for the group.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A human readable name.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string" use="required">
- <annotation>
- <documentation>
- A short description of the group.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="url" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="priority" type="string" use="required">
- <annotation>
- <documentation>
- Ordering magnitude of plugins
- </documentation>
- </annotation>
- </attribute>
- <attribute name="initializerClassName" type="string" use="required">
- <annotation>
- <documentation>
- Class used to determine plugin enablement
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="functionGroupPatternBinding">
- <annotation>
- <documentation>
- This element allows one to bind function groups to patterns.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="functionGroupID" type="string" use="required">
- <annotation>
- <documentation>
- The unique identifier of the function group to bind.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pattern" type="string" use="required">
- <annotation>
- <documentation>
- The pattern to be bound. Patterns are regular expressions which match unique identifiers.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 6.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <code>
-&nbsp;&nbsp;&nbsp;<br>
-&nbsp;&nbsp;&nbsp;&lt;extension<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point="com.ibm.wtp.common.functionGroup"&gt;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;functionGroup<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name="Acme&nbsp;Co.&nbsp;Function&nbsp;Extension"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;functionGroupID="com.acme.acmepro"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;description="The&nbsp;AcmePro&nbsp;Extensions&nbsp;add&nbsp;integration&nbsp;to&nbsp;the&nbsp;Acme&nbsp;Web&nbsp;Server."<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabledByDefault="true"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;icon="..."<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;url="http://www.acme.com/"<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/&gt;<br>
-&nbsp;&nbsp;&nbsp;&lt;/extension&gt;<br>
-</code>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- WTP Function Groups can be referenced through com.ibm.wtp.common.group.WTPFunctionGroupRegistry.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks/schema/validationSelectionHandler.exsd b/plugins/org.eclipse.wst.common.frameworks/schema/validationSelectionHandler.exsd
deleted file mode 100644
index 283f7b9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/schema/validationSelectionHandler.exsd
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.frameworks">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.frameworks" id="validationSelectionHandler" name="validationSelectionHandler"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="validationSelectionHandler" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="validationSelectionHandler">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="handlerClass" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="selectionType" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/IWFTWrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/IWFTWrappedException.java
deleted file mode 100644
index d92bafd..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/IWFTWrappedException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.enablement.nonui;
-
-/**
- * Common interface for ArchiveRuntime and ArchiveWrapped exceptions, which can contain nested
- * exceptions
- */
-public interface IWFTWrappedException {
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
- public String[] getAllMessages();
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to
- * innermost, concatenated as one
- */
- public String getConcatenatedMessages();
-
- public Exception getInnerMostNestedException();
-
- public String getMessage();
-
- public java.lang.Exception getNestedException();
-
- public void printStackTrace();
-
- public void printStackTrace(java.io.PrintStream s);
-
- public void printStackTrace(java.io.PrintWriter s);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WFTWrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WFTWrappedException.java
deleted file mode 100644
index 9a59c94..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WFTWrappedException.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.enablement.nonui;
-
-//import com.ibm.etools.wft.nls.WFTUtilsResourceHandler;
-
-
-
-/**
- * Insert the type's description here. Creation date: (04/03/01 11:12:51 AM)
- *
- * @author: Administrator
- */
-public class WFTWrappedException extends java.lang.reflect.InvocationTargetException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = -6885044277377784429L;
-
- /**
- * WFTWrappedException constructor comment.
- */
- protected WFTWrappedException() {
- super();
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- */
- public WFTWrappedException(Throwable target) {
- super(target);
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- * @param s
- * java.lang.String
- */
- public WFTWrappedException(Throwable target, String s) {
- super(target, s);
- }
-
- /**
- * Print out a stack trace to the system err.
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintStream s) {
- if (getTargetException() != null) {
- s.println(this);
- //TODO add this back in
- // s.println(WFTUtilsResourceHandler.getString("Stack_trace_of_nested_exce_ERROR_"));
- // //$NON-NLS-1$ = "Stack trace of nested exception:"
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintWriter s) {
- if (getTargetException() != null) {
- s.println(this);
- //TODO add this back in
- // s.println(WFTUtilsResourceHandler.getString("Stack_trace_of_nested_exce_ERROR_"));
- // //$NON-NLS-1$ = "Stack trace of nested exception:"
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java b/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
deleted file mode 100644
index 67cac79..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src-non_workbench/org/eclipse/wst/common/frameworks/internal/enablement/nonui/WorkbenchUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.enablement.nonui;
-
-public class WorkbenchUtil {
-
- protected static boolean WorkbenchRunning = false;
-
- private WorkbenchUtil() {
- super();
- }
-
- /**
- * workbenchIsRunning() - test whether or not we are running in the workbench environment.
- *
- * @see JavaPlugin.startup()
- */
- public static boolean workbenchIsRunning() {
- return WorkbenchRunning;
- }
-
- /**
- * Set to true if you are running in a Workbench environment.
- *
- * @see JavaPlugin.startup()
- */
- public static void setWorkbenchIsRunning(boolean aBoolean) {
- WorkbenchRunning = aBoolean;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AbstractRegistryDescriptor.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AbstractRegistryDescriptor.java
deleted file mode 100644
index 07b44b3..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AbstractRegistryDescriptor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 12, 2004
- *
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclispe.wst.common.frameworks.internal.enablement.FunctionGroupRegistry;
-import org.eclispe.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclispe.wst.common.frameworks.internal.enablement.IEnablementManager;
-import org.eclispe.wst.common.frameworks.internal.enablement.Identifiable;
-
-
-/**
- * @author schacher
- *
- * Common superclass for enablement-aware (e.g., using function groups or activiities) extension
- * points.
- */
-public abstract class AbstractRegistryDescriptor extends ConfigurationElementWrapper implements Identifiable {
-
- protected Integer priority;
-
- public AbstractRegistryDescriptor(IConfigurationElement anElement) {
- super(anElement);
- }
-
- public IEnablementIdentifier getEnablementIdentifier(IProject project) {
- return IEnablementManager.INSTANCE.getIdentifier(getID(), project);
- }
-
- public abstract String getID();
-
- public int getPriority() {
- if (priority == null)
- priority = new Integer(FunctionGroupRegistry.getInstance().getFunctionPriority(getID()));
- return priority.intValue();
- }
-
- public boolean isEnabled(IProject p) {
- IEnablementIdentifier id = getEnablementIdentifier(p);
- return id.isEnabled();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AdaptabilityUtility.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AdaptabilityUtility.java
deleted file mode 100644
index 9e8a19d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/AdaptabilityUtility.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author mdelder
- *
- */
-public class AdaptabilityUtility {
-
-
- public static Object getAdapter(Object element, Class adapter) {
- if (element == null)
- return null;
- else if (element instanceof IAdaptable)
- return ((IAdaptable) element).getAdapter(adapter);
- else
- return Platform.getAdapterManager().getAdapter(element, adapter);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ConfigurationElementWrapper.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ConfigurationElementWrapper.java
deleted file mode 100644
index 1f3572a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ConfigurationElementWrapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 20, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ConfigurationElementWrapper {
-
- protected IConfigurationElement element;
-
- /**
- *
- */
- public ConfigurationElementWrapper(IConfigurationElement element) {
- super();
- this.element = element;
- }
-
-
-
- /**
- * @return Returns the element.
- */
- protected IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * Return the plugin id of the configuration element
- *
- * @return
- */
- public String getPluginId() {
- String pluginId = null;
-
- if (element != null) {
- IExtension extension = element.getDeclaringExtension();
-
- if (extension != null) {
- pluginId = extension.getNamespace();
- // TODO jsholl is this correct???
- }
- }
-
- return pluginId;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ExceptionHelper.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ExceptionHelper.java
deleted file mode 100644
index 56e276c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ExceptionHelper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Utility class to factor common code for implementers of IArchiveWrappedException
- */
-public class ExceptionHelper {
- /**
- * Utility class; cannot be instantiated
- */
- private ExceptionHelper() {
- super();
- }
-
- /**
- * Return the messages from
- *
- * @exception and
- * all nested exceptions, in order from outermost to innermost
- */
- public static java.lang.String[] getAllMessages(IWrappedException exception) {
- List messages = new ArrayList(4);
- messages.add(exception.getMessage());
- Exception nested = exception.getNestedException();
- while (nested != null) {
- messages.add(nested.getMessage());
- if (nested instanceof IWrappedException)
- nested = ((IWrappedException) nested).getNestedException();
- else
- nested = null;
- }
- return (String[]) messages.toArray(new String[messages.size()]);
- }
-
- /**
- * Return the messages from
- *
- * @exception and
- * all nested exceptions, in order from outermost to innermost, concatenated as
- * one
- */
- public static String getConcatenatedMessages(IWrappedException exception) {
- String[] messages = getAllMessages(exception);
- StringBuffer sb = new StringBuffer(256);
- for (int i = 0; i < messages.length; i++) {
- sb.append(messages[i]);
- if (i < messages.length - 1)
- sb.append('\n');
- }
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISaveHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISaveHandler.java
deleted file mode 100644
index 743f026..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ISaveHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Defines the API for coping with attempts to overwrite read-only files or save failures
- */
-public interface ISaveHandler {
- public void access();
-
- public void handleSaveFailed(SaveFailedException ex, IProgressMonitor monitor);
-
- public void release();
-
- public boolean shouldContinueAndMakeFileEditable(IFile aFile);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IValidationSelectionHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IValidationSelectionHandler.java
deleted file mode 100644
index f5601f9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IValidationSelectionHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Created on Nov 23, 2004
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * This is used by extensions to add valid validation types to the validate
- * menu action.
- */
-public interface IValidationSelectionHandler {
-
- /**
- * Return a valid IResource type for the extensible object selection,
- * should be instance of IFolder, IFile, or IProject if this extension knows
- * how to handle the selection, otherwise it should return null
- */
- public IResource getBaseValidationType(Object selection);
-
- /**
- * @return the classname of the validation type to register for validation
- */
- public String getValidationTypeString();
-
- public void setValidationTypeString(String validationType);
-
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IWrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IWrappedException.java
deleted file mode 100644
index 8fb86d7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/IWrappedException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-/**
- * Common interface for ArchiveRuntime and ArchiveWrapped exceptions, which can contain nested
- * exceptions
- */
-public interface IWrappedException {
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
- public String[] getAllMessages();
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to
- * innermost, concatenated as one
- */
- public String getConcatenatedMessages();
-
- public Exception getInnerMostNestedException();
-
- public String getMessage();
-
- public java.lang.Exception getNestedException();
-
- public void printStackTrace();
-
- public void printStackTrace(java.io.PrintStream s);
-
- public void printStackTrace(java.io.PrintWriter s);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/Messages.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/Messages.java
deleted file mode 100644
index d8756a9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/Messages.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 21, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class Messages {
- //Resource bundle.
- protected ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public Messages() {
- initializeBundle();
- }
-
- protected abstract void initializeBundle();
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- protected String doGetResourceString(String key) {
- try {
- return (resourceBundle != null ? resourceBundle.getString(key) : key);
- } catch (MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- protected String doGetResourceString(String key, Object[] args) {
- String pattern = doGetResourceString(key);
- if (pattern != null)
- return MessageFormat.format(pattern, args);
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveFailedException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveFailedException.java
deleted file mode 100644
index d6d0f48..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveFailedException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-/**
- * Runtime exception that could get thrown during save of an edit model; clients should use
- * {@link #getConcatenatedMessages}to get all the messages of this and all nested exceptions to
- * report the failure.
- */
-public class SaveFailedException extends WrappedRuntimeException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = -4640018901910731240L;
-
- /**
- * SaveFailedException constructor comment.
- */
- public SaveFailedException() {
- super();
- }
-
- /**
- * SaveFailedException constructor comment.
- *
- * @param e
- * java.lang.Exception
- */
- public SaveFailedException(Exception e) {
- super(e);
- }
-
- /**
- * SaveFailedException constructor comment.
- *
- * @param s
- * java.lang.String
- */
- public SaveFailedException(String s) {
- super(s);
- }
-
- /**
- * SaveFailedException constructor comment.
- *
- * @param s
- * java.lang.String
- * @param e
- * java.lang.Exception
- */
- public SaveFailedException(String s, Exception e) {
- super(s, e);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerHeadless.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerHeadless.java
deleted file mode 100644
index b9efa82..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerHeadless.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.IWFTWrappedException;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * Insert the type's description here. Creation date: (10/19/2001 11:40:59 AM)
- *
- * @author: Administrator
- */
-public class SaveHandlerHeadless implements ISaveHandler {
- /**
- * HeadlessSaveHandler constructor comment.
- */
- public SaveHandlerHeadless() {
- super();
- }
-
- /**
- * access method comment.
- */
- public void access() {
- }
-
- /**
- * handleSaveFailed method comment.
- */
- public void handleSaveFailed(SaveFailedException ex, org.eclipse.core.runtime.IProgressMonitor monitor) {
- throw ex;
- }
-
- public static boolean isFailedWriteFileFailure(IWFTWrappedException ex) {
- Exception nested = ex.getInnerMostNestedException();
- if (nested == null)
- return false;
-
- return isFailedWriteFileFailure(nested);
- }
-
- public static boolean isFailedWriteFileFailure(Exception ex) {
- if (ex instanceof IWFTWrappedException)
- return isFailedWriteFileFailure((IWFTWrappedException) ex);
- else if (ex instanceof CoreException)
- return isFailedWriteFileFailure((CoreException) ex);
- return false;
- }
-
- public static boolean isFailedWriteFileFailure(CoreException ex) {
- org.eclipse.core.runtime.IStatus status = ex.getStatus();
- if (status == null)
- return false;
- Throwable nested = status.getException();
- if (nested instanceof CoreException)
- return isFailedWriteFileFailure((CoreException) nested);
- return status.getCode() == org.eclipse.core.resources.IResourceStatus.FAILED_WRITE_LOCAL;
- }
-
- /**
- * release method comment.
- */
- public void release() {
- }
-
- /**
- * shouldContinueAndMakeFileEditable method comment.
- */
- public boolean shouldContinueAndMakeFileEditable(org.eclipse.core.resources.IFile aFile) {
- if (aFile == null)
- return false;
- String error = WTPResourceHandler.getString("Unable_to_save_read-only_f_ERROR_", new Object[]{aFile.getFullPath()}); //$NON-NLS-1$ = "Unable to save read-only file: "
- Logger.getLogger().logError(error);
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerRegister.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerRegister.java
deleted file mode 100644
index 537f79e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/SaveHandlerRegister.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-import com.ibm.wtp.common.UIContextDetermination;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * A registry for the default ISaveHandler to use when saving edit models
- */
-public class SaveHandlerRegister {
- private static ISaveHandler saveHandler;
-
- /**
- * This is a utility class and should not be instantiated
- */
- protected SaveHandlerRegister() {
- super();
- }
-
- public static ISaveHandler getSaveHandler() {
- if (saveHandler == null)
- saveHandler = (ISaveHandler) UIContextDetermination.createInstance("saveHandler"); //$NON-NLS-1$
- return saveHandler;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ValidationSelectionHandlerRegistryReader.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ValidationSelectionHandlerRegistryReader.java
deleted file mode 100644
index ece8af9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/ValidationSelectionHandlerRegistryReader.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Created on Nov 23, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-import com.ibm.wtp.common.RegistryReader;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ValidationSelectionHandlerRegistryReader extends RegistryReader {
-
- public static final String VALIDATION_SELECTION_HANDLER = "validationSelectionHandler"; //$NON-NLS-1$
- static final String ATT_ID = "id"; //$NON-NLS-1$
- static final String ATT_HANDLER_CLASS = "handlerClass"; //$NON-NLS-1$
- static final String ATT_SELECTION_TYPE = "selectionType"; //$NON-NLS-1$
- private static ValidationSelectionHandlerRegistryReader INSTANCE = null;
- private List validationSelectionHandlers = null;
-
- /**
- * Default constructor
- */
- public ValidationSelectionHandlerRegistryReader() {
- super(WTPCommonPlugin.PLUGIN_ID, VALIDATION_SELECTION_HANDLER);
- }
-
- public static ValidationSelectionHandlerRegistryReader getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new ValidationSelectionHandlerRegistryReader();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
-
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(VALIDATION_SELECTION_HANDLER))
- return false;
-
- String handlerClass = element.getAttribute(ATT_HANDLER_CLASS);
- String selectionType = element.getAttribute(ATT_SELECTION_TYPE);
-
- IValidationSelectionHandler handler = null;
- try {
- handler = (IValidationSelectionHandler) element.createExecutableExtension(ATT_HANDLER_CLASS);
- handler.setValidationTypeString(selectionType);
- getValidationSelectionHandlers().add(handler);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return false;
- }
-
- private List getValidationSelectionHandlers() {
- if (validationSelectionHandlers == null)
- validationSelectionHandlers = new ArrayList();
- return validationSelectionHandlers;
- }
-
- public Object getExtendedType(Object selection) {
- Object result = null;
- for (int i=0; i<getValidationSelectionHandlers().size(); i++ ) {
- IValidationSelectionHandler handler = (IValidationSelectionHandler) getValidationSelectionHandlers().get(i);
- result = handler.getBaseValidationType(selection);
- if (result != null)
- break;
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPPlugin.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPPlugin.java
deleted file mode 100644
index efb11bb..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPPlugin.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Dec 10, 2003
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WorkbenchUtil;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-import com.ibm.wtp.logger.proxyrender.DefaultPluginTraceRenderer;
-import com.ibm.wtp.logger.proxyrender.IMsgLogger;
-
-public abstract class WTPPlugin extends Plugin implements IMsgLogger {
- protected static Logger logger = null;
-
- /**
- * @param descriptor
- */
- public WTPPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- }
-
- public Logger getMsgLogger() {
- if (logger == null) {
- logger = Logger.getLogger(getPluginID());
- setRenderer(logger);
- }
- return logger;
- }
-
- /**
- * @param aLogger
- */
- protected void setRenderer(Logger aLogger) {
- new DefaultPluginTraceRenderer(aLogger);
- }
-
- public Logger getLogger() {
- return getMsgLogger();
- }
-
- public abstract String getPluginID();
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#startup()
- */
- public void startup() throws CoreException {
- super.startup();
- WorkbenchUtil.setWorkbenchIsRunning(true);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
deleted file mode 100644
index 1e7d519..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPProjectUtilities.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WTPProjectUtilities {
-
- /**
- * Adds a old nauture to a project, FIRST, this is used to make project backward compatible
- */
- public static void addOldNatureToProject(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
-
- //check if the old nature does not exist
- boolean addNature = true;
- for (int i = 0; i < prevNatures.length; i++) {
- String nature = prevNatures[i];
- if (nature.equals(natureId)) {
- addNature = false;
- break;
- }
- }
- if (addNature) {
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 1, prevNatures.length);
- newNatures[0] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, IResource.AVOID_NATURE_CONFIG, null);
- }
- }
-
- /**
- * Adds a nature in the project in the index specified
- */
- public static void addOldNatureToProject(IProject proj, String natureId, int index) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
-
- //check if the old nature does not exist
- boolean addNature = true;
- for (int i = 0; i < prevNatures.length; i++) {
- String nature = prevNatures[i];
- if (nature.equals(natureId)) {
- addNature = false;
- break;
- }
- }
- if (addNature) {
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, index);
-
- newNatures[index] = natureId;
- System.arraycopy(prevNatures, index, newNatures, index + 1, prevNatures.length - index);
- description.setNatureIds(newNatures);
- proj.setDescription(description, IResource.AVOID_NATURE_CONFIG, null);
- }
- }
-
- /**
- * Adds a nauture to a project, FIRST
- */
- public static void addNatureToProject(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 1, prevNatures.length);
- newNatures[0] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- /**
- * Adds a nature to a project, LAST
- */
- public static void addNatureToProjectLast(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
- newNatures[prevNatures.length] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- /**
- * remove a nature from the project
- */
- public static void removeNatureFromProject(IProject project, String natureId) throws CoreException {
- IProjectDescription description = project.getDescription();
- String[] prevNatures = description.getNatureIds();
- int size = prevNatures.length;
- int newsize = 0;
- String[] newNatures = new String[size];
- boolean matchfound = false;
- for (int i = 0; i < size; i++) {
- if (prevNatures[i].equals(natureId)) {
- matchfound = true;
- continue;
- }
- newNatures[newsize++] = prevNatures[i];
- }
- if (!matchfound)
- throw new CoreException(new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, 0, "The nature id " + natureId + " does not exist on the project " + project.getName(), null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String[] temp = newNatures;
- newNatures = new String[newsize];
- System.arraycopy(temp, 0, newNatures, 0, newsize);
- description.setNatureIds(newNatures);
- project.setDescription(description, null);
- }
-
- public static IProject getProject(Object object) {
- IProject result = null;
-
- if (object instanceof IProject)
- result = (IProject) object;
- else if (object instanceof IResource)
- result = ((IResource) object).getProject();
- else if (object instanceof IAdaptable)
- result = (IProject) ((IAdaptable) object).getAdapter(IProject.class);
-
- return result;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPResourceHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPResourceHandler.java
deleted file mode 100644
index a2363d2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WTPResourceHandler.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * @author Administrator
- *
- *
- */
-public class WTPResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("wtp_common"); //$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!"; //$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedException.java
deleted file mode 100644
index e53c51c..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-
-public class WrappedException extends java.lang.reflect.InvocationTargetException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = -9221925581603648538L;
-
- /**
- * WFTWrappedException constructor comment.
- */
- protected WrappedException() {
- super();
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- */
- public WrappedException(Throwable target) {
- super(target);
- }
-
- /**
- * WFTWrappedException constructor comment.
- *
- * @param target
- * java.lang.Throwable
- * @param s
- * java.lang.String
- */
- public WrappedException(Throwable target, String s) {
- super(target, s);
- }
-
- /**
- * Print out a stack trace to the system err.
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintStream s) {
- if (getTargetException() != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintWriter s) {
- if (getTargetException() != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- getTargetException().printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedRuntimeException.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedRuntimeException.java
deleted file mode 100644
index e1f769e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/WrappedRuntimeException.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal;
-
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-
-
-public class WrappedRuntimeException extends RuntimeException implements IWrappedException {
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 2684637746275620101L;
- /** The exception which necessitated this runtime exception, if one exists */
- protected Exception nestedException;
-
- public WrappedRuntimeException() {
- super();
- }
-
- public WrappedRuntimeException(Exception e) {
- super();
- setNestedException(e);
- }
-
- public WrappedRuntimeException(String s) {
- super(s);
- }
-
- public WrappedRuntimeException(String s, Exception e) {
- super(s);
- setNestedException(e);
- }
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
- public java.lang.String[] getAllMessages() {
- return ExceptionHelper.getAllMessages(this);
- }
-
- /**
- * Return the messages from this and all nested exceptions, in order from outermost to
- * innermost, concatenated as one
- */
- public java.lang.String getConcatenatedMessages() {
- return ExceptionHelper.getConcatenatedMessages(this);
- }
-
- /**
- * getInnerMostNestedException method comment.
- */
- public java.lang.Exception getInnerMostNestedException() {
- Exception n = getNestedException();
- if (n == null)
- return this;
- else if (n instanceof IWrappedException)
- return ((IWrappedException) n).getInnerMostNestedException();
- else
- return n;
- }
-
- /**
- * @return java.lang.Exception
- */
- public java.lang.Exception getNestedException() {
- return nestedException;
- }
-
- /**
- * Print out a stack trace to the system err.
- */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintStream s) {
- if (nestedException != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- nestedException.printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * Prints the exception to System.err. If we have a nested exception, print its stack.
- */
- public void printStackTrace(java.io.PrintWriter s) {
- if (nestedException != null) {
- s.println(this);
- s.println("Stack trace of nested exception:"); //$NON-NLS-1$
- nestedException.printStackTrace(s);
- } else {
- super.printStackTrace(s);
- }
- }
-
- /**
- * @param newNestedException
- * java.lang.Exception
- */
- public void setNestedException(java.lang.Exception newNestedException) {
- nestedException = newNestedException;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridge.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridge.java
deleted file mode 100644
index 29484f0..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridge.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.activities;
-
-import java.util.Collections;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public class WTPActivityBridge {
- private static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks"; //$NON-NLS-1$
- private static final String EXTENSION_POINT = "WTPActivityBridgeHelper"; //$NON-NLS-1$
- private static final String LISTENER_CLASS = "class"; //$NON-NLS-1$
-
- private static WTPActivityBridge INSTANCE = null;
- private WTPActivityBridgeHelper[] listeners;
-
- public static WTPActivityBridge getInstance() {
- if (null == INSTANCE) {
- INSTANCE = new WTPActivityBridge();
- }
- return INSTANCE;
- }
-
- private WTPActivityBridge() {
- loadExtensionPoints();
- }
-
- public void enableActivity(String activityID, boolean enabled) {
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].enableActivity(activityID, enabled);
- }
- }
-
- public Set getEnabledActivityIds() {
- for (int i = 0; i < listeners.length; i++) {
- return listeners[i].getEnabledActivityIds();
- }
- return Collections.EMPTY_SET;
- }
-
- public void setEnabledActivityIds(Set activityIDs) {
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].setEnabledActivityIds(activityIDs);
- }
- }
-
- public Set getActivityIDsFromContribution(String localID, String pluginID) {
- for (int i = 0; i < listeners.length; i++) {
- return listeners[i].getActivityIDsFromContribution(localID, pluginID);
- }
- return Collections.EMPTY_SET;
- }
-
- private void loadExtensionPoints() {
- IExtensionPoint point = Platform.getPluginRegistry().getExtensionPoint(PLUGIN_ID, EXTENSION_POINT);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- listeners = new WTPActivityBridgeHelper[elements.length];
- for (int i = 0; i < elements.length; i++) {
- if (null == elements[i].getAttribute(LISTENER_CLASS)) {
- logError(elements[i], "No " + LISTENER_CLASS + " defined."); //$NON-NLS-1$ //$NON-NLS-2$
- }
- try {
- listeners[i] = (WTPActivityBridgeHelper) elements[i].createExecutableExtension(LISTENER_CLASS);
- } catch (CoreException e) {
- logError(elements[i], "Error loading " + LISTENER_CLASS + ":" + elements[i].getAttribute(LISTENER_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
- e.printStackTrace();
- }
- }
- }
-
- public static void logError(IConfigurationElement element, String text) {
- IExtension extension = element.getDeclaringExtension();
- IPluginDescriptor descriptor = extension.getDeclaringPluginDescriptor();
- StringBuffer buf = new StringBuffer();
- buf.append("Plugin " + descriptor.getUniqueIdentifier() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
- buf.append("\n" + text); //$NON-NLS-1$
- Logger.getLogger().logError(buf.toString());
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridgeHelper.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridgeHelper.java
deleted file mode 100644
index 4378df1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/activities/WTPActivityBridgeHelper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.activities;
-
-import java.util.Set;
-
-/**
- * @author jsholl
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Generation - Code and Comments
- */
-public interface WTPActivityBridgeHelper {
-
- public void enableActivity(String activityID, boolean enabled);
-
- public Set getEnabledActivityIds();
-
- public void setEnabledActivityIds(Set activityIDs);
-
- public Set getActivityIDsFromContribution(String localID, String pluginID);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedExtendedOperationHolder.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedExtendedOperationHolder.java
deleted file mode 100644
index 560d5b2..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedExtendedOperationHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.util.ArrayList;
-
-
-
-
-public class ComposedExtendedOperationHolder {
-
- private ArrayList preOps = null;
- private ArrayList postOps = null;
-
- /**
- *
- */
- protected ComposedExtendedOperationHolder() {
- super();
- }
-
- protected void addPreOperation(WTPOperation preOp) {
- if (preOps == null) {
- preOps = new ArrayList();
- }
- preOps.add(preOp);
- }
-
- protected void addPostOperation(WTPOperation postOp) {
- if (postOps == null) {
- postOps = new ArrayList();
- }
- postOps.add(postOp);
- }
-
- public boolean hasPreOps() {
- return preOps != null;
- }
-
- public boolean hasPostOps() {
- return postOps != null;
- }
-
- public ArrayList getPostOps() {
- return postOps;
- }
-
- public ArrayList getPreOps() {
- return preOps;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedOperation.java
deleted file mode 100644
index 5bb08f4..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ComposedOperation.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-public class ComposedOperation extends WTPOperation {
-
- protected List fRunnables;
-
- public ComposedOperation() {
- super();
- }
-
- public ComposedOperation(List nestedRunnablesWithProgress) {
- super();
- fRunnables = nestedRunnablesWithProgress;
- }
-
- public boolean addRunnable(WTPOperation nestedOp) {
- return getRunnables().add(nestedOp);
- }
-
- public WTPOperation append(WTPOperation op) {
- this.addRunnable(op);
- return this;
- }
-
- // TODO MDE Make protected
- public List getRunnables() {
- if (fRunnables == null)
- fRunnables = new ArrayList(3);
- return fRunnables;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.operations.IHeadlessRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- if (fRunnables == null || fRunnables.isEmpty())
- return;
- int size = fRunnables.size();
- monitor.beginTask("", size);//$NON-NLS-1$
-
- OperationStatus composedStatus = null;
- try {
- for (int i = 0; i < fRunnables.size(); i++) {
- WTPOperation op = (WTPOperation) fRunnables.get(i);
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- if (composedStatus == null)
- composedStatus = new OperationStatus(new IStatus[]{op.getStatus()});
- else
- composedStatus.add(op.getStatus());
- }
- } finally {
- if (composedStatus != null)
- addStatus(composedStatus);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/FailSafeComposedOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/FailSafeComposedOperation.java
deleted file mode 100644
index 5dabd92..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/FailSafeComposedOperation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 21, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code Generation - Code and
- * Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author jsholl
- *
- * Same as ComposedOperation except the first Operation must run; all others can fail without
- * effecting the ComposedOperation or any other operation following them in the Composed Operation's
- * list.
- */
-public class FailSafeComposedOperation extends ComposedOperation {
-
- public FailSafeComposedOperation() {
- super();
- }
-
- public FailSafeComposedOperation(List nestedRunnablesWithProgress) {
- super(nestedRunnablesWithProgress);
- }
-
- public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- int size = fRunnables.size();
- monitor.beginTask("", size); //$NON-NLS-1$
- for (int i = 0; i < fRunnables.size(); i++) {
- WTPOperation op = (WTPOperation) fRunnables.get(i);
- if (i == 0) { //The first one must pass; all others can fail
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- } else {
- try {
- op.run(new SubProgressMonitor(monitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK));
- } catch (InterruptedException e) {
- throw e;
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IHeadlessRunnableWithProgress.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IHeadlessRunnableWithProgress.java
deleted file mode 100644
index 74c9b92..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IHeadlessRunnableWithProgress.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Insert the type's description here. Creation date: (5/8/2001 1:14:41 PM)
- *
- * @author: Administrator
- */
-public interface IHeadlessRunnableWithProgress {
- /**
- * Runs this operation without forcing a UI dependency.
- *
- * @param monitor
- * the progress monitor to use to display progress and receive requests for
- * cancelation
- * @exception InvocationTargetException
- * if the run method must propagate a checked exception, it should wrap it inside
- * an <code>InvocationTargetException</code>; runtime exceptions are
- * automatically wrapped in an <code>InvocationTargetException</code> by the
- * calling context
- * @exception InterruptedException
- * if the operation detects a request to cancel, using
- * <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableWithProgress
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IOperationHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IOperationHandler.java
deleted file mode 100644
index 3399b62..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/IOperationHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * Passed to complex methods that may require reporting of messages, or interactions from the user;
- * Defined as an interface because the actions may run in headless environments
- */
-public interface IOperationHandler {
- int YES = 0;
- int YES_TO_ALL = 1;
- int NO = 2;
- int CANCEL = 3;
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message);
-
- /**
- * A decision needs to made as to whether an action/operation can continue. <code>items</code>
- * is an array of details that accompany the <code>message</code>.
- */
- public boolean canContinue(String message, String[] items);
-
- /**
- * A decision needs to made as to whether an action/operation can continue. The boolean array
- * will return two booleans. The first indicates their response to the original question and the
- * second indicates if they selected the apply to all check box.
- *
- * Return the return code for the dialog. 0 = Yes, 1 = Yes to all, 2 = No
- */
- int canContinueWithAllCheck(String message);
-
- int canContinueWithAllCheckAllowCancel(String message);
-
- /**
- * An error has occurred
- */
- public void error(String message);
-
- /**
- * An informational message needs to be presented
- */
- public void inform(String message);
-
- public Object getContext();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/NonConflictingRule.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/NonConflictingRule.java
deleted file mode 100644
index a715b4a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/NonConflictingRule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 29, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to Window - Preferences - Java -
- * Code Style - Code Templates
- */
-public class NonConflictingRule implements ISchedulingRule {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
- */
- public boolean contains(ISchedulingRule rule) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
- */
- public boolean isConflicting(ISchedulingRule rule) {
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/NullOperationHandler.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/NullOperationHandler.java
deleted file mode 100644
index a068da5..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/NullOperationHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * Simple implementer that ignores messages and always allows actions to continue
- */
-public class NullOperationHandler implements IOperationHandler {
- /**
- * NullOperationHandler constructor comment.
- */
- public NullOperationHandler() {
- super();
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message) {
- return true;
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue
- */
- public boolean canContinue(String message, String[] items) {
- return true;
- }
-
- /**
- * A decision needs to made as to whether an action/operation can continue. The boolean array
- * will return two booleans. The first indicates their response to the original question and the
- * second indicates if they selected the apply to all check box.
- *
- * Return the return code for the dialog. 0 = Yes, 1 = Yes to all, 2 = No
- */
- public int canContinueWithAllCheck(java.lang.String message) {
- return 0;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.operations.IOperationHandler#canContinueWithAllCheckAllowCancel(java.lang.String)
- */
- public int canContinueWithAllCheckAllowCancel(String message) {
- return 0;
- }
-
- /**
- * An error has occurred
- */
- public void error(String message) {
- System.err.println(message);
- }
-
- /**
- * An informational message needs to be presented
- */
- public void inform(String message) {
- }
-
- /**
- * @see com.ibm.etools.j2ee.operations.IOperationHandler#getContext()
- */
- public Object getContext() {
- return null;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensibilityReader.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensibilityReader.java
deleted file mode 100644
index 1a2b6c1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensibilityReader.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-import com.ibm.wtp.common.RegistryReader;
-
-
-public class OperationExtensibilityReader extends RegistryReader {
- static final String ELEMENT_J2EEOPEXT = "extendableOperation"; //$NON-NLS-1$
- static final String OPERATION_ATTRIBUTE = "class"; //$NON-NLS-1$
- static final String OPERATION_ID = "id"; //$NON-NLS-1$
- protected static HashMap extensibleOperations = null;
-
- public OperationExtensibilityReader() {
- super(WTPCommonPlugin.PLUGIN_ID, "ExtendableOperation"); //$NON-NLS-1$
- }
-
- /**
- * readElement() - parse and deal with an extension like: <extendableOperation class =
- * "com.ibm.etools.foo.Operation" id ' "" />
- */
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT_J2EEOPEXT))
- return false;
- String op = element.getAttribute(OPERATION_ATTRIBUTE);
- String id = element.getAttribute(OPERATION_ID);
- addExtendableOperation(op, id);
- return true;
- }
-
- /**
- * Sets the Extendable Operation
- *
- * @param op
- * @param id
- */
- private static void addExtendableOperation(String op, String id) {
- if (extensibleOperations == null)
- extensibleOperations = new HashMap();
- extensibleOperations.put(op, id);
- }
-
- protected static HashMap getExtendableOperations() {
- return extensibleOperations;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtension.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtension.java
deleted file mode 100644
index 3bdf85d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class OperationExtension {
-
- String opID = null;
-
- IConfigurationElement baseElement = null;
-
- String preOperationClass = null;
-
- WTPOperation preOperation = null;
-
- String postOperationClass = null;
-
- WTPOperation postOperation = null;
-
- private String extensionId;
-
- public OperationExtension(IConfigurationElement element, String id, String preOp, String postOp) {
- super();
- baseElement = element;
- setUpExtension(id, preOp, postOp);
- }
-
- private void setUpExtension(String id, String preOp, String postOp) {
- opID = id;
- preOperationClass = preOp;
- postOperationClass = postOp;
- this.extensionId = baseElement.getDeclaringExtension().getUniqueIdentifier();
- if (this.extensionId == null)
- this.extensionId = baseElement.getDeclaringExtension().getDeclaringPluginDescriptor().getUniqueIdentifier();
- }
-
- public String getOpID() {
- return opID;
- }
-
- public String getPostOperationClass() {
- return postOperationClass;
- }
-
- public String getPreOperationClass() {
- return preOperationClass;
- }
-
- public WTPOperation getPostOperation() throws CoreException {
- if (postOperationClass == null)
- return null;
- WTPOperation op = (WTPOperation) baseElement.createExecutableExtension(OperationExtensionReader.ATT_POST_OP);
- if (op != null)
- op.setID(getExtensionId());
- return op;
- }
-
- public WTPOperation getPreOperation() throws CoreException {
- if (preOperationClass == null)
- return null;
- WTPOperation op = (WTPOperation) baseElement.createExecutableExtension(OperationExtensionReader.ATT_PRE_OP);
- if (op != null)
- op.setID(getExtensionId());
- return op;
-
- }
-
- /**
- * @return Returns the extensionId.
- */
- public String getExtensionId() {
- return extensionId;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionReader.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionReader.java
deleted file mode 100644
index 535f16b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionReader.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Nov 3, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-import com.ibm.wtp.common.RegistryReader;
-
-public class OperationExtensionReader extends RegistryReader {
- protected static HashMap opExtensions = null;
-
- static final String ELEMENT_J2EEOPEXT = "operationExtension"; //$NON-NLS-1$
- static final String ATT_ID = "id"; //$NON-NLS-1$
- //static final String ATT_OP_TYPE = "operationType"; //$NON-NLS-1$
- static final String ATT_PRE_OP = "preOperationClass"; //$NON-NLS-1$
- static final String ATT_POST_OP = "postOperationClass"; //$NON-NLS-1$
-
- public OperationExtensionReader() {
- super(WTPCommonPlugin.PLUGIN_ID, "OperationExtension"); //$NON-NLS-1$
- }
-
- /**
- * readElement() - parse and deal with an extension like: <operationExtension
- * preOperationClass="com.ibm.etools....PreDeleteOperation"
- * postOperationClass="com.ibm.etools....PostDeleteOperation"> </operationExtension>
- */
-
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(ELEMENT_J2EEOPEXT))
- return false;
- String id = element.getAttribute(ATT_ID);
- String preOp = element.getAttribute(ATT_PRE_OP);
- String postOp = element.getAttribute(ATT_POST_OP);
- OperationExtension extension = new OperationExtension(element, id, preOp, postOp);
- addExtensionPoint(extension);
- return true;
-
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- private static void addExtensionPoint(OperationExtension newExtension) {
- if (opExtensions == null)
- opExtensions = new HashMap();
- Collection temp = null;
- Object holder = opExtensions.get(newExtension.getOpID());
- if (holder == null) {
- temp = new ArrayList();
- temp.add(newExtension);
- opExtensions.put(newExtension.getOpID(), temp);
- } else {
- temp = (Collection) holder;
- temp.add(newExtension);
- }
- }
-
- protected static HashMap getExtensionPoints() {
- return opExtensions;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionRegistry.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionRegistry.java
deleted file mode 100644
index a08fab7..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationExtensionRegistry.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Oct 1, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclispe.wst.common.frameworks.internal.enablement.EnablementManager;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-public class OperationExtensionRegistry {
-
- protected static boolean canExtHasRead = false;
-
- protected static boolean extPointHasRead = false;
-
- protected static OperationExtensionRegistry instance = null;
-
- protected static HashMap extensibleOperations = null;
-
- protected static HashMap opExtensions = null;
-
- protected static OperationExtensibilityReader opExtensibilityReader = null;
-
- protected static OperationExtensionReader opExtensionReader = null;
-
- public static String[] getRegisteredOperations(String className) {
- extensibleOperations = getExtensibility();
- if (extensibleOperations != null) {
- String id = (String) extensibleOperations.get(className);
- if (id == null)
- return null;
- if (opExtensions == null)
- opExtensions = getExtensionPoints();
- if (opExtensions != null) {
- Collection ext = (Collection) opExtensions.get(id);
- if (ext != null)
- return getClassNames(ext.toArray());
- }
- }
- return null;
- }
-
- private static String[] getClassNames(Object[] opExt) {
- ArrayList classNames = new ArrayList();
- OperationExtension currentExt = null;
- for (int i = 0; i < opExt.length; i++) {
- currentExt = (OperationExtension) opExt[i];
- /* Only allow extensions which enabled (null project indicates enabled by activity only) */
- if (EnablementManager.INSTANCE.getIdentifier(currentExt.getExtensionId(), null).isEnabled()) {
- String className = currentExt.getPreOperationClass();
- if (null != className) {
- classNames.add(className);
- }
- className = currentExt.getPostOperationClass();
- if (null != className) {
- classNames.add(className);
- }
- }
- }
- String[] array = new String[classNames.size()];
- classNames.toArray(array);
- return array;
- }
-
- public static ComposedExtendedOperationHolder getExtensions(String className) {
- extensibleOperations = getExtensibility();
- if (extensibleOperations != null) {
- String id = (String) extensibleOperations.get(className);
- if (id == null)
- return null;
- if (opExtensions == null)
- opExtensions = getExtensionPoints();
- if (opExtensions != null) {
- Collection ext = (Collection) opExtensions.get(id);
- if (ext != null) {
- try {
- return calculateOperationHolder(ext);
- } catch (CoreException ex) {
- Logger.getLogger().logError(ex);
- }
- }
- }
- }
- return null;
- }
-
- public static ComposedExtendedOperationHolder getExtensions(WTPOperation op) {
- return getExtensions(op.getClass().getName());
- }
-
- protected String getExtendableOperationId(WTPOperation op) {
- return (String) extensibleOperations.get(op.getClass().getName());
- }
-
- private static ComposedExtendedOperationHolder calculateOperationHolder(Collection ext) throws CoreException {
- Object[] opExt = ext.toArray();
- ComposedExtendedOperationHolder extOperationHolder = new ComposedExtendedOperationHolder();
- WTPOperation preOp = null;
- WTPOperation postOp = null;
- OperationExtension currentExt = null;
- for (int i = 0; i < opExt.length; i++) {
- currentExt = (OperationExtension) opExt[i];
- /* Only allow extensions which enabled (null project indicates enabled by activity only) */
- if (EnablementManager.INSTANCE.getIdentifier(currentExt.getExtensionId(), null).isEnabled()) {
- preOp = currentExt.getPreOperation();
- if (preOp != null) {
- extOperationHolder.addPreOperation(preOp);
- }
- postOp = currentExt.getPostOperation();
- if (postOp != null) {
- extOperationHolder.addPostOperation(postOp);
- }
- }
- }
- return extOperationHolder;
- }
-
- private static HashMap getExtensibility() {
- if (!canExtHasRead) {
- opExtensibilityReader = new OperationExtensibilityReader();
- opExtensibilityReader.readRegistry();
- canExtHasRead = true;
- }
- if (opExtensibilityReader == null)
- return null;
- return OperationExtensibilityReader.getExtendableOperations();
- }
-
- private static HashMap getExtensionPoints() {
- if (!extPointHasRead) {
- opExtensionReader = new OperationExtensionReader();
- opExtensionReader.readRegistry();
- extPointHasRead = true;
- }
- if (opExtensionReader == null)
- return null;
- return OperationExtensionReader.getExtensionPoints();
- }
-
- /**
- * Gets the instance.
- *
- * @return Returns a EjbPageExtensionRegistry
- */
- public static OperationExtensionRegistry getInstance() {
- if (instance == null)
- instance = new OperationExtensionRegistry();
- return instance;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationStatus.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationStatus.java
deleted file mode 100644
index 7e0b50b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/OperationStatus.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class OperationStatus extends MultiStatus {
-
-
- public OperationStatus(String message, Throwable e) {
- super(WTPCommonPlugin.PLUGIN_ID, 0, new IStatus[]{}, message, e);
- }
-
- public OperationStatus(IStatus[] children) {
- this(WTPCommonPlugin.PLUGIN_ID, 0, children, "", null); //$NON-NLS-1$
- }
-
- /**
- * @param pluginId
- * @param code
- * @param children
- * @param message
- * @param exception
- */
- public OperationStatus(String pluginId, int code, IStatus[] children, String message, Throwable exception) {
- super(pluginId, code, children, message, exception);
- }
-
- public void addExtendedStatus(IStatus status) {
- int oldSeverity = getSeverity();
- super.add(status);
- if (oldSeverity != IStatus.ERROR && getSeverity() == IStatus.ERROR) {
- setSeverity(IStatus.WARNING);
- }
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Status#setCode(int)
- */
- public void setCode(int code) {
- super.setCode(code);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Status#setException(java.lang.Throwable)
- */
- public void setException(Throwable exception) {
- super.setException(exception);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Status#setMessage(java.lang.String)
- */
- public void setMessage(String message) {
- super.setMessage(message);
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Status#setSeverity(int)
- */
- public void setSeverity(int severity) {
- super.setSeverity(severity);
- }
-
- public void add(IStatus status) {
- int newSev = status.getSeverity();
- if (newSev > getSeverity()) {
- setMessage(status.getMessage());
- setException(status.getException());
- }
- super.add(status);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModel.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModel.java
deleted file mode 100644
index 324cac0..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationDataModel.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Oct 27, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.io.File;
-
-import org.eclipse.core.internal.localstore.CoreFileSystemLibrary;
-import org.eclipse.core.internal.resources.Project;
-import org.eclipse.core.internal.utils.Policy;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class ProjectCreationDataModel extends WTPOperationDataModel {
- /**
- * A required dataModel propertyName for a <code>java.lang.String</code> type. This is used to
- * specify the project name.
- */
- public static final String PROJECT_NAME = "ProjectCreationDataModel.PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * An optonal dataModel propertyName for a <code>java.lang.String</code> type. Sets the local
- * file system location for the described project. The path must be either an absolute file
- * system path, or a relative path whose first segment is the name of a defined workspace path
- * variable. The default value is the workspace's default location.
- */
- public static final String PROJECT_LOCATION = "ProjectCreationDataModel.PROJECT_LOCATION"; //$NON-NLS-1$
-
- /**
- * An optional dataModel propertyName for a <code>java.lang.String[]</code> type. This is a
- * list of all natures to add to the project. There is no default value.
- */
- public static final String PROJECT_NATURES = "ProjectCreationDataModel.PROJECT_NATURES"; //$NON-NLS-1$
-
- public static ProjectCreationDataModel createProjectCreationDataModel(String projectName) {
- ProjectCreationDataModel dataModel = new ProjectCreationDataModel();
- dataModel.setProperty(PROJECT_NAME, projectName);
- return dataModel;
- }
-
- public WTPOperation getDefaultOperation() {
- return new ProjectCreationOperation(this);
- }
-
- protected void initValidBaseProperties() {
- super.initValidBaseProperties();
- addValidBaseProperty(PROJECT_NAME);
- addValidBaseProperty(PROJECT_LOCATION);
- addValidBaseProperty(PROJECT_NATURES);
- }
-
- protected Object getDefaultProperty(String propertyName) {
- if (PROJECT_LOCATION.equals(propertyName)) {
- return getDefaultLocation();
- }
- return super.getDefaultProperty(propertyName);
- }
-
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- if (propertyValue != null && propertyName.equals(PROJECT_LOCATION)) {
- IPath path = getRootLocation();
- if (path.equals(new Path((String) propertyValue))) {
- setProperty(propertyName, null);
- return false;
- }
- }
- Object oldValue = null;
- if (propertyName.equals(PROJECT_NAME)) {
- oldValue = getProperty(PROJECT_NAME);
- }
- boolean notify = super.doSetProperty(propertyName, propertyValue);
- if (propertyName.equals(PROJECT_NAME) && !isSet(PROJECT_LOCATION)) {
- notifyListeners(PROJECT_NAME, oldValue, propertyValue);
- notifyListeners(PROJECT_LOCATION, null, null);
- return false;
- }
- return notify;
- }
-
- private String getDefaultLocation() {
- IPath path = getRootLocation();
- String projectName = (String) getProperty(PROJECT_NAME);
- if (projectName != null)
- path = path.append(projectName);
- return path.toOSString();
- }
-
- private IPath getRootLocation() {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation();
- }
-
- public IProjectDescription getProjectDescription() {
- String projectName = (String) getProperty(PROJECT_NAME);
- IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(projectName);
- if (isSet(PROJECT_LOCATION)) {
- String projectLocation = (String) getProperty(ProjectCreationDataModel.PROJECT_LOCATION);
- desc.setLocation(new Path(projectLocation));
- }
- return desc;
- }
-
- public IProject getProject() {
- String projectName = (String) getProperty(PROJECT_NAME);
- return (null != projectName && projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
- }
-
- protected IStatus doValidateProperty(String propertyName) {
-
- if (propertyName.equals(PROJECT_NAME)) {
- IStatus status = validateName();
- if (!status.isOK())
- return status;
- }
- if (propertyName.equals(PROJECT_LOCATION)) {
- IStatus status = validateLocation();
- if (!status.isOK())
- return status;
- }
- if (propertyName.equals(PROJECT_LOCATION) || propertyName.equals(PROJECT_NAME)) {
- String projectName = getStringProperty(PROJECT_NAME);
- String projectLoc = getStringProperty(PROJECT_LOCATION);
- return validateExisting(projectName, projectLoc);
- }
- return super.doValidateProperty(propertyName);
- }
-
- /**
- * @param projectName
- * @param projectLoc
- * @todo Generated comment
- */
- private IStatus validateExisting(String projectName, String projectLoc) {
- if (projectName != null && !projectName.equals("")) {//$NON-NLS-1$
- File file = new File(projectLoc);
- if (file.exists()) {
- if (file.isDirectory()) {
- File dotProject = new File(file, ".project");//$NON-NLS-1$
- if (dotProject.exists()) {
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_EXISTS_AT_LOCATION_ERROR, new Object[]{file.toString()}));
- }
- }
- }
- }
- return OK_STATUS;
- }
-
- private IStatus validateName() {
- String name = getStringProperty(PROJECT_NAME);
- IStatus status = validateProjectName(name);
- if (!status.isOK())
- return status;
- if (getProject().exists())
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString(WTPCommonMessages.PROJECT_EXISTS_ERROR, new Object[]{name}));
-
- if (!CoreFileSystemLibrary.isCaseSensitive()) {
- //now look for a matching case variant in the tree
- IResource variant = ((Project) getProject()).findExistingResourceVariant(getProject().getFullPath());
- if (variant != null)
- return WTPCommonPlugin.createErrorStatus(Policy.bind("resources.existsDifferentCase", variant.getFullPath().toString())); //$NON-NLS-1$
- }
-
- return OK_STATUS;
- }
-
- private IStatus validateLocation() {
- if (isSet(PROJECT_LOCATION)) {
- String loc = (String) getProperty(PROJECT_LOCATION);
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(loc);
- return workspace.validateProjectLocation(getProject(), path);
- }
- return OK_STATUS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperation.java
deleted file mode 100644
index 1d43166..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/ProjectCreationOperation.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 27, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ProjectCreationOperation extends WTPOperation {
-
- public ProjectCreationOperation(ProjectCreationDataModel dataModel) {
- super(dataModel);
- }
-
- protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
- try {
- ProjectCreationDataModel dataModel = (ProjectCreationDataModel) operationDataModel;
-
- IProjectDescription desc = dataModel.getProjectDescription();
- IProject project = dataModel.getProject();
- if (!project.exists()) {
- project.create(desc, new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN));
- }
-
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- project.open(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN));
-
- String[] natureIds = (String[]) dataModel.getProperty(ProjectCreationDataModel.PROJECT_NATURES);
- if (null != natureIds) {
- desc = project.getDescription();
- desc.setNatureIds(natureIds);
- project.setDescription(desc, monitor);
- }
- } finally {
- monitor.done();
- }
- if (monitor.isCanceled())
- throw new OperationCanceledException();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperation.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperation.java
deleted file mode 100644
index 0ac0a18..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperation.java
+++ /dev/null
@@ -1,326 +0,0 @@
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.internal.runtime.Assert;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-import org.eclispe.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclispe.wst.common.frameworks.internal.enablement.IEnablementManager;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-
-/**
- * An operation which potentially makes changes to the workspace. All resource modification should
- * be performed using this operation. The primary consequence of using this operation is that events
- * which typically occur as a result of workspace changes (such as the firing of resource deltas,
- * performance of autobuilds, etc.) are deferred until the outermost operation has successfully
- * completed.
- * <p>
- * Subclasses must implement <code>execute</code> to do the work of the operation.
- * </p>
- */
-public abstract class WTPOperation implements IHeadlessRunnableWithProgress {
-
- protected WTPOperationDataModel operationDataModel;
-
- private OperationStatus opStatus;
-
- private String id;
-
- public WTPOperation(WTPOperationDataModel operationDataModel) {
- setOperationDataModel(operationDataModel);
- }
-
- public WTPOperation() {
- }
-
- /**
- * If the operationId is already set, setOperationId() will do nothing
- *
- * @param value
- */
- public final void setID(String value) {
- Assert.isTrue(this.id == null, WTPResourceHandler.getString("22")); //$NON-NLS-1$
- Assert.isNotNull(value, WTPResourceHandler.getString("23")); //$NON-NLS-1$
- this.id = value;
- }
-
- public final String getID() {
- return this.id;
- }
-
- public final void setOperationDataModel(WTPOperationDataModel operationDataModel) {
- this.operationDataModel = operationDataModel;
- }
-
- public final WTPOperationDataModel getOperationDataModel() {
- return operationDataModel;
- }
-
- public IStatus getStatus() {
- if (null == opStatus)
- return WTPCommonPlugin.OK_STATUS;
- return opStatus;
- }
-
- /**
- * Performs the steps that are to be treated as a single logical workspace change.
- * <p>
- * Subclasses must implement this method.
- * </p>
- *
- * @param monitor
- * the progress monitor to use to display progress and field user requests to cancel
- * @exception CoreException
- * if the operation fails due to a CoreException
- * @exception InvocationTargetException
- * if the operation fails due to an exception other than CoreException
- * @exception InterruptedException
- * if the operation detects a request to cancel, using
- * <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- */
- protected abstract void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException;
-
- protected void initilize(IProgressMonitor monitor) {
- //Making sure the status objects are initialized
- // status = null;
- opStatus = null;
- }
-
- private ComposedExtendedOperationHolder initializeExtensionOperations() {
- return OperationExtensionRegistry.getExtensions(this);
- }
-
- protected void dispose(IProgressMonitor pm) {
- }
-
- protected IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public WTPOperation append(WTPOperation op) {
- ComposedOperation composedOp = new ComposedOperation();
- composedOp.addRunnable(this);
- composedOp.addRunnable(op);
- return composedOp;
- }
-
- /**
- * Initiates a batch of changes, by invoking the execute() method as a workspace runnable.
- *
- * @param monitor
- * the progress monitor to use to display progress
- * @exception InvocationTargetException
- * wraps any CoreException, runtime exception or error thrown by the execute()
- * method
- * @see WorkspaceModifyOperation - this class was directly copied from it
- */
- public synchronized final void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- final InvocationTargetException[] iteHolder = new InvocationTargetException[1];
- try {
-
- IWorkspaceRunnable workspaceRunnable = new IWorkspaceRunnable() {
-
- public void run(IProgressMonitor pm) throws CoreException {
- try {
- doRun(pm);
- if (opStatus != null && !opStatus.isOK()) {
- //TODO do something with the status
- System.out.println(opStatus.getMessage());
- }
- } catch (InvocationTargetException e) {
- // Pass it outside the workspace runnable
- iteHolder[0] = e;
- } catch (InterruptedException e) {
- // Re-throw as OperationCanceledException, which will
- // be
- // caught and re-thrown as InterruptedException below.
- throw new OperationCanceledException(e.getMessage());
- }
- }
- };
- ISchedulingRule rule = getSchedulingRule();
- if (rule == null)
- ResourcesPlugin.getWorkspace().run(workspaceRunnable, monitor);
- else
- ResourcesPlugin.getWorkspace().run(workspaceRunnable, rule, 0, monitor);
- } catch (CoreException e) {
- if (e.getStatus().getCode() == IResourceStatus.OPERATION_FAILED)
- throw new WFTWrappedException(e.getStatus().getException(), e.getMessage());
- throw new WFTWrappedException(e);
- } catch (OperationCanceledException e) {
- throw new InterruptedException(e.getMessage());
- }
- // Re-throw the InvocationTargetException, if any occurred
- if (iteHolder[0] != null) {
- throw new WFTWrappedException(iteHolder[0].getTargetException(), iteHolder[0].getMessage());
- }
- }
-
- /**
- * @return
- */
- protected ISchedulingRule getSchedulingRule() {
- return null;
- }
-
- public final void doRun(IProgressMonitor pm) throws CoreException, InvocationTargetException, InterruptedException {
- boolean alreadyLocked = operationDataModel == null ? true : operationDataModel.isLocked();
- boolean operationValidationEnabled = operationDataModel == null ? false : operationDataModel.isOperationValidationEnabled();
- try {
- if (!alreadyLocked) {
- operationDataModel.setLocked(true);
- }
- if (operationValidationEnabled) {
- operationDataModel.setOperationValidationEnabled(false);
- IStatus status = operationDataModel.validateDataModel();
- if (!status.isOK()) {
- //TODO display something to user and remove System.out
- System.out.println(WTPResourceHandler.getString("24", new Object[]{status.getMessage()})); //$NON-NLS-1$
- Thread.dumpStack();
- return;
- }
- }
- initilize(pm);
-
- if (!validateEdit())
- return;
- //if (getStatus().isOK()) {
- ComposedExtendedOperationHolder extOpHolder = initializeExtensionOperations();
- IStatus preOpStatus = runPreOps(pm, extOpHolder);
- execute(pm);
- IStatus postOpStatus = runPostOps(pm, extOpHolder);
- if (null != preOpStatus)
- addExtendedStatus(preOpStatus);
- if (null != postOpStatus)
- addExtendedStatus(postOpStatus);
- //}
- } finally {
- dispose(pm);
-
- if (!alreadyLocked) {
- operationDataModel.setLocked(false);
- }
- if (operationValidationEnabled) {
- operationDataModel.setOperationValidationEnabled(true);
- }
-
- }
- // CoreException and OperationCanceledException are propagated
- }
-
- // Subclasses should override as they need to
- protected boolean validateEdit() {
- return true;
- }
-
- /**
- * This is to track the status of the main flow of operations (extended operation stati are
- * added through addExtendedStatus) execute() should call this method as necessary.
- *
- * @param aStatus
- */
- protected final void addStatus(IStatus aStatus) {
- if (opStatus == null) {
- opStatus = new OperationStatus(aStatus.getMessage(), aStatus.getException());
- opStatus.setSeverity(aStatus.getSeverity());
- opStatus.add(aStatus);
- } else {
- opStatus.add(aStatus);
- }
- }
-
- /**
- * This is to keep track of extended operation stati. If the main status is WARNING, an extended
- * status of ERROR will not make the main status ERROR. If the main status is OK, an extended
- * status of ERROR or WARNING will make the main status WARNING.
- *
- * @param aStatus
- */
- private void addExtendedStatus(IStatus aStatus) {
- if (opStatus == null) {
- opStatus = new OperationStatus(new IStatus[]{WTPCommonPlugin.OK_STATUS});
- }
- opStatus.addExtendedStatus(aStatus);
- }
-
- private IStatus runPostOps(IProgressMonitor pm, ComposedExtendedOperationHolder extOpHolder) {
- IStatus postOpStatus = null;
- if ((extOpHolder != null) && extOpHolder.hasPostOps()) {
- postOpStatus = runExtendedOps(extOpHolder.getPostOps(), pm);
- }
-
- return postOpStatus;
- }
-
- private IStatus runPreOps(IProgressMonitor pm, ComposedExtendedOperationHolder extOpHolder) {
- IStatus preOpStatus = null;
- if ((extOpHolder != null) && extOpHolder.hasPreOps()) {
- preOpStatus = runExtendedOps(extOpHolder.getPreOps(), pm);
- }
- return preOpStatus;
- }
-
- private IStatus runExtendedOps(List opList, IProgressMonitor pm) {
- WTPOperation op = null;
- OperationStatus returnStatus = null;
- IStatus localStatus;
- String opId = null;
- IEnablementIdentifier enablementIdentifer = null;
- for (int i = 0; i < opList.size(); i++) {
- op = (WTPOperation) opList.get(i);
- try {
- opId = op.getID();
- enablementIdentifer = IEnablementManager.INSTANCE.getIdentifier(opId, operationDataModel.getTargetProject());
- if (enablementIdentifer.isEnabled()) {
- op.setOperationDataModel(operationDataModel);
- op.doRun(new SubProgressMonitor(pm, IProgressMonitor.UNKNOWN));
- localStatus = op.getStatus();
- } else
- localStatus = null;
- } catch (Exception e) {
- localStatus = new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, 0, WTPResourceHandler.getString("25", new Object[]{op.getClass().getName()}), e); //$NON-NLS-1$
- }
- if (localStatus != null) {
- if (returnStatus == null) {
- returnStatus = new OperationStatus(new IStatus[]{localStatus});
- } else {
- returnStatus.add(localStatus);
- }
- }
- }
- return returnStatus;
- }
-
- // protected WTPOperation getRootExtendedOperation() {
- // if (this.getRootExtendedOperation() == null)
- // return this;
- // return this.getRootExtendedOperation();
- // }
-
- protected static final void runNestedDefaultOperation(WTPOperationDataModel model, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- WTPOperation op = model.getDefaultOperation();
- if (op != null)
- op.run(monitor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModel.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModel.java
deleted file mode 100644
index 218689a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModel.java
+++ /dev/null
@@ -1,865 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Oct 28, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public abstract class WTPOperationDataModel implements WTPOperationDataModelListener {
- /**
- * An unsettable property used soley to trip validation for nested models. Clients only use this
- * property for validation purposes and never get or set its value. Subclasses can override
- * nested model validation by checking for this property in the doValidate method and not
- * calling super with it.
- */
- public static final String NESTED_MODEL_VALIDATION_HOOK = "WTPOperationDataModel.NESTED_MODEL_VALIDATION_HOOK"; //$NON-NLS-1$
- /**
- * Optional, type boolean This boolean was added for users who wish to delay the operation from
- * being run on a "finish". The operation will be cached in the CACHED_DELAYED_OPERATION which
- * then leaves the user responsible for running this operation when they see fit.
- */
- public static final String RUN_OPERATION = "WTPOperationDataModel.RUN_OPERATION"; //$NON-NLS-1$
- /**
- * Internal, type WTPOperation
- */
- public static final String CACHED_DELAYED_OPERATION = "WTPOperationDataModel.CACHED_DELAYED_OPERATION"; //$NON-NLS-1$
- /**
- * Optional Operation handler to allow user to prompt on save defaults to NullOperationHandler()
- * set to UIOperationHanlder() to add prompt
- */
-
- public static final String UI_OPERATION_HANLDER = "WTPOperationDataModel.UI_OPERATION_HANLDER"; //$NON-NLS-1$
-
- private static final String PROPERTY_NOT_LOCATED_ = WTPResourceHandler.getString("20"); //$NON-NLS-1$
- private static final String NESTED_MODEL_NOT_LOCATED = WTPResourceHandler.getString("21"); //$NON-NLS-1$
- public static IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.common.frameworks.internal", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
- private Set validProperties = new HashSet();
- private Set validBaseProperties = new HashSet();
- private Map propertyValues = new Hashtable();
- private Map nestedModels;
- private List listeners;
- private boolean ignorePropertyChanges = false;
- private boolean notificationEnabled = true;
- private boolean locked = false;
- private boolean operationValidationEnabled = false;
- private boolean hasBeenExecutedAgainst = false;
- private boolean suspendValidation = false;
- private WTPOperationDataModel extendedRoot;
-
- public WTPOperationDataModel() {
- init_internal();
- }
-
- public abstract WTPOperation getDefaultOperation();
-
- private final void init_internal() {
- initValidBaseProperties();
- initNestedModels();
- init();
- }
-
- /**
- * This is for subclasses to perform any required initialization other than
- * initValidBaseProperties() and initNestedModels() both which will be called first
- * @see initValidBaseProperties()
- * @see initNestedModels()
- */
- protected void init() {
- }
-
- /**
- * This is for subclasses to override to initialize any nested DataModels. This will be called
- * before init() and after initValidBaseProperties()
- * @see init()
- * @see initValidBaseProperties();
- */
- protected void initNestedModels() {
- }
-
- protected void addValidBaseProperty(String propertyName) {
- validBaseProperties.add(propertyName);
- validProperties.add(propertyName);
- }
-
- /**
- *
- */
- protected void initValidBaseProperties() {
- addValidBaseProperty(RUN_OPERATION);
- addValidBaseProperty(CACHED_DELAYED_OPERATION);
- addValidBaseProperty(UI_OPERATION_HANLDER);
- }
-
- public void addNestedModel(String modelName, WTPOperationDataModel dataModel) {
- if (dataModel == null)
- return;
- if (null == nestedModels) {
- validBaseProperties.add(NESTED_MODEL_VALIDATION_HOOK);
- validProperties.add(NESTED_MODEL_VALIDATION_HOOK);
- nestedModels = new Hashtable();
- }
- nestedModels.put(modelName, dataModel);
- validProperties.addAll(dataModel.validProperties);
- dataModel.addListener(this);
- WTPOperationDataModelListener extendedListener = dataModel.getExtendedSynchronizer();
- if (extendedListener != null) {
- if (this.extendedRoot == null)
- dataModel.extendedRoot = this;
- else
- dataModel.extendedRoot = this.extendedRoot;
- this.addListener(extendedListener);
- }
- }
-
- /**
- * @return
- */
- protected WTPOperationDataModelListener getExtendedSynchronizer() {
- return null;
- }
-
- public WTPOperationDataModel removeNestedModel(String modelName) {
- if (modelName == null || nestedModels == null)
- return null;
- WTPOperationDataModel model = (WTPOperationDataModel) nestedModels.remove(modelName);
- validProperties.removeAll(model.validProperties);
- model.removeListener(this);
- if (nestedModels.isEmpty()) {
- nestedModels = null;
- validBaseProperties.remove(NESTED_MODEL_VALIDATION_HOOK);
- validProperties.remove(NESTED_MODEL_VALIDATION_HOOK);
- }
- return model;
- }
-
- public final WTPOperationDataModel getNestedModel(String modelName) {
- WTPOperationDataModel dataModel = (WTPOperationDataModel) nestedModels.get(modelName);
- if (null == dataModel) {
- throw new RuntimeException(NESTED_MODEL_NOT_LOCATED + modelName);
- }
- return dataModel;
- }
-
- public final Object getProperty(String propertyName) {
- checkValidPropertyName(propertyName);
- if (isBaseProperty(propertyName)) {
- return doGetProperty(propertyName);
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.getProperty(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- /**
- * Subclasses can override this method to determine if a given propertyName should be enabled
- * for edit. Returning null indicates that there is no precedence on the enablement. Note that
- * you can override this in an outer model since enablement may be different in the outer model.
- *
- * @param propertyName
- * @return
- */
- public final Boolean isEnabled(String propertyName) {
- checkValidPropertyName(propertyName);
- return basicIsEnabled(propertyName);
- }
-
- /**
- * Subclasses can override this method to determine if a given propertyName should be enabled
- * for edit. Returning null indicates that there is no precedence on the enablement. Note that
- * you can override this in an outer model since enablement may be different in the outer model.
- *
- * @param propertyName
- * @return
- */
- protected Boolean basicIsEnabled(String propertyName) {
- if (isBaseProperty(propertyName)) {
- return null;
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.isEnabled(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- /**
- * @deprecated use getValidPropertyDescriptors(String)
- * @param propertyName
- * @return
- */
- public final Object[] getValidPropertyValues(String propertyName) {
- checkValidPropertyName(propertyName);
- if (isBaseProperty(propertyName)) {
- return doGetValidPropertyValues(propertyName);
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.getValidPropertyValues(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- /**
- * @deprecated use getValidPropertyDescriptors(String)
- * @param propertyName
- * @return
- */
- public final String[] getValidStringPropertyValues(String propertyName) {
- Object[] values = getValidPropertyValues(propertyName);
- if (values != null)
- return (String[]) values;
- return new String[0];
- }
-
- /**
- * Subclasses may override to provide specific valid property values for the given propertyName.
- *
- * @deprecated use doGetValidPropertyDescriptors(String)
- * @param propertyName
- * @return
- */
- protected Object[] doGetValidPropertyValues(String propertyName) {
- return null;
- }
-
- public final WTPPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- checkValidPropertyName(propertyName);
- if (isBaseProperty(propertyName)) {
- return doGetValidPropertyDescriptors(propertyName);
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.getValidPropertyDescriptors(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- /**
- * Subclasses may override to provide specific valid property values for the given propertyName.
- *
- * @param propertyName
- * @return
- */
- protected WTPPropertyDescriptor[] doGetValidPropertyDescriptors(String propertyName) {
- return new WTPPropertyDescriptor[0];
- }
-
- public final WTPPropertyDescriptor getPropertyDescriptor(String propertyName) {
- checkValidPropertyName(propertyName);
- if (isBaseProperty(propertyName)) {
- return doGetPropertyDescriptor(propertyName);
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.doGetPropertyDescriptor(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- protected WTPPropertyDescriptor doGetPropertyDescriptor(String propertyName) {
- return new WTPPropertyDescriptor(getProperty(propertyName));
- }
-
- /**
- * Return a property of type String. If the property value is null, an empty String will be
- * returned.
- *
- * @param propertyName
- * @return
- */
- public final String getStringProperty(String propertyName) {
- Object prop = getProperty(propertyName);
- if (prop == null)
- return ""; //$NON-NLS-1$
- return (String) prop;
- }
-
- /**
- * Return IProject which is a handle to a project in the workspace which has the same name as
- * that which is returned from the String property <code>projectNameProperty</code>.
- *
- * @param projectNameProperty
- * @return
- */
- public IProject getProjectHandle(String projectNameProperty) {
- String projectName = (String) getProperty(projectNameProperty);
- return getProjectHandleFromName(projectName);
- }
-
- public IProject getProjectHandleFromName(String projectName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(projectName, IResource.PROJECT);
- return (null != projectName && projectName.length() > 0 && status.isOK()) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
- }
-
- public IProject getTargetProject() {
- return null;
- }
-
- /**
- * Return a property of type boolean. If the property value is null, an false will be returned.
- *
- * @param propertyName
- * @return
- */
- public final boolean getBooleanProperty(String propertyName) {
- Object prop = getProperty(propertyName);
- if (prop == null)
- return false;
- return ((Boolean) prop).booleanValue();
- }
-
- /**
- * Return a property of type int. If the property value is null, a -1 will be returned.
- *
- * @param propertyName
- * @return
- */
- public final int getIntProperty(String propertyName) {
- Object prop = getProperty(propertyName);
- if (prop == null)
- return -1;
- return ((Integer) prop).intValue();
- }
-
- public final void setBooleanProperty(String propertyName, boolean value) {
- Boolean b = getBoolean(value);
- setProperty(propertyName, b);
- }
-
- protected Boolean getBoolean(boolean b) {
- if (b)
- return Boolean.TRUE;
- return Boolean.FALSE;
- }
-
- public void setIntProperty(String propertyName, int value) {
- Integer i = new Integer(value);
- setProperty(propertyName, i);
- }
-
- protected Object doGetProperty(String propertyName) {
- if (propertyValues.containsKey(propertyName)) {
- return propertyValues.get(propertyName);
- }
- return getDefaultProperty(propertyName);
- }
-
- /**
- * Override this method to compute default property values
- *
- * @param propertyName
- * @return
- */
- protected Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(RUN_OPERATION)) {
- return Boolean.TRUE;
- }
- if (propertyName.equals(UI_OPERATION_HANLDER)) {
- return new NullOperationHandler();
- }
- return null;
- }
-
- /*
- * This assumes that checkValidPropertyName(String) has already been called.
- */
- private boolean isBaseProperty(String propertyName) {
- if (validBaseProperties != null)
- return validBaseProperties.contains(propertyName);
- return true;
- }
-
- public boolean isProperty(String propertyName) {
- return validProperties.contains(propertyName);
- }
-
- protected void checkValidPropertyName(String propertyName) {
- if (!validProperties.contains(propertyName)) {
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
- }
-
- /**
- * unset a property by passing null for the value
- *
- * @param propertyName
- * @param propertyValue
- */
- public final void setProperty(String propertyName, Object propertyValue) {
- if (isLocked() && !isResultProperty(propertyName))
- throw new IllegalStateException(WTPResourceHandler.getString("18", new Object[]{getClass().getName()})); //$NON-NLS-1$
- if (ignorePropertyChanges)
- return; // ignoring property changes
- checkValidPropertyName(propertyName);
- boolean nestedFound = false;
- if (isBaseProperty(propertyName)) {
- internalSetProperty(propertyName, propertyValue);
- return;
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- nestedFound = true;
- dataModel.setProperty(propertyName, propertyValue);
- }
- }
- }
- if (!nestedFound) {
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
- }
-
- private final void internalSetProperty(String propertyName, Object propertyValue) {
- Object oldValue = propertyValues.get(propertyName);
- if (valueChanged(propertyValue, oldValue)) {
- doSetProperty(propertyName, oldValue, propertyValue);
- }
- }
-
- private void doSetProperty(String propertyName, Object oldValue, Object newValue) {
- if (doSetProperty(propertyName, newValue))
- notifyListeners(propertyName, oldValue, newValue);
- }
-
- /*
- * Return true to notify listeners.
- */
- protected boolean doSetProperty(String propertyName, Object propertyValue) {
- if (null != propertyValue)
- propertyValues.put(propertyName, propertyValue);
- else if (propertyValues.containsKey(propertyName))
- propertyValues.remove(propertyName);
- return true;
- }
-
- /**
- * @param propertyValue
- * @param oldValue
- * @return
- */
- private boolean valueChanged(Object o1, Object o2) {
- return o1 != o2 && ((o1 != null && !o1.equals(o2)) || !o2.equals(o1));
- }
-
- /**
- * @param oldValue
- * @param propertyValue
- */
- public void notifyListeners(String propertyName, Object oldValue, Object propertyValue) {
- notifyListeners(propertyName, PROPERTY_CHG, oldValue, propertyValue);
- }
-
- /**
- * @param oldValue
- * @param propertyValue
- */
- protected void notifyListeners(String propertyName, int flag, Object oldValue, Object propertyValue) {
- notifyListeners(new WTPOperationDataModelEvent(this, propertyName, oldValue, propertyValue, flag));
- }
-
- protected void notifyListeners(WTPOperationDataModelEvent event) {
- if (notificationEnabled && listeners != null && !listeners.isEmpty()) {
- WTPOperationDataModelListener listener;
- for (int i = 0; i < listeners.size(); i++) {
- listener = (WTPOperationDataModelListener) listeners.get(i);
- listener.propertyChanged(event);
- }
- }
- }
-
- public void propertyChanged(WTPOperationDataModelEvent event) {
- notifyListeners(event);
- }
-
- public boolean isSet(String propertyName) {
- checkValidPropertyName(propertyName);
- if (isBaseProperty(propertyName)) {
- return propertyValues.containsKey(propertyName);
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- return dataModel.isSet(propertyName);
- }
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- public final IStatus validateDataModel() {
- return validateDataModel(false);
- }
-
- public final IStatus validateDataModel(boolean stopOnFirstFailure) {
- if (suspendValidation)
- return OK_STATUS;
- IStatus status = null;
- if (validBaseProperties != null && !validBaseProperties.isEmpty()) {
- IStatus propStatus;
- String propName;
- Iterator it = validBaseProperties.iterator();
- while (it.hasNext()) {
- propName = (String) it.next();
- propStatus = validateProperty(propName);
- if (status == null || status.isOK())
- status = propStatus;
- else {
- if (status.isMultiStatus())
- ((MultiStatus) status).merge(propStatus);
- else {
- MultiStatus multi = new MultiStatus("org.eclipse.wst.common.frameworks.internal", 0, "", null); //$NON-NLS-1$ //$NON-NLS-2$
- multi.merge(status);
- multi.merge(propStatus);
- status = multi;
- }
- }
- if (stopOnFirstFailure && status != null && !status.isOK() && status.getSeverity() == IStatus.ERROR)
- return status;
- }
- }
- if (status == null)
- return OK_STATUS;
- return status;
- }
-
- public void addListener(WTPOperationDataModelListener listener) {
- if (listener != null) {
- if (listeners == null) {
- listeners = new ArrayList();
- listeners.add(listener);
- } else if (!listeners.contains(listener))
- listeners.add(listener);
- }
- }
-
- public void removeListener(WTPOperationDataModelListener listener) {
- if (listeners != null && listener != null)
- listeners.remove(listener);
- }
-
- /**
- * Return true if the model doesn't have any errors.
- *
- * @return boolean
- */
- public boolean isValid() {
- IStatus status = validateDataModel(true);
- if (status.isOK())
- return true;
- if (status.getSeverity() == IStatus.ERROR)
- return false;
- return true;
- }
-
- /**
- * Use this method when the model should ignore any property set calls. Remember to always reset
- * the value in a finally block.
- *
- * @param aBoolean
- */
- public void setIgnorePropertyChanges(boolean aBoolean) {
- ignorePropertyChanges = aBoolean;
- }
-
- /**
- * Return the status for the validation of a particular property. Subclasses should override
- * when a specific validation is required.
- *
- * @param propertyName
- * @return
- */
- protected IStatus doValidateProperty(String propertyName) {
- if (NESTED_MODEL_VALIDATION_HOOK.equals(propertyName)) {
- if (nestedModels != null && !nestedModels.isEmpty()) {
- IStatus modelStatus;
- WTPOperationDataModel dataModel;
- Iterator it = nestedModels.values().iterator();
- while (it.hasNext()) {
- dataModel = (WTPOperationDataModel) it.next();
- modelStatus = dataModel.validateDataModel(true);
- if (!modelStatus.isOK()) {
- return modelStatus;
- }
- }
- }
- }
- return OK_STATUS;
- }
-
- public final IStatus validateProperty(String propertyName) {
- if (suspendValidation)
- return OK_STATUS;
- checkValidPropertyName(propertyName);
- if (isBaseProperty(propertyName)) {
- return doValidateProperty(propertyName);
- } else if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- boolean propertyFound = false;
- IStatus status = null;
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- if (dataModel.isProperty(propertyName)) {
- propertyFound = true;
- status = dataModel.validateProperty(propertyName);
- if (!status.isOK()) {
- return status;
- }
- }
- }
- if (propertyFound) {
- return OK_STATUS;
- }
- }
- throw new RuntimeException(PROPERTY_NOT_LOCATED_ + propertyName);
- }
-
- // handles for validation enablement for model and nested children
- protected void enableValidation() {
- suspendValidation = false;
- if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- dataModel.enableValidation();
- }
- }
- }
-
- // handles for validation disablement for model and nested children
- protected void disableValidation() {
- suspendValidation = true;
- if (nestedModels != null) {
- WTPOperationDataModel dataModel = null;
- Object[] keys = nestedModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- dataModel = (WTPOperationDataModel) nestedModels.get(keys[i]);
- dataModel.disableValidation();
- }
- }
- }
-
- /**
- * This method should be called from doSetProperty(String, Object) when a change to a
- * propertyName will cause default values within the model to change. The passed propertyName is
- * another property that may need to have its default value recomputed. This allows for UIs to
- * refresh.
- *
- * @param propertyName
- */
- public void notifyDefaultChange(String propertyName) {
- if (!isSet(propertyName))
- notifyListeners(propertyName, null, null);
- }
-
- /**
- * This method should be called when the valid values for the given propertyName may need to be
- * recaculated. This allows for UIs to refresh.
- *
- * @param propertyName
- */
- public void notifyValidValuesChange(String propertyName) {
- notifyListeners(propertyName, WTPOperationDataModelListener.VALID_VALUES_CHG, null, null);
- }
-
- protected void notifyEnablementChange(String propertyName) {
- Boolean enable = isEnabled(propertyName);
- if (enable != null)
- notifyListeners(propertyName, ENABLE_CHG, null, enable);
- }
-
- public void dispose() {
- }
-
- protected boolean isNotificationEnabled() {
- return notificationEnabled;
- }
-
- protected void setNotificationEnabled(boolean notificationEnabled) {
- this.notificationEnabled = notificationEnabled;
- }
-
- /**
- * @return Returns the locked.
- */
- protected boolean isLocked() {
- return locked;
- }
-
- /**
- * @param locked
- * The locked to set.
- */
- protected void setLocked(boolean locked) {
- this.locked = locked;
- if (locked)
- hasBeenExecutedAgainst = true;
- }
-
- /**
- * By Overwriting this method, you can change the model when its executing. This is only
- * recommened when you need to set the result of the operation in the model.
- *
- * @param propertyName
- * @return
- */
- protected boolean isResultProperty(String propertyName) {
- return false;
- }
-
-
- public final boolean isOperationValidationEnabled() {
- return operationValidationEnabled;
- }
-
- public final void setOperationValidationEnabled(boolean operationValidationEnabled) {
- this.operationValidationEnabled = operationValidationEnabled;
- }
-
- /**
- * Use this method to set the property values from this model onto the otherModel for those that
- * are valid for the otherModel.
- *
- * @param otherModel
- */
- public void synchronizeValidPropertyValues(WTPOperationDataModel otherModel, String[] properties) {
- if (otherModel == null || properties == null || properties.length == 0)
- return;
- for (int i = 0; i < properties.length; i++) {
- if (isSet(properties[i]))
- otherModel.setProperty(properties[i], getProperty(properties[i]));
- }
- }
-
- /**
- * Remove all propertyValues.
- *
- */
- public void clearAllValues() {
- if (propertyValues != null)
- propertyValues.clear();
- if (nestedModels != null) {
- Iterator it = nestedModels.values().iterator();
- while (it.hasNext())
- ((WTPOperationDataModel) it.next()).clearAllValues();
- }
- }
-
- /**
- * Use this method to determine if an operation has been run using this data model.
- *
- * @return
- */
- public boolean hasBeenExecutedAgainst() {
- return hasBeenExecutedAgainst;
- }
-
- private final void assertModelIsExtended() {
- if (extendedRoot == null)
- throw new IllegalStateException(WTPResourceHandler.getString("19")); //$NON-NLS-1$
- }
-
- protected final Object getParentProperty(String propertyName) {
- assertModelIsExtended();
- return extendedRoot.getProperty(propertyName);
- }
-
- protected final int getParentIntProperty(String propertyName) {
- assertModelIsExtended();
- return extendedRoot.getIntProperty(propertyName);
- }
-
- protected final boolean getParentBooleanProperty(String propertyName) {
- assertModelIsExtended();
- return extendedRoot.getBooleanProperty(propertyName);
- }
-
- protected final String getParentStringProperty(String propertyName) {
- assertModelIsExtended();
- return extendedRoot.getStringProperty(propertyName);
- }
-
- protected IStatus validateStringValue(String propertyName, String errorMessage) {
- String name = getStringProperty(propertyName);
- if (name == "" || name == null || name.trim().length() == 0) { //$NON-NLS-1$
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return OK_STATUS;
- }
-
- protected IStatus validateObjectArrayValue(String propertyName, String errorMessage) {
- Object[] objects = (Object[]) getProperty(propertyName);
- if (objects == null || objects.length == 0) {
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- return OK_STATUS;
- }
-
- protected static IStatus validateProjectName(String projectName) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IStatus status = workspace.validateName(projectName, IResource.PROJECT);
- if (!status.isOK())
- return status;
- return OK_STATUS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModelEvent.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModelEvent.java
deleted file mode 100644
index 411d5ca..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModelEvent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 6, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code Generation - Code and
- * Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WTPOperationDataModelEvent {
-
- /**
- * Flags associated with the propertyChanged event. <code>PROPERTY_CHG</code>= A simple
- * property change. <code>VALID_VALUES_CHG</code>= The valid values for the given property
- * have changed. <code>ENABLE_CHG</code>= The enablement for the given property has changed.
- */
- public static final int PROPERTY_CHG = 1;
- public static final int VALID_VALUES_CHG = 2;
- public static final int ENABLE_CHG = 3;
-
- private WTPOperationDataModel dataModel;
- private String propertyName;
- private Object oldValue;
- private Object newValue;
- private int flag;
-
- public WTPOperationDataModelEvent(WTPOperationDataModel dataModel, String propertyName, Object oldValue, Object newValue) {
- this(dataModel, propertyName, oldValue, newValue, PROPERTY_CHG);
- }
-
- public WTPOperationDataModelEvent(WTPOperationDataModel dataModel, String propertyName, Object oldValue, Object newValue, int flag) {
- this.dataModel = dataModel;
- this.propertyName = propertyName;
- this.oldValue = oldValue;
- this.newValue = newValue;
- this.flag = flag;
- }
-
- public WTPOperationDataModel getDataModel() {
- return dataModel;
- }
-
- public int getFlag() {
- return flag;
- }
-
- public Object getNewValue() {
- return newValue;
- }
-
- public Object getOldValue() {
- return oldValue;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModelListener.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModelListener.java
deleted file mode 100644
index 80221db..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationDataModelListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-public interface WTPOperationDataModelListener {
- /**
- * Flags associated with the propertyChanged event. <code>PROPERTY_CHG</code>= A simple
- * property change. <code>VALID_VALUES_CHG</code>= The valid values for the given property
- * have changed. <code>ENABLE_CHG</code>= The enablement for the given property has changed.
- */
- final int PROPERTY_CHG = WTPOperationDataModelEvent.PROPERTY_CHG;
- final int VALID_VALUES_CHG = WTPOperationDataModelEvent.VALID_VALUES_CHG;
- final int ENABLE_CHG = WTPOperationDataModelEvent.ENABLE_CHG;
-
- /**
- * A property has changed on the model with the given propertyName. Use the flag to detect the
- * type of change.
- *
- * @param propertyName
- * @param flag
- * @param oldValue
- * @param newValue
- *
- * @see WTPOperationDataModelListener#PROPERTY_CHG
- * @see WTPOperationDataModelListener#VALID_VALUES_CHG
- */
- void propertyChanged(WTPOperationDataModelEvent event);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationJobAdapter.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationJobAdapter.java
deleted file mode 100644
index b7a0456..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPOperationJobAdapter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-/*
- * Created on Jan 20, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-
-public class WTPOperationJobAdapter extends Job {
-
- private WTPOperation operation = null;
-
- public WTPOperationJobAdapter(WTPOperation operation) {
- super(operation.toString());
- this.operation = operation;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor)
- */
- protected IStatus run(IProgressMonitor monitor) {
- IStatus result = null;
- try {
- operation.run(monitor);
- result = operation.getStatus(); //new Status(IStatus.OK, WTPCommonPlugin.PLUGIN_ID,
- // IStatus.OK, WTPResourceHandler.getString("26"),
- // null); //$NON-NLS-1$
- } catch (Exception e) {
- operation.addStatus(new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, IStatus.ERROR, WTPResourceHandler.getString("27"), e)); //$NON-NLS-1$
- result = operation.getStatus();
- Logger.getLogger().logError(e);
- }
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPPropertyDescriptor.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPPropertyDescriptor.java
deleted file mode 100644
index adcf631..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclipse/wst/common/frameworks/internal/operations/WTPPropertyDescriptor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Created on Nov 18, 2004
- * @author jsholl
- */
-package org.eclipse.wst.common.frameworks.internal.operations;
-
-/**
- * @author jsholl
- */
-public class WTPPropertyDescriptor {
-
- public static WTPPropertyDescriptor[] createDescriptors(Object[] values) {
- if (null == values) {
- return new WTPPropertyDescriptor[0];
- }
- WTPPropertyDescriptor[] descriptors = new WTPPropertyDescriptor[values.length];
- for (int i = 0; i < descriptors.length; i++) {
- descriptors[i] = new WTPPropertyDescriptor(values[i]);
- }
- return descriptors;
- }
-
- public static WTPPropertyDescriptor[] createDescriptors(Object[] values, String[] descriptions) {
- if (null == values) {
- return new WTPPropertyDescriptor[0];
- }
- WTPPropertyDescriptor[] descriptors = new WTPPropertyDescriptor[values.length];
- for (int i = 0; i < descriptors.length; i++) {
- descriptors[i] = new WTPPropertyDescriptor(values[i], descriptions[i]);
- }
- return descriptors;
-
- }
-
- private Object propertyValue;
- private String propertyDescription;
-
- public WTPPropertyDescriptor(Object propertyValue) {
- this.propertyValue = propertyValue;
- }
-
- public WTPPropertyDescriptor(Object propertyValue, String propertyDescription) {
- this.propertyValue = propertyValue;
- this.propertyDescription = propertyDescription;
- }
-
- public Object getPropertyValue() {
- return propertyValue;
- }
-
- public String getPropertyDescription() {
- if (null != propertyDescription) {
- return propertyDescription;
- }
- String str = (null != propertyValue) ? propertyValue.toString() : null;
- return (null != str) ? str : ""; //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/AscendingGroupComparator.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/AscendingGroupComparator.java
deleted file mode 100644
index 5228373..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/AscendingGroupComparator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.Comparator;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AscendingGroupComparator implements Comparator {
- private static AscendingGroupComparator singleton;
-
- public int compare(Object o1, Object o2) {
- if (o2 == null && o1 != null)
- return -1;
- if (o1 == null && o2 != null)
- return 1;
- if (o1 == null && o2 == null)
- return 0;
-
- FunctionGroup group1 = (FunctionGroup) o1;
- FunctionGroup group2 = (FunctionGroup) o2;
-
- if (group1.getPriority() > group2.getPriority())
- return 1;
- if (group1.getPriority() == group2.getPriority())
- return 0;
- if (group1.getPriority() < group2.getPriority())
- return -1;
- return 0;
- }
-
- public static Comparator singleton() {
- if (singleton == null)
- singleton = new AscendingGroupComparator();
- return singleton;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/DescendingGroupComparator.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/DescendingGroupComparator.java
deleted file mode 100644
index eb170a0..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/DescendingGroupComparator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.Comparator;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class DescendingGroupComparator implements Comparator {
-
- private static DescendingGroupComparator singleton;
-
- public int compare(Object o1, Object o2) {
- if (o1 == null && o2 != null)
- return -1;
- if (o2 == null && o1 != null)
- return 1;
- if (o1 == null && o2 == null)
- return 0;
-
- FunctionGroup group1 = (FunctionGroup) o1;
- FunctionGroup group2 = (FunctionGroup) o2;
-
- if (group1.getPriority() > group2.getPriority())
- return -1;
- if (group1.getPriority() == group2.getPriority())
- return 0;
- if (group1.getPriority() < group2.getPriority())
- return 1;
- return 0;
-
- }
-
- public static Comparator singleton() {
- if (singleton == null)
- singleton = new DescendingGroupComparator();
- return singleton;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementIdentifier.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementIdentifier.java
deleted file mode 100644
index 6907aab..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementIdentifier.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EnablementIdentifier implements IEnablementIdentifier {
-
- private final static int HASH_FACTOR = 89;
-
- private final static int HASH_INITIAL = EnablementIdentifier.class.getName().hashCode();
-
- private final static Set strongReferences = new HashSet();
-
- private Set functionGroupIds;
-
- private transient String[] functionGroupIdsAsArray;
-
- private boolean enabled;
-
- private transient int hashCode;
-
- private transient boolean hashCodeComputed;
-
- private String id;
-
- private List identifierListeners;
-
- private transient String string;
-
- private IProject project;
-
- protected EnablementIdentifier(String id) {
- this(id, null);
- }
-
- protected EnablementIdentifier(String id, IProject project) {
- if (id == null)
- throw new NullPointerException();
- this.id = id;
- this.project = project;
- }
-
- public void addIdentifierListener(IEnablementIdentifierListener identifierListener) {
- if (identifierListener == null)
- throw new NullPointerException();
-
- if (identifierListeners == null)
- identifierListeners = new ArrayList();
-
- if (!identifierListeners.contains(identifierListener))
- identifierListeners.add(identifierListener);
-
- strongReferences.add(this);
- }
-
- public int compareTo(Object object) {
- EnablementIdentifier castedObject = (EnablementIdentifier) object;
- return Util.compare(id, castedObject.id);
-
- }
-
- public boolean equals(Object object) {
- if (!(object instanceof EnablementIdentifier))
- return false;
-
- EnablementIdentifier castedObject = (EnablementIdentifier) object;
- boolean equals = Util.equals(id, castedObject.id);
- return equals;
- }
-
- protected void fireIdentifierChanged(EnablementIdentifierEvent functionIdentifierEvent) {
- if (functionIdentifierEvent == null)
- throw new NullPointerException();
-
- if (identifierListeners != null) {
- synchronized (identifierListeners) {
- for (int i = 0; i < identifierListeners.size(); i++)
- ((IEnablementIdentifierListener) identifierListeners.get(i)).identifierChanged(functionIdentifierEvent);
- }
- }
- }
-
- public Set getFunctionGroupIds() {
- return functionGroupIds;
- }
-
- public String getId() {
- return id;
- }
-
- public int hashCode() {
- if (!hashCodeComputed) {
- hashCode = HASH_INITIAL;
- hashCode = hashCode * HASH_FACTOR + Util.hashCode(id);
- hashCodeComputed = true;
- }
-
- return hashCode;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void removeIdentifierListener(IEnablementIdentifierListener identifierListener) {
- if (identifierListener == null)
- throw new NullPointerException();
-
- if (identifierListeners != null)
- identifierListeners.remove(identifierListener);
-
- if (identifierListeners.isEmpty())
- strongReferences.remove(this);
- }
-
- protected boolean setFunctionGroupIds(Set functionGroupIds) {
- functionGroupIds = Util.safeCopy(functionGroupIds, String.class);
-
- if (!Util.equals(functionGroupIds, this.functionGroupIds)) {
- this.functionGroupIds = functionGroupIds;
- this.functionGroupIdsAsArray = (String[]) this.functionGroupIds.toArray(new String[this.functionGroupIds.size()]);
-
- hashCodeComputed = false;
- hashCode = 0;
- string = null;
- return true;
- }
-
- return false;
- }
-
- protected boolean setEnabled(boolean enabled) {
- if (enabled != this.enabled) {
- this.enabled = enabled;
- hashCodeComputed = false;
- hashCode = 0;
- string = null;
- return true;
- }
-
- return false;
- }
-
- /**
- * Recompute the enabled state and return whether the state changed
- */
- protected boolean resetEnabled() {
- return setEnabled(getNewEnabled());
- }
-
- protected boolean getNewEnabled() {
- if (project == null)
- return true;
- if (functionGroupIdsAsArray.length == 0)
- return true;
- for (int i = 0; i < functionGroupIdsAsArray.length; i++) {
- FunctionGroup group = FunctionGroupRegistry.getInstance().getGroupByID(functionGroupIdsAsArray[i]);
- if (group != null && group.isEnabled(project))
- return true;
- }
- return false;
- }
-
- public String toString() {
- if (string == null) {
- final StringBuffer stringBuffer = new StringBuffer();
- stringBuffer.append('[');
- stringBuffer.append(functionGroupIds);
- stringBuffer.append(',');
- stringBuffer.append(enabled);
- stringBuffer.append(',');
- stringBuffer.append(id);
- stringBuffer.append(']');
- string = stringBuffer.toString();
- }
-
- return string;
- }
-
- /**
- * The associated Project may be null
- *
- * @return Returns the project.
- */
- public IProject getProject() {
- return project;
- }
-
- public String getPrimaryFunctionGroupId() {
- int selectedPriority = Integer.MAX_VALUE;
- int priority = 0;
- String selectedFunctionGroupId = null;
- String functionGroupId = null;
- for (Iterator iterator = getFunctionGroupIds().iterator(); iterator.hasNext();) {
- functionGroupId = iterator.next().toString();
- priority = FunctionGroupRegistry.getInstance().getGroupPriority(functionGroupId);
- if (priority < selectedPriority)
- selectedFunctionGroupId = functionGroupId;
- if (priority == 0)
- return selectedFunctionGroupId;
- }
- return selectedFunctionGroupId;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementIdentifierEvent.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementIdentifierEvent.java
deleted file mode 100644
index 48acbbf..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementIdentifierEvent.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EnablementIdentifierEvent {
-
- private boolean functionGroupIdsChanged;
- private boolean enabledChanged;
- private IEnablementIdentifier identifier;
-
- public EnablementIdentifierEvent(IEnablementIdentifier identifier, boolean functionGroupIdsChanged, boolean enabledChanged) {
- if (identifier == null)
- throw new NullPointerException();
-
- this.identifier = identifier;
- this.functionGroupIdsChanged = functionGroupIdsChanged;
- this.enabledChanged = enabledChanged;
- }
-
- /**
- * Returns the instance of the interface that changed.
- *
- * @return the instance of the interface that changed. Guaranteed not to be <code>null</code>.
- */
- public IEnablementIdentifier getIdentifier() {
- return identifier;
- }
-
- /**
- * Returns whether or not the functionGroupIds property changed.
- *
- * @return true, iff the functionGroupIds property changed.
- */
- public boolean hasFunctionGroupIdsChanged() {
- return functionGroupIdsChanged;
- }
-
- /**
- * Returns whether or not the enabled property changed.
- *
- * @return true, iff the enabled property changed.
- */
- public boolean hasEnabledChanged() {
- return enabledChanged;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "EnablementIdentifierEvent [identifier=" + identifier.toString() + ", functionGroupIdsChanged=" + hasFunctionGroupIdsChanged() + ", enabledChanged=" + hasEnabledChanged() + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementManager.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementManager.java
deleted file mode 100644
index 8514889..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/EnablementManager.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 3, 2004
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * @author mdelder
- */
-public class EnablementManager implements IEnablementManager {
-
- public static final IEnablementManager INSTANCE = new EnablementManager();
-
- private static Map identifiersByProject = new WeakHashMap();
-
- public EnablementManager() {
- }
-
- /**
- * Returns a Map in which the keys are ids and the values are the identifiers
- *
- * @param project
- * @return
- */
- protected Map getIdentifiersById(IProject project) {
- Map aMap = (Map) identifiersByProject.get(project);
- if (aMap == null) {
- aMap = new WeakHashMap();
- identifiersByProject.put(project, aMap);
- }
- return aMap;
- }
-
- public IEnablementIdentifier getIdentifier(String identifierId, IProject project) {
- if (identifierId == null) throw new NullPointerException();
- if (project != null && !project.isAccessible()) project = null;
-
- EnablementIdentifier identifier = null;
- synchronized(this) {
- Map identifiersById = getIdentifiersById(project);
-
- identifier = (EnablementIdentifier) identifiersById.get(identifierId);
-
- if (identifier == null) {
- identifier = createIdentifier(identifierId, project);
- updateIdentifier(identifier);
- identifiersById.put(identifierId, identifier);
- }
- }
-
- return identifier;
- }
-
- protected EnablementIdentifier createIdentifier(String identifierId, IProject project) {
- return new EnablementIdentifier(identifierId, project);
- }
-
- private EnablementIdentifierEvent updateIdentifier(EnablementIdentifier identifier) {
- String id = identifier.getId();
- Set functionGroupIds = new HashSet();
-
- List groups = FunctionGroupRegistry.getInstance().getKnownGroups();
- for (Iterator iterator = groups.iterator(); iterator.hasNext();) {
- FunctionGroup group = (FunctionGroup) iterator.next();
-
- if (group == null)
- throw new IllegalStateException();
- if (group.isMatch(id))
- functionGroupIds.add(group.getGroupID());
- }
-
- boolean functionGroupsChanged = identifier.setFunctionGroupIds(functionGroupIds);
- boolean enabledChanged = identifier.resetEnabled();
-
- if (functionGroupsChanged || enabledChanged)
- return new EnablementIdentifierEvent(identifier, functionGroupsChanged, enabledChanged);
- return null;
- }
-
- /**
- * Notify all identifier listeners that the state of a project has changed that affects the
- * enablement of a group for a project. This method is fail safe, in that if one listener throws
- * an exception while being notified, it will not stop the notification of other listeners.
- *
- * @param evt
- * @throws CoreException
- * if exceptions were caught notifying any of the listeners. Check the status of the
- * core exception for the nested exceptions.
- */
- public final void notifyFunctionGroupChanged(String groupID, IProject project) throws CoreException {
-
- Map identifiers = getIdentifiersById(project);
-
- if (identifiers == null)
- return;
-
- EnablementIdentifier identifier = null;
- Iterator iter = identifiers.values().iterator();
- IStatus errorStatus = null;
- IStatus nextStatus = null;
-
- while (iter.hasNext()) {
- identifier = (EnablementIdentifier) iter.next();
-
- EnablementIdentifierEvent evt = updateIdentifier(identifier);
- try {
- if (evt != null)
- identifier.fireIdentifierChanged(evt);
- } catch (Exception ex) {
- //Defer the exception so others can handle it.
- nextStatus = WTPCommonPlugin.createErrorStatus(WTPCommonMessages.INTERNAL_ERROR, ex);
- Logger.getLogger().logError(ex);
- if (errorStatus == null)
- errorStatus = nextStatus;
- else if (errorStatus.isMultiStatus())
- ((MultiStatus) errorStatus).add(nextStatus);
- else {
- IStatus[] children = {errorStatus, nextStatus};
- errorStatus = new MultiStatus(errorStatus.getPlugin(), errorStatus.getCode(), children, WTPCommonMessages.INTERNAL_ERROR, null);
- }
- }
-
- }
- if (errorStatus != null)
- throw new CoreException(errorStatus);
-
- }
-
- /**
- * Utility method for clients to dispose of listeners
- *
- * @param enablementIdentifiers
- * @param listener
- */
- public void removeEnablementIdentifierListener(Collection enablementIdentifiers, IEnablementIdentifierListener listener) {
- Iterator iter = enablementIdentifiers.iterator();
- while (iter.hasNext()) {
- IEnablementIdentifier identifier = (IEnablementIdentifier) iter.next();
- identifier.removeIdentifierListener(listener);
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroup.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroup.java
deleted file mode 100644
index 16c9d9e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroup.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * @author mdelder/blancett
- */
-public class FunctionGroup implements Comparable {
-
- public static final String GROUP_NAME_ATTR = "name"; //$NON-NLS-1$
- public static final String GROUP_DESC_ATTR = "description"; //$NON-NLS-1$
- public static final String GROUP_ENABLED_BY_DEFAULT_ATTR = "enabledByDefault"; //$NON-NLS-1$
- public static final String GROUP_PRIORITY_ATTR = "priority"; //$NON-NLS-1$
- public static final String GROUP_INTIALIZER_CLASS_ATTR = "initializerClassName"; //$NON-NLS-1$
- private static final int NEGATIVE_PRIORITY = -1;
-
- private String groupID;
- private String name;
- private String description;
- private String intializerClassName;
- private String declaringExtension;
- private int priority = NEGATIVE_PRIORITY;
- private IConfigurationElement element;
- private IGroupInitializer groupInterface;
- private Set functionGroupPatternBindings;
- private transient FunctionGroupPatternBinding[] functionGroupPatternBindingsAsArray;
- private boolean errorReported = false;
-
- public FunctionGroup(String groupID, IConfigurationElement element) {
- this.groupID = groupID;
- this.element = element;
- }
-
- public String getDescription() {
- if (description == null)
- description = element.getAttribute(GROUP_DESC_ATTR);
- return description;
- }
-
- String getInitalizerClassName() {
- if (intializerClassName == null)
- intializerClassName = element.getAttribute(GROUP_INTIALIZER_CLASS_ATTR);
- return intializerClassName;
- }
-
- public String getName() {
- if (name == null)
- name = element.getAttribute(GROUP_NAME_ATTR);
- return name;
- }
-
- private String getDeclaringExtensionName() {
- if (declaringExtension == null) {
- if (element.getDeclaringExtension() == null)
- return ""; //$NON-NLS-1$
- declaringExtension = element.getDeclaringExtension().toString();
- }
- return declaringExtension;
- }
-
- public String getGroupID() {
- return groupID;
- }
-
- IGroupInitializer getInitializerClass() {
- if (groupInterface == null)
- try {
- groupInterface = (IGroupInitializer) element.createExecutableExtension(GROUP_INTIALIZER_CLASS_ATTR);
- } catch (CoreException e) {
- Logger.getLogger().logError(WTPResourceHandler.getString("29", new Object[]{GROUP_INTIALIZER_CLASS_ATTR, getInitalizerClassName(), getDeclaringExtensionName()}) + "\r\n"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-4$
- Logger.getLogger().logError(e);
- }
- return groupInterface;
- }
-
- public String toString() {
- return "\"" + getName() + "\" (" + getGroupID() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- public int getPriority() {
- if (priority == NEGATIVE_PRIORITY)
- priority = Integer.parseInt(element.getAttribute(GROUP_PRIORITY_ATTR));
- return priority;
- }
-
- public boolean isEnabled(IProject project) {
- if (getInitializerClass() != null)
- return getInitializerClass().isGroupEnabled(project);
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(Object o) {
- if (this.equals(o))
- return 0;
- else if (!(o instanceof FunctionGroup))
- return 1;
-
- FunctionGroup group = (FunctionGroup) o;
- if (getPriority() == group.getPriority())
- return getGroupID().compareTo(group.getGroupID());
-
- else if (getPriority() < group.getPriority())
- return -1;
- else
- return 1;
- }
-
- public boolean isMatch(String string) {
- if (functionGroupPatternBindings == null) {
- if (!errorReported) {
- Logger.getLogger().logError(WTPResourceHandler.getString("30", new Object[]{getGroupID()})); //$NON-NLS-1$
- errorReported = true;
- }
- return false;
- }
- for (Iterator iterator = functionGroupPatternBindings.iterator(); iterator.hasNext();) {
- FunctionGroupPatternBinding functionGroupPatternBinding = (FunctionGroupPatternBinding) iterator.next();
-
- if (functionGroupPatternBinding.getPattern().matcher(string).matches())
- return true;
- }
-
- return false;
- }
-
- boolean setFunctionGroupPatternBindings(Set functionGroupPatternBindings) {
- functionGroupPatternBindings = Util.safeCopy(functionGroupPatternBindings, FunctionGroupPatternBinding.class);
-
- if (!Util.equals(functionGroupPatternBindings, this.functionGroupPatternBindings)) {
- this.functionGroupPatternBindings = functionGroupPatternBindings;
- this.functionGroupPatternBindingsAsArray = (FunctionGroupPatternBinding[]) this.functionGroupPatternBindings.toArray(new FunctionGroupPatternBinding[this.functionGroupPatternBindings.size()]);
-
- return true;
- }
-
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroupPatternBinding.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroupPatternBinding.java
deleted file mode 100644
index 1d10895..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroupPatternBinding.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.regex.Pattern;
-
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class FunctionGroupPatternBinding {
-
- private final static int HASH_FACTOR = 89;
- private final static int HASH_INITIAL = FunctionGroupPatternBinding.class.getName().hashCode();
- private String functionGroupId;
- private transient int hashCode;
- private transient boolean hashCodeComputed;
- private Pattern pattern;
- private transient String string;
-
- /**
- *
- */
- public FunctionGroupPatternBinding(String functionGroupId, Pattern pattern) {
- if (pattern == null)
- throw new NullPointerException();
-
- this.functionGroupId = functionGroupId;
- this.pattern = pattern;
- }
-
- public int compareTo(Object object) {
- FunctionGroupPatternBinding castedObject = (FunctionGroupPatternBinding) object;
- int compareTo = Util.compare(functionGroupId, castedObject.functionGroupId);
-
- if (compareTo == 0)
- compareTo = Util.compare(pattern.pattern(), castedObject.pattern.pattern());
-
- return compareTo;
- }
-
- public boolean equals(Object object) {
- if (!(object instanceof FunctionGroupPatternBinding))
- return false;
-
- FunctionGroupPatternBinding castedObject = (FunctionGroupPatternBinding) object;
- boolean equals = true;
- equals &= Util.equals(functionGroupId, castedObject.functionGroupId);
- equals &= Util.equals(pattern, castedObject.pattern);
- return equals;
- }
-
- public String getActivityId() {
- return functionGroupId;
- }
-
- public Pattern getPattern() {
- return pattern;
- }
-
- public int hashCode() {
- if (!hashCodeComputed) {
- hashCode = HASH_INITIAL;
- hashCode = hashCode * HASH_FACTOR + Util.hashCode(functionGroupId);
- hashCode = hashCode * HASH_FACTOR + Util.hashCode(pattern);
- hashCodeComputed = true;
- }
-
- return hashCode;
- }
-
- public String toString() {
- if (string == null) {
- final StringBuffer stringBuffer = new StringBuffer();
- stringBuffer.append('[').append(functionGroupId).append(",pattern=\"").append(pattern.pattern()).append("\"]"); //$NON-NLS-1$ //$NON-NLS-2$
- string = stringBuffer.toString();
- }
-
- return string;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroupRegistry.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroupRegistry.java
deleted file mode 100644
index e97458e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/FunctionGroupRegistry.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All
- * Rights Reserved. US Government Users Restricted Rights - Use, duplication or
- * disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-import com.ibm.wtp.common.RegistryReader;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * The FunctionGroupRegistry will consume Configuration elements conforming to the FunctionGroup
- * Extension Point schema.
- *
- * @author mdelder/blancett
- */
-public class FunctionGroupRegistry extends RegistryReader {
-
- private static FunctionGroupRegistry INSTANCE = null;
-
- public static final String GROUP_ELEMENT = "functionGroup"; //$NON-NLS-1$
- public static final String GROUP_ID_ATTR = "functionGroupID"; //$NON-NLS-1$
- public static final String FUNCTION_GROUP_PATTERN_BINDING_ELMT = "functionGroupPatternBinding"; //$NON-NLS-1$
- public static final String PATTERN_ATTR = "pattern"; //$NON-NLS-1$
-
- private Map groupMapById;
- private List knownGroups;
- private Map patternBindingsByGroupId;
-
- private FunctionGroupRegistry() {
- super(WTPCommonPlugin.PLUGIN_ID, WTPCommonPlugin.GROUP_REGISTRY_EXTENSION_POINT);
- patternBindingsByGroupId = new HashMap();
-
- }
-
- public static FunctionGroupRegistry getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new FunctionGroupRegistry();
- INSTANCE.readRegistry();
- }
- return INSTANCE;
- }
-
- /*
- * (non-Javadoc) Read all the elements first, then set the pattern bindings on the function
- * groups
- */
- public void readRegistry() {
- super.readRegistry();
- setPatternBindings();
- }
-
- private void setPatternBindings() {
- Iterator iter = patternBindingsByGroupId.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Entry) iter.next();
- String groupId = (String) entry.getKey();
- Set value = (Set) entry.getValue();
- FunctionGroup aGroup = getGroupByID(groupId);
- if (aGroup != null)
- aGroup.setFunctionGroupPatternBindings(value);
- }
-
- }
-
- public boolean readElement(IConfigurationElement element) {
- if (element.getName().equals(GROUP_ELEMENT)) {
- readGroup(element);
- return true;
- } else if (element.getName().equals(FUNCTION_GROUP_PATTERN_BINDING_ELMT)) {
- readPatternBinding(element);
- return true;
- }
- return false;
- }
-
- /**
- * @param element
- */
- private void readPatternBinding(IConfigurationElement element) {
- String groupID = element.getAttribute(GROUP_ID_ATTR);
- String pattern = element.getAttribute(PATTERN_ATTR);
- if (!isNullOrEmpty(groupID) && !isNullOrEmpty(pattern)) {
- Pattern aPattern = Pattern.compile(pattern);
- FunctionGroupPatternBinding binding = new FunctionGroupPatternBinding(groupID, aPattern);
- addPatternBinding(groupID, binding);
- }
-
- }
-
- /**
- * @param binding
- */
- private void addPatternBinding(String groupID, FunctionGroupPatternBinding binding) {
- Set bindings = (Set) patternBindingsByGroupId.get(groupID);
- if (bindings == null) {
- bindings = new HashSet();
- patternBindingsByGroupId.put(groupID, bindings);
- }
- bindings.add(binding);
- }
-
- private boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- private void readGroup(IConfigurationElement element) {
- String groupID = element.getAttribute(GROUP_ID_ATTR);
- if (!isNullOrEmpty(groupID)) {
- FunctionGroup group = new FunctionGroup(groupID, element);
- getGroupMapById().put(groupID, group);
- getKnownGroups().add(group);
- }
- }
-
- private List getAscendingSortedGroups(IProject project) {
- Comparator ascendingGrpComparator = AscendingGroupComparator.singleton();
- List groupList = getKnownGroups(project);
- Collections.sort(groupList, ascendingGrpComparator);
- return groupList;
- }
-
- private List getDescendingSortedGroups(IProject project) {
- Comparator descendingGrpComparator = DescendingGroupComparator.singleton();
- List groupList = getKnownGroups(project);
- Collections.sort(groupList, descendingGrpComparator);
- return groupList;
- }
-
- public List getKnownGroups(IProject project) {
- ArrayList groupByProjectList = new ArrayList(getKnownGroups().size());
- List groupList = getKnownGroups();
- for (int i = 0; i < groupList.size(); i++) {
- FunctionGroup group = (FunctionGroup) groupList.get(i);
- if (group.isEnabled(project))
- groupByProjectList.add(group);
- }
- return groupByProjectList;
- }
-
- public List getAscendingPriorityGroupNames(IProject project) {
- List sortedGroup = getAscendingSortedGroups(project);
- return getGroupListNames(sortedGroup, new ArrayList(sortedGroup.size()));
-
- }
-
- public List getDescendingPriorityGroupNames(IProject project) {
- List sortedGroup = getDescendingSortedGroups(project);
- return getGroupListNames(sortedGroup, new ArrayList(sortedGroup.size()));
- }
-
- private List getGroupListNames(List sortedGroup, List sortedGroupNames) {
- for (int i = 0; i < sortedGroup.size(); i++) {
- FunctionGroup grp = (FunctionGroup) sortedGroup.get(i);
- sortedGroupNames.add(grp.getGroupID());
- }
- return sortedGroupNames;
- }
-
- public Iterator getGroupIDs() {
- return getGroupMapById().keySet().iterator();
- }
-
- public FunctionGroup getGroupByID(String groupID) {
- return (FunctionGroup) getGroupMapById().get(groupID);
- }
-
- public boolean isGroupEnabled(IProject project, String groupID) {
- FunctionGroup group = getGroupByID(groupID);
- if (group != null)
- return group.isEnabled(project);
- return false;
- }
-
- public List getKnownGroups() {
- if (knownGroups == null)
- knownGroups = new ArrayList();
- return knownGroups;
- }
-
- /**
- * @return Returns the groupMapById.
- */
- protected Map getGroupMapById() {
- if (groupMapById == null)
- groupMapById = new HashMap();
- return groupMapById;
- }
-
- /**
- * Check the priority of the two groups referenced by
- *
- * @groupID1 and
- * @groupID2
- *
- * @param groupID1
- * @param groupID2
- * @return 0 if the two groups are equal, 1 if
- * @groupID1 has a higher precedence, otherwise -1
- */
- public int compare(String groupID1, String groupID2) {
- FunctionGroup group1 = getGroupByID(groupID1);
- FunctionGroup group2 = getGroupByID(groupID2);
- if (group1 == null) {
- Logger.getLogger().logError(new IllegalArgumentException(WTPResourceHandler.getString("28", new Object[]{groupID1}))); //$NON-NLS-1$
- return -1;
- }
- if (group2 == null) {
- Logger.getLogger().logError(new IllegalArgumentException(WTPResourceHandler.getString("28", new Object[]{groupID2}))); //$NON-NLS-1$
- return 1;
- }
-
- return group1.compareTo(group2);
- }
-
- public int getGroupPriority(String grpId) {
- FunctionGroup group = getGroupByID(grpId);
- return (group != null) ? group.getPriority() : -1;
- }
-
- public int getFunctionPriority(String enablementID) {
- int priority = Integer.MAX_VALUE;
- Iterator iter = getKnownGroups().iterator();
- while (iter.hasNext()) {
- FunctionGroup group = (FunctionGroup) iter.next();
- if (group.isMatch(enablementID))
- priority = Math.min(priority, group.getPriority());
- }
- return priority;
-
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementIdentifier.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementIdentifier.java
deleted file mode 100644
index 101a5cf..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementIdentifier.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.Set;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEnablementIdentifier {
-
-
- /**
- * Registers an instance of <code>IIdentifierListener</code> to listen for changes to
- * properties of this instance.
- *
- * @param identifierListener
- * the instance to register. Must not be <code>null</code>. If an attempt is made
- * to register an instance which is already registered with this instance, no
- * operation is performed.
- */
- void addIdentifierListener(IEnablementIdentifierListener identifierListener);
-
- /**
- * Returns the set of function group ids that this instance matches.
- * <p>
- * Notification is sent to all registered listeners if this property changes.
- * </p>
- *
- * @return the set of activity ids that this instance matches. This set may be empty, but is
- * guaranteed not to be <code>null</code>. If this set is not empty, it is guaranteed
- * to only contain instances of <code>String</code>.
- */
- Set getFunctionGroupIds();
-
- /**
- * Returns the identifier of this instance.
- *
- * @return the identifier of this instance. Guaranteed not to be <code>null</code>.
- */
- String getId();
-
- /**
- * Returns whether or not this instance is enabled.
- * <p>
- * Notification is sent to all registered listeners if this property changes.
- * </p>
- *
- * @return true, iff this instance is enabled.
- */
- boolean isEnabled();
-
- /**
- * Unregisters an instance of <code>IEnablementIdentifierListener</code> listening for changes
- * to properties of this instance.
- *
- * @param identifierListener
- * the instance to unregister. Must not be <code>null</code>. If an attempt is
- * made to unregister an instance which is not already registered with this instance,
- * no operation is performed.
- */
- void removeIdentifierListener(IEnablementIdentifierListener identifierListener);
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementIdentifierListener.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementIdentifierListener.java
deleted file mode 100644
index 38a617b..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementIdentifierListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEnablementIdentifierListener {
- /**
- * Notifies that one or more properties of an instance of <code>IIdentifier</code> have
- * changed. Specific details are described in the <code>IdentifierEvent</code>.
- *
- * @param identifierEvent
- * the identifier event. Guaranteed not to be <code>null</code>.
- */
- void identifierChanged(EnablementIdentifierEvent identifierEvent);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementManager.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementManager.java
deleted file mode 100644
index 24b1736..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IEnablementManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 12, 2004
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-
-import com.ibm.wtp.common.UIContextDetermination;
-
-/**
- * @author schacher
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEnablementManager {
- String INTERNAL_ENABLEMENT_DETERMINATION_ID = "org.eclipse.wst.common.frameworks.internal.EnablementDetermination"; //$NON-NLS-1$
-
- IEnablementManager INSTANCE = (IEnablementManager) UIContextDetermination.createInstance(INTERNAL_ENABLEMENT_DETERMINATION_ID);
-
- IEnablementIdentifier getIdentifier(String identifierId, IProject project);
-
- /**
- * Notify all identifier listeners that the state of a project has changed that affects the
- * enablement of a group for a project. This method is fail safe, in that if one listener throws
- * an exception while being notified, it will not stop the notification of other listeners.
- *
- * @param evt
- * @throws CoreException
- * if exceptions were caught notifying any of the listeners. Check the status of the
- * core exception for the nested exceptions.
- */
- void notifyFunctionGroupChanged(String groupID, IProject project) throws CoreException;
-
- /**
- * Utility method for clients to dispose of listeners
- *
- * @param enablementIdentifiers
- * @param listener
- */
- void removeEnablementIdentifierListener(Collection enablementIdentifiers, IEnablementIdentifierListener listener);
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IGroupInitializer.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IGroupInitializer.java
deleted file mode 100644
index fd2884d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IGroupInitializer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * @author blancett
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public interface IGroupInitializer {
-
- public boolean isGroupEnabled(IProject project);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/Identifiable.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/Identifiable.java
deleted file mode 100644
index c529b05..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/Identifiable.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-
-/**
- * @author mdelder
- *
- */
-public interface Identifiable {
-
- /**
- * return id that uniquely identifies this instance of an extension point. It is up to each
- * individual extension point provider to decide what that might be (e.g., "editorID", "pageID",
- * etc.
- */
- String getID();
-
- /**
- *
- * @return the order the Identifiable element was loaded
- */
- int getLoadOrder();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IdentifiableComparator.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IdentifiableComparator.java
deleted file mode 100644
index f0673a9..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/IdentifiableComparator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-
-/**
- * @author mdelder
- *
- */
-public class IdentifiableComparator implements java.util.Comparator {
-
- protected static final int GREATER_THAN = 1;
-
- protected static final int LESS_THAN = -1;
-
- protected static final int EQUAL = 0;
-
- protected static final IdentifiableComparator instance = new IdentifiableComparator();
-
- private static final int DEFAULT_PRIORITY = Integer.MAX_VALUE;
-
- public static IdentifiableComparator getInstance() {
- return instance;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object o1, Object o2) {
- Identifiable lvalue = null;
- Identifiable rvalue = null;
- if (o1 instanceof Identifiable)
- lvalue = (Identifiable) o1;
- if (o2 instanceof Identifiable)
- rvalue = (Identifiable) o2;
-
- if (rvalue == null)
- return GREATER_THAN;
- if (lvalue == null)
- return LESS_THAN;
-
- if ((lvalue.getID() == null && rvalue.getID() == null) || (getPriority(lvalue) == getPriority(rvalue)))
- return compareLoadOrder(lvalue, rvalue);
- /* R - L implies 0 is the highest priority */
- return getPriority(lvalue) - getPriority(rvalue);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return obj instanceof IdentifiableComparator;
- }
-
- private int compareLoadOrder(Identifiable lvalue, Identifiable rvalue) {
- /* R - L implies 0 is the highest priority */
- return lvalue.getLoadOrder() - rvalue.getLoadOrder();
- }
-
- public int getPriority(Identifiable identifiable) {
- if (identifiable.getID() != null && identifiable.getID().length() > 0)
- return FunctionGroupRegistry.getInstance().getFunctionPriority(identifiable.getID());
- return DEFAULT_PRIORITY;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/Util.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/Util.java
deleted file mode 100644
index 709d9ab..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/enablement/Util.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclispe.wst.common.frameworks.internal.enablement;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-/*
- * Rename this class to EnablementsUtil
- */
-
-public final class Util {
- public final static SortedMap EMPTY_SORTED_MAP = Collections.unmodifiableSortedMap(new TreeMap());
- public final static SortedSet EMPTY_SORTED_SET = Collections.unmodifiableSortedSet(new TreeSet());
- public final static String ZERO_LENGTH_STRING = ""; //$NON-NLS-1$
-
- public static void assertInstance(Object object, Class c) {
- assertInstance(object, c, false);
- }
-
- public static void assertInstance(Object object, Class c, boolean allowNull) {
- if (object == null && allowNull)
- return;
-
- if (object == null || c == null)
- throw new NullPointerException();
- else if (!c.isInstance(object))
- throw new IllegalArgumentException();
- }
-
- public static int compare(boolean left, boolean right) {
- return left == false ? (right == true ? -1 : 0) : 1;
- }
-
- public static int compare(Comparable left, Comparable right) {
- if (left == null && right == null)
- return 0;
- else if (left == null)
- return -1;
- else if (right == null)
- return 1;
- else
- return left.compareTo(right);
- }
-
- public static int compare(Comparable[] left, Comparable[] right) {
- if (left == null && right == null)
- return 0;
- else if (left == null)
- return -1;
- else if (right == null)
- return 1;
- else {
- int l = left.length;
- int r = right.length;
-
- if (l != r)
- return l - r;
- for (int i = 0; i < l; i++) {
- int compareTo = compare(left[i], right[i]);
-
- if (compareTo != 0)
- return compareTo;
- }
- return 0;
- }
- }
-
- public static int compare(int left, int right) {
- return left - right;
- }
-
- public static int compare(List left, List right) {
- if (left == null && right == null)
- return 0;
- else if (left == null)
- return -1;
- else if (right == null)
- return 1;
- else {
- int l = left.size();
- int r = right.size();
-
- if (l != r)
- return l - r;
- for (int i = 0; i < l; i++) {
- int compareTo = compare((Comparable) left.get(i), (Comparable) right.get(i));
-
- if (compareTo != 0)
- return compareTo;
- }
- return 0;
- }
- }
-
- public static void diff(Map left, Map right, Set leftOnly, Set different, Set rightOnly) {
- if (left == null || right == null || leftOnly == null || different == null || rightOnly == null)
- throw new NullPointerException();
-
- Iterator iterator = left.keySet().iterator();
-
- while (iterator.hasNext()) {
- Object key = iterator.next();
-
- if (!right.containsKey(key))
- leftOnly.add(key);
- else if (!Util.equals(left.get(key), right.get(key)))
- different.add(key);
- }
-
- iterator = right.keySet().iterator();
-
- while (iterator.hasNext()) {
- Object key = iterator.next();
-
- if (!left.containsKey(key))
- rightOnly.add(key);
- }
- }
-
- public static void diff(Set left, Set right, Set leftOnly, Set rightOnly) {
- if (left == null || right == null || leftOnly == null || rightOnly == null)
- throw new NullPointerException();
-
- Iterator iterator = left.iterator();
-
- while (iterator.hasNext()) {
- Object object = iterator.next();
-
- if (!right.contains(object))
- leftOnly.add(object);
- }
-
- iterator = right.iterator();
-
- while (iterator.hasNext()) {
- Object object = iterator.next();
-
- if (!left.contains(object))
- rightOnly.add(object);
- }
- }
-
- public static boolean endsWith(List left, List right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.size();
- int r = right.size();
- if (r > l || !equals && r == l)
- return false;
-
- for (int i = 0; i < r; i++)
- if (!equals(left.get(l - i - 1), right.get(r - i - 1)))
- return false;
- return true;
- }
-
- public static boolean endsWith(Object[] left, Object[] right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.length;
- int r = right.length;
- if (r > l || !equals && r == l)
- return false;
- for (int i = 0; i < r; i++)
- if (!equals(left[l - i - 1], right[r - i - 1]))
- return false;
- return true;
- }
-
- public static boolean equals(boolean left, boolean right) {
- return left == right;
- }
-
- public static boolean equals(int left, int right) {
- return left == right;
- }
-
- public static boolean equals(Object left, Object right) {
- return left == null ? right == null : left.equals(right);
- }
-
- public static int hashCode(boolean b) {
- return b ? Boolean.TRUE.hashCode() : Boolean.FALSE.hashCode();
- }
-
- public static int hashCode(int i) {
- return i;
- }
-
- public static int hashCode(Object object) {
- return object != null ? object.hashCode() : 0;
- }
-
- public static List safeCopy(List list, Class c) {
- return safeCopy(list, c, false);
- }
-
- public static List safeCopy(List list, Class c, boolean allowNullElements) {
- if (list == null || c == null)
- throw new NullPointerException();
-
- list = Collections.unmodifiableList(new ArrayList(list));
- Iterator iterator = list.iterator();
-
- while (iterator.hasNext())
- assertInstance(iterator.next(), c, allowNullElements);
-
- return list;
- }
-
- public static Map safeCopy(Map map, Class keyClass, Class valueClass) {
- return safeCopy(map, keyClass, valueClass, false, false);
- }
-
- public static Map safeCopy(Map map, Class keyClass, Class valueClass, boolean allowNullKeys, boolean allowNullValues) {
- if (map == null || keyClass == null || valueClass == null)
- throw new NullPointerException();
-
- map = Collections.unmodifiableMap(new HashMap(map));
- Iterator iterator = map.entrySet().iterator();
-
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- assertInstance(entry.getKey(), keyClass, allowNullKeys);
- assertInstance(entry.getValue(), valueClass, allowNullValues);
- }
-
- return map;
- }
-
- public static Set safeCopy(Set set, Class c) {
- return safeCopy(set, c, false);
- }
-
- public static Set safeCopy(Set set, Class c, boolean allowNullElements) {
- if (set == null || c == null)
- throw new NullPointerException();
-
- set = Collections.unmodifiableSet(new HashSet(set));
- Iterator iterator = set.iterator();
-
- while (iterator.hasNext())
- assertInstance(iterator.next(), c, allowNullElements);
-
- return set;
- }
-
- public static SortedMap safeCopy(SortedMap sortedMap, Class keyClass, Class valueClass) {
- return safeCopy(sortedMap, keyClass, valueClass, false, false);
- }
-
- public static SortedMap safeCopy(SortedMap sortedMap, Class keyClass, Class valueClass, boolean allowNullKeys, boolean allowNullValues) {
- if (sortedMap == null || keyClass == null || valueClass == null)
- throw new NullPointerException();
-
- sortedMap = Collections.unmodifiableSortedMap(new TreeMap(sortedMap));
- Iterator iterator = sortedMap.entrySet().iterator();
-
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- assertInstance(entry.getKey(), keyClass, allowNullKeys);
- assertInstance(entry.getValue(), valueClass, allowNullValues);
- }
-
- return sortedMap;
- }
-
- public static SortedSet safeCopy(SortedSet sortedSet, Class c) {
- return safeCopy(sortedSet, c, false);
- }
-
- public static SortedSet safeCopy(SortedSet sortedSet, Class c, boolean allowNullElements) {
- if (sortedSet == null || c == null)
- throw new NullPointerException();
-
- sortedSet = Collections.unmodifiableSortedSet(new TreeSet(sortedSet));
- Iterator iterator = sortedSet.iterator();
-
- while (iterator.hasNext())
- assertInstance(iterator.next(), c, allowNullElements);
-
- return sortedSet;
- }
-
- public static boolean startsWith(List left, List right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.size();
- int r = right.size();
- if (r > l || !equals && r == l)
- return false;
- for (int i = 0; i < r; i++)
- if (!equals(left.get(i), right.get(i)))
- return false;
- return true;
- }
-
- public static boolean startsWith(Object[] left, Object[] right, boolean equals) {
- if (left == null || right == null)
- return false;
- int l = left.length;
- int r = right.length;
- if (r > l || !equals && r == l)
- return false;
-
- for (int i = 0; i < r; i++)
- if (!equals(left[i], right[i]))
- return false;
- return true;
- }
-
- public static String translateString(ResourceBundle resourceBundle, String key) {
- return Util.translateString(resourceBundle, key, key, true, true);
- }
-
- public static String translateString(ResourceBundle resourceBundle, String key, String string, boolean signal, boolean trim) {
- if (resourceBundle != null && key != null)
- try {
- final String translatedString = resourceBundle.getString(key);
-
- if (translatedString != null)
- return trim ? translatedString.trim() : translatedString;
- } catch (MissingResourceException eMissingResource) {
- if (signal)
- System.err.println(eMissingResource);
- }
-
- return trim ? string.trim() : string;
- }
-
- private Util() {
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/plugin/WTPCommonMessages.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/plugin/WTPCommonMessages.java
deleted file mode 100644
index 03cb432..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/plugin/WTPCommonMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 5, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.plugin;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WTPCommonMessages {
- public static final String PROJECT_EXISTS_ERROR = "1"; //$NON-NLS-1$
- public static final String PROJECT_NOT_EAR = "2"; //$NON-NLS-1$
- public static final String INCOMPATABLE_J2EE_VERSIONS = "3"; //$NON-NLS-1$
- public static final String SAME_MODULE_AND_EAR_NAME = "4"; //$NON-NLS-1$
- public static final String ARCHIVE_FILE_NAME_EMPTY_ERROR = "5"; //$NON-NLS-1$
- public static final String FILE_DOES_NOT_EXIST_ERROR = "6"; //$NON-NLS-1$
- public static final String INTERNAL_ERROR = "7"; //$NON-NLS-1$
- public static final String PROJECT_NAME_INVALID = "8"; //$NON-NLS-1$
- public static final String DESTINATION_ARCHIVE_SHOULD_END_WITH = "9"; //$NON-NLS-1$
- public static final String DESTINATION_INVALID = "10"; //$NON-NLS-1$
- public static final String IS_READ_ONLY = "11"; //$NON-NLS-1$
- public static final String RESOURCE_EXISTS_ERROR = "12"; //$NON-NLS-1$
- public static final String PROJECT_NOT_EXISTS_ERROR = "13"; //$NON-NLS-1$
- public static final String J2EE_SPEC_LEVEL_NOT_FOUND = "14"; //$NON-NLS-1$
- public static final String PROJECT_NAME_EMPTY = "15"; //$NON-NLS-1$
- public static final String PROJECT_ClOSED = "31"; //$NON-NLS-1$
- public static final String PROJECT_EXISTS_AT_LOCATION_ERROR = "32"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/plugin/WTPCommonPlugin.java b/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/plugin/WTPCommonPlugin.java
deleted file mode 100644
index b0c092d..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/org/eclispe/wst/common/frameworks/internal/plugin/WTPCommonPlugin.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 29, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclispe.wst.common.frameworks.internal.plugin;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WTPCommonPlugin extends WTPPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.wst.common.frameworks"; //$NON-NLS-1$
- public static final String GROUP_REGISTRY_EXTENSION_POINT = "functionGroup"; //$NON-NLS-1$
- public static final IStatus OK_STATUS = new Status(IStatus.OK, PLUGIN_ID, 0, "OK", null); //$NON-NLS-1$
-
- // The shared instance.
- private static WTPCommonPlugin plugin;
-
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- public WTPCommonPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("wtp_common"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- public static WTPCommonPlugin getDefault() {
- return plugin;
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message) {
- return createErrorStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createWarningStatus(String message) {
- return createWarningStatus(message, null);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createWarningStatus(String message, Throwable exception) {
- return new Status(IStatus.WARNING, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * @param string
- * @return
- */
- public static IStatus createErrorStatus(String message, Throwable exception) {
- return new Status(IStatus.ERROR, PLUGIN_ID, -1, message, exception);
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = WTPCommonPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e) {
- return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- public static String getResourceString(String key, Object[] args) {
- String pattern = getResourceString(key);
- if (pattern != null)
- return MessageFormat.format(pattern, args);
- return null;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
deleted file mode 100644
index 5dd688a..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=A project already exists with this name and location.
-2=The specified EAR project "{0}" is not an EAR project.
-3=The EAR project "{0}" has a J2EEVersion of {1} which is not compatable with the specified module version.
-4=The EAR project name, "{0}", can not be the same as the project name.
-5={0} file name must be entered.
-6=The {0} does not exist.
-7=An internal error occurred. View log files for details.
-8=Project name is invalid.
-9=Destination archive should end with {0}.
-10=Destination archive is invalid.
-11=Destination location is read only.
-12=Resource {0} already exists. If you wish to overwrite select the "Overwrite Existing file" option.
-13=Project {0} does not exist.
-14=Connector project is not supported for selected J2EE preference. Check the global J2EE preference.
-15=Enter a project name.
-16=Save problems
-17=Save could not be completed. Some related files may have already been saved.\n\nReason
-18={0} has been locked. Please ensure the operation is not currently executing.
-19=The extendedRoot is null. Make sure that isExtended() returns true.
-20=Property not located:
-21=Nested model not located:
-22=Cannot modify id once it has been set.
-23=The id cannot be null.
-24=ERROR:
-25=Extended Operation failure: {0}
-26=The Job completed successfully
-27=Exception occurred running job.
-28=Group cannot be resolved:
-29=Class not found for attribute {0} : {1}, Declaring plugin extension: {2}
-30=Function group {0} contains no pattern bindings
-31=Project {0} is closed.
-32=A project already exists on the file system at this location: {0}. Either use "Import Existing Projects into Workspace" to create a project at this location or delete the contents of {0} from the file system.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_de.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_de.properties
deleted file mode 100644
index 49572af..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_de.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=Ein Projekt mit diesem Namen und dieser Position ist bereits vorhanden.
-2=Das angegebene Projekt "{0}" ist kein EAR-Projekt.
-3=Das EAR-Projekt "{0}" hat die J2EEVersion {1}, die nicht mit der angegebenen Version des Moduls kompatibel ist.
-4=Der Name des EAR-Projekts, "{0}", darf nicht mit dem Projektnamen identisch sein.
-5={0} Dateiname muss eingegeben werden.
-6={0} ist nicht vorhanden.
-7=Ein interner Fehler ist aufgetreten. Weitere Details finden Sie in den Protokolldateien.
-8=Der Projektname ist ung\u00fcltig.
-9=Zielarchiv sollte auf {0} enden.
-10=Zielarchiv ist ung\u00fcltig.
-11=Zielposition ist schreibgesch\u00fctzt.
-12=Die Ressource {0} ist bereits vorhanden. Wenn Sie sie \u00fcberschreiben wollen, w\u00e4hlen Sie die Option "Vorhandene Datei \u00fcberschreiben" aus.
-13=Projekt {0} ist nicht vorhanden.
-14=Connectorprojekt wird f\u00fcr die ausgew\u00e4hlte J2EE-Benutzervorgabe nicht unterst\u00fctzt. \u00dcberpr\u00fcfen Sie die globale J2EE-Einstellung.
-15=Geben Sie einen Projektnamen ein.
-16=Fehler beim Speichern
-17=Der Speichervorgang konnte nicht abgeschlossen werden. M\u00f6glicherweise wurden bereits einige zugeh\u00f6rige Dateien gespeichert.\n\nUrsache
-18={0} wurde gesperrt. Bitte stellen Sie sicher, dass die Operation zurzeit nicht ausgef\u00fchrt wird.
-19=extendedRoot ist Null. Stellen Sie sicher, dass isExtended() "true" zur\u00fcckgibt.
-20=Eigenschaft nicht gefunden:
-21=Verschachteltes Modell nicht gefunden:
-22=ID kann nach dem Festlegen nicht mehr ge\u00e4ndert werden.
-23=Die ID darf nicht Null sein.
-24=FEHLER:
-25=Erweiterte Operation ist fehlgeschlagen: {0}
-26=Der Job wurde erfolgreich beendet.
-27=Beim Ausf\u00fchren des Jobs ist eine Ausnahmebedingung aufgetreten.
-28=Gruppe kann nicht aufgel\u00f6st werden:
-29=Klasse nicht gefunden f\u00fcr Attribut {0} : {1}, Plug-in-Erweiterung wird deklariert: {2}
-30=Funktionsgruppe {0} enth\u00e4lt keine Musterbindings.
-31=Das Projekt {0} ist geschlossen.
-32=Im Dateisystem besteht bereits ein Projekt an dieser Position: {0}. Verwenden Sie entweder "Bestehende Projekte in den Arbeitsbereich importieren", um ein Projekt an dieser Stelle zu erstellen, oder l\u00f6schen Sie den Inhalt von{0} im Dateisystem.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_es.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_es.properties
deleted file mode 100644
index 1fda654..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_es.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=Ya existe un proyecto con este nombre y ubicaci\u00f3n.
-2=El proyecto EAR especificado "{0}" no es un proyecto EAR.
-3=El proyecto EAR "{0}" tiene una J2EEVersion de {1} que no es compatible con la versi\u00f3n del m\u00f3dulo especificado.
-4=El nombre de proyecto EAR, "{0}", no puede ser igual que el nombre del proyecto.
-5=Debe especificarse el nombre del archivo {0}.
-6={0} no existe.
-7=Se ha producido un error interno. Vea los archivos de anotaciones para conocer los detalles.
-8=El nombre del proyecto no es v\u00e1lido.
-9=El archivador de destino debe finalizar con {0}.
-10=El archivador de destino no es v\u00e1lido.
-11=La ubicaci\u00f3n de destino es solo de lectura.
-12=El recurso {0} ya existe. Si desea sobrescribir, seleccione la opci\u00f3n "Sobrescribir archivo existente".
-13=El proyecto {0} no existe.
-14=El proyecto de conector no est\u00e1 soportado para la preferencia J2EE seleccionada. Compruebe la preferencia J2EE global.
-15=Especifique un nombre de proyecto.
-16=Problemas de operaci\u00f3n de guardar
-17=La operaci\u00f3n de guardar no ha podido realizarse. Puede que algunos archivos relacionados ya se hayan guardado.\n\nRaz\u00f3n
-18={0} se ha bloqueado. Aseg\u00farese de que la operaci\u00f3n no se est\u00e1 ejecutando actualmente.
-19=extendedRoot es nulo. Aseg\u00farese de que isExtended() devuelve true.
-20=No se ha ubicado la propiedad:
-21=No se ha ubicado el modelo anidado:
-22=No se puede modificar el ID una vez establecido.
-23=El ID no puede ser nulo.
-24=ERROR:
-25=Anomal\u00eda de operaci\u00f3n ampliada: {0}
-26=El trabajo se ha realizado satisfactoriamente
-27=Se ha producido una excepci\u00f3n al ejecutar el trabajo.
-28=No se ha podido resolver el grupo:
-29=No se ha encontrado la clase para el atributo {0} : {1}, declarando extensi\u00f3n de conector: {2}
-30=El grupo de funciones {0} no contiene enlaces de patr\u00f3n
-31=El proyecto {0} est\u00e1 cerrado.
-32=Ya existe un proyecto en la siguiente ubicaci\u00f3n del sistema de archivos: {0}. Puede utilizar "Importar proyectos existentes en el espacio de trabajo" para crear el proyecto en esta ubicaci\u00f3n o suprimir el contenido en el sistema de archivos de {0}.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_fr.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_fr.properties
deleted file mode 100644
index faff472..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_fr.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=Il existe d\u00e9j\u00e0 un projet avec ce nom et cet emplacement.
-2=Le projet EAR "{0}" sp\u00e9cifi\u00e9 ne correspond pas \u00e0 un projet EAR.
-3=La version J2EE du projet EAR "{0}" est {1} ; cette version n''est pas compatible avec la version de module sp\u00e9cifi\u00e9e.
-4=Le nom de projet EAR "{0}" ne peut pas \u00eatre identique au nom du projet.
-5=Vous devez entrer le nom de fichier {0}.
-6={0} n''existe pas.
-7=Une erreur interne s'est produite. Consultez les fichiers journaux pour plus de d\u00e9tails.
-8=Nom de projet non valide.
-9=L''archive de destination doit se terminer par {0}.
-10=Archive de destination non valide.
-11=Emplacement de destination en lecture seule.
-12=La ressource {0} existe d\u00e9j\u00e0. Pour la remplacer, s\u00e9lectionnez l'option "Remplacer le fichier existant".
-13=Projet {0} inexistant.
-14=Le projet de connecteur n'est pas pris en charge pour la pr\u00e9f\u00e9rence J2EE s\u00e9lectionn\u00e9e. V\u00e9rifiez la pr\u00e9f\u00e9rence J2EE globale.
-15=Entrez un nom de projet.
-16=Erreurs de sauvegarde
-17=La sauvegarde n'a pas pu \u00eatre effectu\u00e9e. Certains fichiers associ\u00e9s ont peut-\u00eatre \u00e9t\u00e9 d\u00e9j\u00e0 sauvegard\u00e9s.\n\nMotif
-18={0} a \u00e9t\u00e9 verrouill\u00e9. V\u00e9rifiez que l''op\u00e9ration n''est pas en cours d''ex\u00e9cution.
-19=ExtendedRoot est NULL. V\u00e9rifiez que l'indicateur isExtended() renvoie la valeur true.
-20=Propri\u00e9t\u00e9 introuvable :
-21=Mod\u00e8le imbriqu\u00e9 introuvable :
-22=Impossible de modifier l'ID une fois qu'il a \u00e9t\u00e9 d\u00e9fini.
-23=L'ID ne pas \u00eatre NULL
-24=ERREUR :
-25=Echec de l''op\u00e9ration \u00e9tendue : {0}
-26=Travail termin\u00e9
-27=Exception lors de l'ex\u00e9cution du travail.
-28=Le groupe ne peut pas \u00eatre r\u00e9solu :
-29=Classe introuvable pour l''attribut {0} : {1}, D\u00e9claration de l''extension du plug-in : {2}
-30=Le groupe de fonctions {0} ne contient pas de liaisons de mod\u00e8le
-31=Le projet {0} est ferm\u00e9.
-32=Un projet existe d\u00e9j\u00e0 dans le syst\u00e8me de fichiers \u00e0 l''emplacement : {0}. Utilisez l''option d''importation des projets existants dans l''espace de travail pour cr\u00e9er un projet \u00e0 cet emplacement ou supprimez le contenu de {0} du syst\u00e8me de fichiers.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_it.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_it.properties
deleted file mode 100644
index ddffb67..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_it.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=Un progetto con questo nome e questo percorso esiste gi\u00e0.
-2=Il progetto EAR specificato "{0}" non \u00e8 un progetto EAR.
-3=Il progetto EAR "{0}" dispone di una versione J2EE di {1} non compatibile con la versione del modulo specificata.
-4=Il nome del progetto EAR, "{0}", non pu\u00f2 essere uguale al nome del progetto.
-5=\u00c8 necessario immettere il nome file {0}.
-6={0} non esiste.
-7=Si \u00e8 verificato un errore interno. Per i dettagli, fare riferimento ai file di log.
-8=Il nome del progetto non \u00e8 valido.
-9=L''archivio di destinazione deve terminare con {0}.
-10=L'archivio di destinazione non \u00e8 valido.
-11=Il percorso di destinazione \u00e8 di sola lettura.
-12=La risorsa {0} esiste gi\u00e0. Per sovrascriverla, selezionare l''opzione "Sovrascrivi file esistente".
-13=Il progetto {0} non esiste.
-14=Il progetto del connettore non \u00e8 supportato per la preferenza J2EE selezionata. Verificare la preferenza J2EE globale.
-15=Immettere un nome per il progetto.
-16=Problemi di salvataggio
-17=Impossibile completare il salvataggio. Alcuni file correlati potrebbero gi\u00e0 essere stati salvati.\n\nMotivo
-18={0} \u00e8 stato bloccato. Assicurarsi che l''operazione non sia attualmente in esecuzione.
-19=extendedRoot \u00e8 null. Verificare che isExtended() restituisca true.
-20=Propriet\u00e0 non individuata:
-21=Modello nidificato non individuato:
-22=Impossibile modificare l'id una volta impostato.
-23=L'id non pu\u00f2 essere null.
-24=ERRORE:
-25=Errore di operazione estesa: {0}
-26=Lavoro completato correttamente
-27=Si \u00e8 verificata un'eccezione durante l'esecuzione del lavoro.
-28=Impossibile risolvere il gruppo:
-29=Classe non trovata per l''attributo {0} : {1}, Dichiarazione estensione plugin: {2}
-30=Il gruppo di funzioni {0} non contiene binding di modello
-31=Il progetto {0} \u00e8 chiuso.
-32=Un progetto esiste gi\u00e0 nel file system in: {0}. Utilizzare "Importazione progetti esistenti nello spazio di lavoro" per creare un progetto in tale ubicazione oppure eliminare il contenuto di {0} dal file system.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_ja.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_ja.properties
deleted file mode 100644
index 637760e..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_ja.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=\u3053\u306e\u540d\u524d\u304a\u3088\u3073\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
-2=\u6307\u5b9a\u3057\u305f EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306f EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-3=EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306f\u3001\u6307\u5b9a\u3057\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3\u3068\u306e\u4e92\u63db\u6027\u304c\u306a\u3044 J2EE \u306e\u30d0\u30fc\u30b8\u30e7\u30f3 {1} \u3067\u3059\u3002
-4=EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d "{0}" \u3092\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d\u3068\u540c\u3058\u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
-5={0} \u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5165\u529b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-6={0} \u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
-7=\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 \u8a73\u3057\u304f\u306f\u3001\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-8=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d\u304c\u7121\u52b9\u3067\u3059\u3002
-9=\u5b9b\u5148\u30a2\u30fc\u30ab\u30a4\u30d6\u306f {0} \u3067\u7d42\u308f\u3063\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-10=\u5b9b\u5148\u30a2\u30fc\u30ab\u30a4\u30d6\u304c\u7121\u52b9\u3067\u3059\u3002
-11=\u5b9b\u5148\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u306f\u8aad\u307f\u53d6\u308a\u5c02\u7528\u3067\u3059\u3002
-12=\u30ea\u30bd\u30fc\u30b9 {0} \u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002 \u4e0a\u66f8\u304d\u3057\u305f\u3044\u5834\u5408\u3001\u300c\u65e2\u5b58\u30d5\u30a1\u30a4\u30eb\u306e\u4e0a\u66f8\u304d\u300d\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-13=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
-14=\u9078\u629e\u3057\u305f J2EE \u8a2d\u5b9a\u3067\u306f\u3001\u30b3\u30cd\u30af\u30bf\u30fc\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 \u30b0\u30ed\u30fc\u30d0\u30eb J2EE \u8a2d\u5b9a\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-15=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-16=\u4fdd\u7ba1\u306e\u554f\u984c
-17=\u4fdd\u7ba1\u3092\u5b8c\u4e86\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e00\u90e8\u306e\u95a2\u9023\u30d5\u30a1\u30a4\u30eb\u306f\u3059\u3067\u306b\u4fdd\u7ba1\u3055\u308c\u3066\u3044\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\n\n\u7406\u7531
-18={0} \u306f\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u307e\u3059\u3002 \u64cd\u4f5c\u304c\u73fe\u5728\u5b9f\u884c\u4e2d\u3067\u306a\u3044\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-19=extendedRoot \u304c NULL \u3067\u3059\u3002 isExtended() \u304c true \u3092\u623b\u3059\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-20=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093:
-21=\u30cd\u30b9\u30c8\u3055\u308c\u305f\u30e2\u30c7\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093:
-22=\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b ID \u3092\u5909\u66f4\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
-23=ID \u3092 NULL \u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
-24=\u30a8\u30e9\u30fc:
-25=\u62e1\u5f35\u6f14\u7b97\u5931\u6557: {0}
-26=\u30b8\u30e7\u30d6\u304c\u6b63\u5e38\u306b\u5b8c\u4e86\u3057\u307e\u3057\u305f
-27=\u30b8\u30e7\u30d6\u306e\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-28=\u30b0\u30eb\u30fc\u30d7\u3092\u89e3\u6c7a\u3067\u304d\u307e\u305b\u3093:
-29=\u5c5e\u6027 {0} \u7528\u306e\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {1}\u3002\u5ba3\u8a00\u3055\u308c\u3066\u3044\u308b\u30d7\u30e9\u30b0\u30a4\u30f3\u62e1\u5f35\u6a5f\u80fd: {2}
-30=\u95a2\u6570\u30b0\u30eb\u30fc\u30d7 {0} \u306b\u306f\u30d1\u30bf\u30fc\u30f3\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u304c\u3042\u308a\u307e\u305b\u3093
-31=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u304c\u30af\u30ed\u30fc\u30ba\u3055\u308c\u3066\u3044\u307e\u3059\u3002
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_ko.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_ko.properties
deleted file mode 100644
index a5c40ab..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_ko.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=\ud574\ub2f9 \uc774\ub984\uacfc \uc704\uce58\ub97c \uac00\uc9c0\ub294 \ud504\ub85c\uc81d\ud2b8\uac00 \uc774\ubbf8 \uc788\uc2b5\ub2c8\ub2e4.
-2=\uc9c0\uc815\ub41c EAR \ud504\ub85c\uc81d\ud2b8 "{0}"\uc740(\ub294) EAR \ud504\ub85c\uc81d\ud2b8\uac00 \uc544\ub2d9\ub2c8\ub2e4.
-3=EAR \ud504\ub85c\uc81d\ud2b8 "{0}"\uc740(\ub294) \uc9c0\uc815\ub41c \ubaa8\ub4c8 \ubc84\uc804\uacfc \ud638\ud658 \uac00\ub2a5\ud558\uc9c0 \uc54a\uc740 {1}\uc758 J2EEVersion\uc744 \uac16\uc2b5\ub2c8\ub2e4.
-4=EAR \ud504\ub85c\uc81d\ud2b8 \uc774\ub984 "{0}"\uc740(\ub294) \ud504\ub85c\uc81d\ud2b8 \uc774\ub984\uacfc \ub3d9\uc77c\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-5={0} \ud30c\uc77c \uc774\ub984\uc744 \uc785\ub825\ud574\uc57c \ud569\ub2c8\ub2e4.
-6={0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-7=\ub0b4\ubd80 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uc790\uc138\ud55c \ub0b4\uc6a9\uc740 \ub85c\uadf8 \ud30c\uc77c\uc744 \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.
-8=\ud504\ub85c\uc81d\ud2b8 \uc774\ub984\uc774 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-9=\ub300\uc0c1 \uc544\uce74\uc774\ube0c\ub294 {0}(\uc73c)\ub85c \ub05d\ub098\uc57c \ud569\ub2c8\ub2e4.
-10=\ub300\uc0c1 \uc544\uce74\uc774\ube0c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-11=\ub300\uc0c1 \uc704\uce58\ub294 \uc77d\uae30 \uc804\uc6a9\uc785\ub2c8\ub2e4.
-12=\uc790\uc6d0 {0}\uc774(\uac00) \uc774\ubbf8 \uc788\uc2b5\ub2c8\ub2e4. \uacb9\uccd0\uc4f0\ub824\ub294 \uacbd\uc6b0 "\uae30\uc874 \ud30c\uc77c \uacb9\uccd0\uc4f0\uae30" \uc635\uc158\uc744 \uc120\ud0dd\ud558\uc2ed\uc2dc\uc624.
-13={0} \ud504\ub85c\uc81d\ud2b8\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-14=\uc120\ud0dd\ub41c J2EE \ud658\uacbd \uc124\uc815\uc758 \ucee4\ub125\ud130 \ud504\ub85c\uc81d\ud2b8\ub294 \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uae00\ub85c\ubc8c J2EE \ud658\uacbd \uc124\uc815\uc744 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-15=\ud504\ub85c\uc81d\ud2b8 \uc774\ub984\uc744 \uc785\ub825\ud558\uc2ed\uc2dc\uc624.
-16=\ubb38\uc81c\uc810 \uc800\uc7a5
-17=\uc800\uc7a5\uc744 \uc644\ub8cc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc77c\ubd80 \uad00\ub828\ub41c \ud30c\uc77c\uc740 \uc774\ubbf8 \uc800\uc7a5\ub418\uc5c8\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4.\n\n\uc774\uc720
-18={0}\uc774(\uac00) \uc7a0\uacbc\uc2b5\ub2c8\ub2e4. \uc870\uc791\uc744 \ud604\uc7ac \uc2e4\ud589 \uc911\uc774\uc9c0 \uc54a\uc740\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-19=extendedRoot\uac00 \ub110(null)\uc785\ub2c8\ub2e4. isExtended()\uac00 true\ub97c \ub9ac\ud134\ud558\ub294\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-20=\ud2b9\uc131\uc744 \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4:
-21=\uc911\ucca9\ub41c \ubaa8\ub378\uc744 \ucc3e\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4:
-22=id\uac00 \uc124\uc815\ub41c \uacbd\uc6b0 \uc218\uc815\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-23=id\ub294 \ub110(null)\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-24=\uc624\ub958:
-25=\ud655\uc7a5 \uc870\uc791 \uc2e4\ud328: {0}
-26=\uc791\uc5c5\uc744 \uc644\ub8cc\ud588\uc2b5\ub2c8\ub2e4.
-27=\uc791\uc5c5 \uc2e4\ud589 \uc911 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
-28=\uadf8\ub8f9\uc744 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4:
-29={0} \uc18d\uc131\uc758 \ud074\ub798\uc2a4\ub97c \ucc3e\uc9c0 \ubabb\ud568 : {1}, \ud50c\ub7ec\uadf8\uc778 \ud655\uc7a5 \uc120\uc5b8: {2}
-30=\uae30\ub2a5 \uadf8\ub8f9 {0}\uc5d0\ub294 \ud328\ud134 \ubc14\uc778\ub529\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.
-31={0} \ud504\ub85c\uc81d\ud2b8\uac00 \ucc98\ub9ac\uc644\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-32=\ud504\ub85c\uc81d\ud2b8\uac00 \uc774\ubbf8 \ud30c\uc77c \uc2dc\uc2a4\ud15c\uc758 \ub2e4\uc74c \uc704\uce58\uc5d0 \uc788\uc2b5\ub2c8\ub2e4: {0}. "\uae30\uc874 \ud504\ub85c\uc81d\ud2b8\ub97c \uc791\uc5c5\uacf5\uac04\uc73c\ub85c \uac00\uc838\uc624\uae30"\ub97c \uc120\ud0dd\ud558\uc5ec \uc774 \uc704\uce58\uc5d0 \uc0c8 \ud504\ub85c\uc81d\ud2b8\ub97c \uc791\uc131\ud558\uac70\ub098, \ud30c\uc77c \uc2dc\uc2a4\ud15c\uc5d0\uc11c {0}\uc758 \ucee8\ud150\uce20\ub97c \uc0ad\uc81c\ud558\uc2ed\uc2dc\uc624.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_pt_BR.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_pt_BR.properties
deleted file mode 100644
index 752f2a1..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_pt_BR.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=Um projeto j\u00e1 existe com este nome e local.
-2=O projeto EAR especificado "{0}" n\u00e3o \u00e9 um projeto EAR.
-3=O projeto EAR "{0}" possui uma J2EEVersion de {1} que n\u00e3o \u00e9 compat\u00edvel com a vers\u00e3o do m\u00f3dulo especificado.
-4=O nome do projeto EAR, "{0}", n\u00e3o pode ser o mesmo que o nome do projeto.
-5=O nome do arquivo {0} deve ser digitado.
-6=O arquivo {0} n\u00e3o existe.
-7=Ocorreu um erro interno. Visualize os arquivos de log para obter detalhes.
-8=O nome do projeto \u00e9 inv\u00e1lido.
-9=O arquivo de destino deve finalizar com {0}.
-10=O arquivo de destino \u00e9 inv\u00e1lido.
-11=O local de destino \u00e9 somente para leitura.
-12=O recurso {0} j\u00e1 existe. Se voc\u00ea desejar sobrescrever, selecione a op\u00e7\u00e3o "Sobrescrever Arquivo Existente".
-13=O projeto {0} n\u00e3o existe.
-14=O projeto do conector n\u00e3o \u00e9 suportado para prefer\u00eancia J2EE selecionada. Verifique a prefer\u00eancia global J2EE.
-15=Digite um nome de projeto.
-16=Salvar problemas
-17=Salvamento n\u00e3o p\u00f4de ser conclu\u00eddo. Alguns arquivos relacionados podem j\u00e1 ter sido salvos.\n\n Motivo
-18={0} foi bloqueado. Verifique se a opera\u00e7\u00e3o n\u00e3o est\u00e1 executando no momento.
-19=O extendedRoot \u00e9 nulo. Verifique se o isExtended() retorna verdadeiro.
-20=Propriedade n\u00e3o localizada:
-21=Modelo aninhado n\u00e3o localizado:
-22=N\u00e3o \u00e9 poss\u00edvel modificar o id uma vez que j\u00e1 foi configurado.
-23=O id n\u00e3o pode ser nulo.
-24=ERRO:
-25=Falha na opera\u00e7\u00e3o estendida: {0}
-26=O Trabalho foi conclu\u00eddo com sucesso
-27=Ocorreu uma exce\u00e7\u00e3o ao executar o trabalho.
-28=O grupo n\u00e3o pode ser resolvido:
-29=A classe n\u00e3o foi localizada para o atributo {0} : {1}, Declarando extens\u00e3o de plug-in: {2}
-30=O grupo de fun\u00e7\u00e3o {0} n\u00e3o cont\u00e9m nenhuma liga\u00e7\u00e3o padr\u00e3o
-31=O projeto {0} est\u00e1 fechado.
-32=Um projeto j\u00e1 existe no sistema de arquivos neste local: {0}. Use "Importar Projetos Existentes no Espa\u00e7o de Trabalho" para criar um projeto neste local ou exclua o conte\u00fado de {0} do sistema de arquivos.
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_zh_CN.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_zh_CN.properties
deleted file mode 100644
index f4bf118..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_zh_CN.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=\u5177\u6709\u6b64\u540d\u79f0\u548c\u4f4d\u7f6e\u7684\u9879\u76ee\u5df2\u5b58\u5728\u3002
-2=\u6307\u5b9a\u7684 EAR \u9879\u76ee\u201c{0}\u201d\u4e0d\u662f EAR \u9879\u76ee\u3002
-3=EAR \u9879\u76ee\u201c{0}\u201d\u5177\u6709 {1}\uff08\u5b83\u4e0e\u6307\u5b9a\u7684\u6a21\u5757\u7248\u672c\u4e0d\u517c\u5bb9\uff09\u7684 J2EE \u7248\u672c\u3002
-4=EAR \u9879\u76ee\u540d\u79f0\u201c{0}\u201d\u4e0d\u80fd\u4e0e\u8be5\u9879\u76ee\u540d\u79f0\u76f8\u540c\u3002
-5=\u5fc5\u987b\u8f93\u5165 {0} \u6587\u4ef6\u540d\u3002
-6={0} \u4e0d\u5b58\u5728\u3002
-7=\u53d1\u751f\u4e86\u5185\u90e8\u9519\u8bef\u3002\u8bf7\u67e5\u770b\u65e5\u5fd7\u6587\u4ef6\u4ee5\u83b7\u53d6\u8be6\u7ec6\u4fe1\u606f\u3002
-8=\u9879\u76ee\u540d\u79f0\u65e0\u6548\u3002
-9=\u76ee\u6807\u5f52\u6863\u5e94\u8be5\u4ee5 {0} \u7ed3\u5c3e\u3002
-10=\u76ee\u6807\u5f52\u6863\u65e0\u6548\u3002
-11=\u76ee\u6807\u4f4d\u7f6e\u662f\u53ea\u8bfb\u7684\u3002
-12=\u8d44\u6e90 {0} \u5df2\u5b58\u5728\u3002\u5982\u679c\u60a8\u60f3\u8986\u76d6\uff0c\u8bf7\u9009\u62e9\u201c\u8986\u76d6\u73b0\u6709\u6587\u4ef6\u201d\u9009\u9879\u3002
-13=\u9879\u76ee {0} \u4e0d\u5b58\u5728\u3002
-14=\u8fde\u63a5\u5668\u9879\u76ee\u5bf9\u4e8e\u9009\u62e9\u7684 J2EE \u9996\u9009\u9879\u4e0d\u53d7\u652f\u6301\u3002\u8bf7\u68c0\u67e5\u5168\u5c40 J2EE \u9996\u9009\u9879\u3002
-15=\u8f93\u5165\u9879\u76ee\u540d\u79f0\u3002
-16=\u4fdd\u5b58\u95ee\u9898
-17=\u4fdd\u5b58\u4e0d\u80fd\u5b8c\u6210\u3002\u53ef\u80fd\u5df2\u7ecf\u4fdd\u5b58\u4e86\u67d0\u4e9b\u76f8\u5173\u6587\u4ef6\u3002\n\n\u539f\u56e0
-18={0} \u5df2\u9501\u5b9a\u3002\u8bf7\u786e\u4fdd\u5f53\u524d\u672a\u6267\u884c\u8be5\u64cd\u4f5c\u3002
-19=extendedRoot \u662f\u7a7a\u7684\u3002\u8bf7\u786e\u4fdd isExtended() \u8fd4\u56de true\u3002
-20=\u5c5e\u6027\u672a\u627e\u5230\uff1a
-21=\u5d4c\u5957\u7684\u6a21\u578b\u672a\u627e\u5230\uff1a
-22=\u4e00\u65e6\u8bbe\u7f6e\u4e86\u6807\u8bc6\u5c31\u4e0d\u80fd\u518d\u4fee\u6539\u5b83\u3002
-23=\u8be5\u6807\u8bc6\u4e0d\u80fd\u4e3a\u7a7a\u3002
-24=\u9519\u8bef\uff1a
-25=\u6269\u5c55\u7684\u64cd\u4f5c\u5931\u8d25\uff1a{0}
-26=\u4f5c\u4e1a\u6210\u529f\u5b8c\u6210
-27=\u8fd0\u884c\u4f5c\u4e1a\u65f6\u53d1\u751f\u5f02\u5e38\u3002
-28=\u4e0d\u80fd\u89e3\u6790\u7ec4\uff1a
-29=\u672a\u627e\u5230\u5c5e\u6027 {0} \u7684\u7c7b\uff1a{1}\uff0c\u58f0\u660e\u63d2\u4ef6\u6269\u5c55\uff1a{2}
-30=\u51fd\u6570\u7ec4 {0} \u672a\u5305\u542b\u6a21\u5f0f\u7ed1\u5b9a
-31=\u5173\u95ed\u4e86\u9879\u76ee {0}\u3002
-32=\u6587\u4ef6\u7cfb\u7edf\u4e0a\u5df2\u7ecf\u6709\u4e00\u4e2a\u9879\u76ee\u5b58\u5728\u4e8e\u6b64\u4f4d\u7f6e\uff1a{0}\u3002\u4f7f\u7528\u201c\u5bfc\u5165\u73b0\u6709\u9879\u76ee\u5230\u5de5\u4f5c\u7a7a\u95f4\u4e2d\u201d\u6765\u5728\u6b64\u4f4d\u7f6e\u521b\u5efa\u9879\u76ee\uff0c\u6216\u8005\u4ece\u6587\u4ef6\u7cfb\u7edf\u4e2d\u5220\u9664 {0} \u7684\u5185\u5bb9\u3002
diff --git a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_zh_TW.properties b/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_zh_TW.properties
deleted file mode 100644
index fcde968..0000000
--- a/plugins/org.eclipse.wst.common.frameworks/src/wtp_common_zh_TW.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=\u5df2\u6709\u9019\u500b\u540d\u7a31\u548c\u4f4d\u7f6e\u7684\u5c08\u6848\u5b58\u5728\u3002
-2=\u6307\u5b9a\u7684 EAR \u5c08\u6848 "{0}" \u4e0d\u662f EAR \u5c08\u6848\u3002
-3=EAR \u5c08\u6848 "{0}" \u7684 J2EE \u7248\u672c\u662f {1}\uff0c\u8207\u6307\u5b9a\u7684\u6a21\u7d44\u7248\u672c\u4e0d\u76f8\u5bb9\u3002
-4=EAR \u5c08\u6848\u540d\u7a31 "{0}" \u7121\u6cd5\u8207\u9019\u500b\u5c08\u6848\u540d\u7a31\u76f8\u540c\u3002
-5=\u5fc5\u9808\u8f38\u5165 {0} \u6a94\u540d\u7a31\u3002
-6={0} \u4e0d\u5b58\u5728\u3002
-7=\u767c\u751f\u5167\u90e8\u932f\u8aa4\u3002 \u8acb\u53c3\u95b1\u65e5\u8a8c\u6a94\uff0c\u4ee5\u53d6\u5f97\u8a73\u7d30\u8cc7\u6599\u3002
-8=\u5c08\u6848\u540d\u7a31\u7121\u6548\u3002
-9=\u76ee\u7684\u5730\u4fdd\u5b58\u6a94\u7684\u7d50\u5c3e\u61c9\u8a72\u662f {0}\u3002
-10=\u76ee\u7684\u5730\u4fdd\u5b58\u6a94\u7121\u6548\u3002
-11=\u76ee\u7684\u5730\u4f4d\u7f6e\u552f\u8b80\u3002
-12=\u8cc7\u6e90 {0} \u5df2\u5b58\u5728\u3002\u5982\u679c\u8981\u6539\u5beb\uff0c\u8acb\u9078\u53d6\u300c\u6539\u5beb\u73fe\u6709\u7684\u6a94\u6848\u300d\u9078\u9805\u3002
-13={0} \u5c08\u6848\u4e0d\u5b58\u5728\u3002
-14=\u4e0d\u652f\u63f4\u9023\u63a5\u5668\u5c08\u6848\u4f7f\u7528\u9078\u53d6\u7684 J2EE \u559c\u597d\u8a2d\u5b9a\u3002\u8acb\u6aa2\u67e5\u5ee3\u57df J2EE \u559c\u597d\u8a2d\u5b9a\u3002
-15=\u8acb\u8f38\u5165\u5c08\u6848\u540d\u7a31\u3002
-16=\u5132\u5b58\u554f\u984c
-17=\u5132\u5b58\u7121\u6cd5\u5b8c\u6210\u3002\u53ef\u80fd\u5df2\u5132\u5b58\u67d0\u4e9b\u76f8\u95dc\u7684\u6a94\u6848\u3002\n\n\u539f\u56e0
-18={0} \u5df2\u9396\u5b9a\u3002\u8acb\u78ba\u5b9a\u4f5c\u696d\u76ee\u524d\u4e0d\u5728\u57f7\u884c\u4e2d\u3002
-19=extendedRoot \u662f\u7a7a\u503c\u3002\u8acb\u78ba\u5b9a isExtended() \u50b3\u56de true\u3002
-20=\u627e\u4e0d\u5230\u5167\u5bb9\uff1a
-21=\u627e\u4e0d\u5230\u5de2\u72c0\u6a21\u578b\uff1a
-22=\u8a2d\u5b9a\u597d ID \u4e4b\u5f8c\uff0c\u5c31\u7121\u6cd5\u4fee\u6539 ID\u3002
-23=ID \u4e0d\u80fd\u662f\u7a7a\u503c\u3002
-24=\u932f\u8aa4\uff1a
-25=\u5ef6\u4f38\u7684\u4f5c\u696d\u5931\u6557\uff1a{0}
-26=\u5de5\u4f5c\u9806\u5229\u5b8c\u6210
-27=\u57f7\u884c\u5de5\u4f5c\u6642\uff0c\u767c\u751f\u7570\u5e38\u72c0\u6cc1\u3002
-28=\u7121\u6cd5\u89e3\u6790\u7fa4\u7d44\uff1a
-29=\u627e\u4e0d\u5230 {0} \u5c6c\u6027\u7684\u985e\u5225\uff1a{1}\uff0c\u5ba3\u544a\u5916\u639b\u7a0b\u5f0f\u5ef6\u4f38\uff1a{2}
-30=\u51fd\u6578\u7fa4\u7d44 {0} \u6c92\u6709\u5305\u542b\u4efb\u4f55\u578b\u6a23\u9023\u7d50
-31={0} \u5c08\u6848\u5df2\u95dc\u9589\u3002
-32=\u5c08\u6848\u5df2\u7d93\u5b58\u5728\u6a94\u6848\u7cfb\u7d71\u7684 {0} \u4f4d\u7f6e\u4e2d\u3002\u5229\u7528\u300c\u5c07\u73fe\u6709\u7684\u5c08\u6848\u653e\u5165\u5de5\u4f5c\u5340\u300d\u5728\u9019\u500b\u4f4d\u7f6e\u5efa\u7acb\u5c08\u6848\uff0c\u6216\u5f9e\u6a94\u6848\u7cfb\u7d71\u4e2d\u522a\u9664 {0} \u7684\u5167\u5bb9\u3002
diff --git a/plugins/org.eclipse.wst.common.ui/.classpath b/plugins/org.eclipse.wst.common.ui/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.wst.common.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.ui/.cvsignore b/plugins/org.eclipse.wst.common.ui/.cvsignore
deleted file mode 100644
index db7cdf2..0000000
--- a/plugins/org.eclipse.wst.common.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-ui.jar
-build.xml
-temp.folder
-org.eclipse.wst.common.ui_1.0.0.jar
diff --git a/plugins/org.eclipse.wst.common.ui/.project b/plugins/org.eclipse.wst.common.ui/.project
deleted file mode 100644
index 8f557ef..0000000
--- a/plugins/org.eclipse.wst.common.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.ui/README.txt b/plugins/org.eclipse.wst.common.ui/README.txt
deleted file mode 100644
index 4fc93df..0000000
--- a/plugins/org.eclipse.wst.common.ui/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-UI Utility classes for actions, drag'n'drop and wizards.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/build.properties b/plugins/org.eclipse.wst.common.ui/build.properties
deleted file mode 100644
index 89adbc5..0000000
--- a/plugins/org.eclipse.wst.common.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = plugin.properties,\
- plugin.xml,\
- ui.jar
-jars.compile.order = ui.jar
-source.ui.jar = src/
-output.ui.jar = bin/
diff --git a/plugins/org.eclipse.wst.common.ui/plugin.properties b/plugins/org.eclipse.wst.common.ui/plugin.properties
deleted file mode 100644
index eb3402d..0000000
--- a/plugins/org.eclipse.wst.common.ui/plugin.properties
+++ /dev/null
@@ -1,132 +0,0 @@
-! SelectSingleFilePage and SelectMultiFilePage
-_UI_LABEL_SOURCE_FILES = Workbench Files
-_UI_LABEL_SELECTED_FILES = Selected Files
-
-_UI_IMPORT_BUTTON = Import Files...
-_UI_IMPORT_BUTTON_TOOL_TIP = Import files from file system
-
-
-! SelectMultiFilePage
-! NOTE TO TRANSLATOR: the following three lines refers to _UI_LABEL_SELECTED_FILES label above
-_UI_ADD_BUTTON_TOOL_TIP = Add files to Selected Files list.
-_UI_REMOVE_BUTTON_TOOL_TIP = Remove files from Selected Files list.
-_UI_REMOVE_ALL_BUTTON_TOOL_TIP = Remove all files from Selected Files list.
-
-! NOTE TO TRANSLATOR: No translation needed of following three lines
-_UI_ADD_BUTTON = >
-_UI_REMOVE_BUTTON = <
-_UI_REMOVE_ALL_BUTTON = <<
-
-! SelectJavaProjectView
-_UI_LABEL_CHOOSE_FOLDER = Select a project or folder:
-
-! SelectJavaProjectDialog
-_UI_LABEL_FOLDER_SELECTION = Container Selection
-
-! TextViewerOperationAction
-_UI_MENU_COPY = &Copy
-_UI_MENU_CUT = Cu&t
-_UI_MENU_DELETE = Delete
-_UI_MENU_PASTE = &Paste
-_UI_MENU_PREFIX = Prefix
-_UI_MENU_REDO = Redo
-_UI_MENU_SELECT_ALL = Select All
-_UI_MENU_SHIFT_LEFT = Shift Left
-_UI_MENU_SHIFT_RIGHT = Shift Right
-_UI_MENU_STRIP_PREFIX = Strip Prefix
-_UI_MENU_UNDO = Undo
-
-! SourceViewerGotoLineAction
-_UI_MENU_GOTO_LINE = Go To Line...
-_UI_GOTO_LINE_DIALOG_TITLE = Go To Line
-_UI_GOTO_LINE_DIALOG_TEXT = Enter Line Number
-
-_UI_FILE_CHANGED_TITLE = File Changed
-_UI_FILE_DELETED_SAVE_CHANGES = The file has been deleted from the file system. Do you want to save your changes or close the editor without saving?
-_UI_FILE_DELETED_EDITOR_CLOSED = The file has been deleted from the file system. This editor will be closed.
-_UI_FILE_CHANGED_LOAD_CHANGES = The file has been changed on the file system. Do you want to load the changes?
-_UI_SAVE_BUTTON = Save
-_UI_CLOSE_BUTTON = Close
-
-
-! XSL Prefererence
-_UI_XSLT_SELECT = Select which element to use for your stylesheet
-_UI_XSLT_STYLESHEET = &Use <xsl:stylesheet>
-_UI_XSLT_TRANSFORM = U&se <xsl:transform>
-
-! XSL Debug Prefererence
-_UI_XSL_DEBUG_SELECT_LAUNCHER = Set the default XSL launcher for the XSL Debugging and Transformation tool
-_UI_XSL_DEBUG_LOCAL = &XSL application
-_UI_XSL_DEBUG_REMOTE = XS&L remote application
-_UI_XSL_TILE_EDITOR = &Show all debugging files in a tile editor
-_UI_XSL_DEBUG_AND_TRANSFORM = &Run transformation and open a debugging session
-_UI_XSL_CONTEXT_URI = Context Path
-_UI_XSL_CONTEXT = Specify a &context path for resolving URIs in xsl:import, xsl:include or document()
-
-
-_UI_OVERRIDE_FILE = Overwrite existing files
-_UI_JAVA_EXIST_FILE1 = The following Java classes already exist.
-_UI_JAVA_EXIST_FILE2 = Do you want to overwrite the existing file?
-
-! some options strings common to several plugins
-_UI_ERROR_CREATING_FILE_TITLE = Error Creating File
-_UI_ERROR_CREATING_FILE_SHORT_DESC = Error creating file "{0}"
-_UI_ERROR_CREATING_FILE_LONG_DESC = An error occured while attempting to create the file "{0}".
-_UI_PARENT_FOLDER_IS_READ_ONLY = The parent directory "{0}" is read only.
-_UI_UNKNOWN_ERROR_WITH_HINT = Unknown error. Ensure that the parent directory "{0}" is writeable.
-_UI_UNKNOWN_ERROR = Unknown error. Ensure that the parent directory "{0}" is writeable.
-
-! usage - this label is followed by two radio button options for the file location
-_UI_LABEL_INCLUDE_URL_FILE = Select file location
-_UI_RADIO_FILE = Workbench projects
-_UI_RADIO_URL = HTTP
-
-!======================================================================================
-!
-! Here is the list of Error string that have message IDs - make sure they are unique
-! Range for b2bgui messageIDs: IWAX1201 - IWAX1400
-!
-!======================================================================================
-
-_ERROR_THE_CONTAINER_NAME = The specified container must exist in the workspace and its path must start at the workspace root.
-
-_ERROR_LOCAL_LOCATION = The local location of this container cannot be resolved.
-_ERROR_NOT_JAVA_PROJECT = The specified project is not a Java project.
-
-!NOTE TO TRANSLATOR: this error message text is followed by a message from another plugin
-_ERROR_INVALID_JAVA_PACKAGE = IWAX1201E Invalid package name error:
-
-!NOTE TO TRANSLATOR: (_ERROR_BAD_FILENAME_EXTENSION + string + _UI_LABEL_OR + string) or (_ERROR_BAD_FILENAME_EXTENSION)
-_ERROR_BAD_FILENAME_EXTENSION = The file name must end with
-_ERROR_FILE_ALREADY_EXISTS = The same name already exists.
-
-_ERROR_CONTAINER_NOT_JAVA_BUILDPATH = The container is not a Java source folder for this project
-_ERROR_USE_PROJECT_JAVA_SOURCE_FOLDER = The project is not on the build path. Select a Java source folder for the project.
-
-_UI_ERROR = Error
-
-!NOTE TO TRANSLATOR: this warning message text is followed by a message from another plugin
-_WARN_INVALID_JAVA_PACKAGE = Invalid package name warning:
-
-_ERROR_ROOT_ELEMENT = The XML schema does not contain any global elements that can be used as a root element.
-_ERROR_SAVING_FILE = Error saving file "{0}"
-
-! File Validator
-_UI_ERROR_VALIDATE_FAIL_TITLE = Failed to check out necessary files
-_UI_ERROR_VALIDATE_FAIL_MESSAGE = Generation failed. Necessary files could not be checked out.
-
-! PropertyDirtyChangeListener and PropertyResourceChangeListener
-_UI_ERROR_VALIDATE_EDIT_FAIL_ONE_FILE = Error
-
-ExampleProjectCreationWizard.title=New Example Project
-ExampleProjectCreationWizard.op_error.title=Project Creation Failed
-ExampleProjectCreationWizard.op_error.message=Project could not be created.
-
-ExampleProjectCreationWizard.overwritequery.title=Overwrite
-ExampleProjectCreationWizard.overwritequery.message=Do you want to overwrite {0}?
-
-
-ExampleProjectCreationOperation.op_desc=Creating example projects...
-ExampleProjectCreationOperation.op_desc_proj=Configuring project...
-
-ExampleProjectCreationWizardPage.error.alreadyexists=Project already exists.
diff --git a/plugins/org.eclipse.wst.common.ui/plugin.xml b/plugins/org.eclipse.wst.common.ui/plugin.xml
deleted file mode 100644
index a132019..0000000
--- a/plugins/org.eclipse.wst.common.ui/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.ui"
- name="Eclipse Base UI extensions"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.common.ui.UIPlugin">
-
- <runtime>
- <library name="ui.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.views"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- </requires>
-
- <extension-point id="exampleProjectCreationWizard" name="Example Project Creation Wizard" schema="schema/exampleProjectCreationWizard.exsd"/>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd b/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
deleted file mode 100644
index 2786bcb..0000000
--- a/plugins/org.eclipse.wst.common.ui/schema/exampleProjectCreationWizard.exsd
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.examples.xml.org.eclipse.wst.examples">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.examples.xml.org.eclipse.wst.examples" id="ExampleProjectCreationWizard" name="Example Project Creation Wizard"/>
- </appInfo>
- <documentation>
- This extension point allows to extend New project withard with the
-page set up setup information for the created project as well as source files that will be imported on the project creation.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="wizard"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- Unique identifier for the extension
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- Optional name of the extension
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="wizard">
- <complexType>
- <sequence>
- <element ref="projectsetup" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- Id of the wizard that this extension is intended for.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="banner" type="string">
- <annotation>
- <documentation>
- Plugin relative path to the image that will be displayed as a banner on the wizard.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="projectsetup">
- <annotation>
- <documentation>
- Element that describes additional project setup.
-There will be as many pages created for the wizard as there are projectsetup elements.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="import" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="nature" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="references" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="pagetitle" type="string">
- <annotation>
- <documentation>
- Title of the wizard's page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- Initial project name that will be provided on the wizard page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string">
- <annotation>
- <documentation>
- Label for the project name field on the wizard page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="pagedescription" type="string">
- <annotation>
- <documentation>
- Description of the wizard page
- </documentation>
- </annotation>
- </attribute>
- <attribute name="open" type="string">
- <annotation>
- <documentation>
- Plugin relative path of the file that will be opened when wizard finished.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="import">
- <annotation>
- <documentation>
- Element that describes what to import into the project when it's created.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="dest" type="string">
- <annotation>
- <documentation>
- Project relative path of the folder where project files will be imported to, if not specified, it's the projest itself.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="src" type="string">
- <annotation>
- <documentation>
- Plugin relative path of the import .zip file with the files to be imported into the project.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="nature">
- <annotation>
- <documentation>
- Element that specified Eclipse nature that is applicable to the project.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- The id of the nature that will be opened when project will be created.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="references">
- <annotation>
- <documentation>
- Element that specifies reference for the project that will be created.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- The id of the referenced project.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- November 2004
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension point="org.eclipse.wst.common.ui.exampleProjectCreationWizard"
- id="org.eclipse.wst.xml.ui.ExampleProjectCreationWizardExtension">
- <wizard
- id="org.eclipse.wst.xml.ui.ExampleProjectCreationWizard"
- banner="icons/newSampleProject_wizbanner.gif">
- <projectsetup
- pagetitle="%XMLExampleProjectCreationWizard.pagetitle"
- name="%XMLExampleProjectCreationWizard.projectname"
- label="%XMLExampleProjectCreationWizard.label"
- pagedescription="%XMLExampleProjectCreationWizard.pagedescription"
- open="readme.html">
- <import
- dest=""
- src="examples/EditingAndValidatingXML.zip">
- </import>
- </projectsetup>
- </wizard>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2001, 2004 IBM Corporation and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
- IBM Corporation - initial API and implementation
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/ImageFactory.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/ImageFactory.java
deleted file mode 100644
index 0aa8f5a..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/ImageFactory.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.internal.ide.misc.OverlayIcon;
-import org.eclipse.ui.internal.misc.OverlayComposite;
-
-public class ImageFactory
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static final int TOP_LEFT = 1;
- public static final int TOP_RIGHT = 2;
- public static final int BOTTOM_LEFT = 3;
- public static final int BOTTOM_RIGHT = 4;
-
- protected static final int[][] OVERLAY_COORDINATE = {{0,0},{0,2},{2,0},{2,2}};
-
- protected Hashtable compositeImageTable = new Hashtable();
-
- public ImageFactory()
- {
- }
-
- public Image createCompositeImage(Image a, Image b)
- {
- String key = a + "*" + b;
- Image result = (Image)compositeImageTable.get(key);
- if (result == null)
- {
- OverlayComposite composite = new OverlayComposite(a.getImageData());
- composite.addForegroundImage(b.getImageData());
- result = composite.createImage();
- compositeImageTable.put(key, result);
- }
- return result;
- }
-
- public Image createCompositeImage(Image base, Image overlay, int overlayPosition)
- {
- String key = base + "*" + overlay + "*" + overlayPosition;
- Image result = (Image)compositeImageTable.get(key);
- if (result == null)
- {
- ImageDescriptor overlays[][] = new ImageDescriptor[3][3];
- int[] coord = OVERLAY_COORDINATE[overlayPosition];
- overlays[coord[1]][coord[0]] = new ImageBasedImageDescriptor(overlay);
- OverlayIcon icon = new OverlayIcon(new ImageBasedImageDescriptor(base), overlays, new Point(16, 16));
- result = icon.createImage();
- compositeImageTable.put(key, result);
- }
- return result;
- }
-
-
- public static ImageDescriptor createImageDescriptorWrapper(Image image)
- {
- return new ImageBasedImageDescriptor(image);
- }
-
-
- protected static class ImageBasedImageDescriptor extends ImageDescriptor
- {
- protected Image image;
-
- public ImageBasedImageDescriptor(Image image)
- {
- this.image = image;
- }
-
- public ImageData getImageData()
- {
- return image.getImageData();
- }
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/OverlayIconManager.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/OverlayIconManager.java
deleted file mode 100644
index a7b7746..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/OverlayIconManager.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui;
-
-import org.eclipse.core.resources.*;
-//import org.eclipse.jface.resource.*;
-import org.eclipse.jface.viewers.*;
-//import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.Display;
-import java.util.*;
-
-/**
- * This class used to track the icon overlays that should be used to decorate the icons in a view.
- * Clients should implement the method 'locateObjectForOffset()' that will be used to associate a model object with each marker.
- * When markers are changed, a table of objects -> markers is maintained. When the time comes to display the object in a view
- * the client can call 'getOverlayImageForObject()' to determine the annotation image that should be used when displaying the object.
- */
-public abstract class OverlayIconManager
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- protected IResource resource;
- protected IWorkspace workspace;
- protected Hashtable hashtable = new Hashtable();
- protected ResourceChangeListener resourceChangeListener = new ResourceChangeListener();
- protected List viewerList = new Vector();
-
- // todo... get images for these other kinds of markers
- //
- protected static final Image taskOverlayImage = null; //B2BGUIPlugin.getInstance().getImage("icons/error-overlay.gif");
- protected static final Image bookmarkOverlayImage = null; //B2BGUIPlugin.getInstance().getImage("icons/error-overlay.gif");
- protected static final Image problemInfoOverlayImage = null; //B2BGUIPlugin.getInstance().getImage("icons/error-overlay.gif");
-// TODO protected static final Image problemWarningOverlayImage = B2BGUIPlugin.getInstance().getImage("icons/warning-overlay.gif");
- protected static final Image problemWarningOverlayImage = null;
-// TODO protected static final Image problemErrorOverlayImage = B2BGUIPlugin.getInstance().getImage("icons/error-overlay.gif");
- protected static final Image problemErrorOverlayImage = null;
-
- /**
- * Internal resource change listener.
- */
- class ResourceChangeListener implements IResourceChangeListener
- {
- protected boolean needsUpdate;
-
- public void resourceChanged(IResourceChangeEvent e)
- {
- //if (e.getResource() == resource)
- {
- if (!needsUpdate)
- {
- needsUpdate = true;
- Runnable delayedUpdate = new Runnable()
- {
- public void run()
- {
- doUpdate();
- }
- };
-
- // It seems like this current dislay is actually coming back null sometimes.
- // Without this test we get an occasional NPE logged (defect 187099).
- if (Display.getCurrent() != null)
- {
- Display.getCurrent().asyncExec(delayedUpdate);
- }
- }
- }
- }
-
- public void doUpdate()
- {
- needsUpdate = false;
- update();
- }
- };
-
-
- public OverlayIconManager()
- {
- }
-
-
- public void setResource(IResource newResource)
- {
- this.resource = newResource;
- setWorkspace(newResource != null ? newResource.getWorkspace() : null);
- }
-
-
- // I'm not sure why there can be more than 1 workspace.... do I misunderstand something?
- protected void setWorkspace(IWorkspace newWorkspace)
- {
- if (workspace != null && workspace != newWorkspace)
- {
- workspace.removeResourceChangeListener(resourceChangeListener);
- }
- if (newWorkspace != null)
- {
- newWorkspace.addResourceChangeListener(resourceChangeListener);
- }
- workspace = newWorkspace;
- }
-
-
- //
- public IResource getResource()
- {
- return resource;
- }
-
- public void addViewer(Viewer viewer)
- {
- viewerList.add(viewer);
- }
-
- public void removeViewer(Viewer viewer)
- {
- viewerList.remove(viewer);
- }
-
- protected void updateListeners()
- {
- for (Iterator i = viewerList.iterator(); i.hasNext(); )
- {
- Viewer viewer = (Viewer)i.next();
-
- // Make sure the viewer is not disposed before calling refresh on it
- if ( viewer.getControl() != null &&
- !viewer.getControl().isDisposed() )
- {
- viewer.refresh();
- }
- }
- }
-
- public void update()
- {
- // if resource is null, do nothing
- if (resource == null)
- return;
-
- try
- {
- hashtable = new Hashtable();
- IMarker[] markers = resource.findMarkers(IMarker.MARKER, true, IResource.DEPTH_ZERO);
- for (int i = 0 ; i < markers.length; i++)
- {
- IMarker marker = markers[i];
- Object object = locateObjectForMarker(marker);
- Object key = object != null ? getKeyForObject(object) : null;
- if (key != null)
- {
- hashtable.put(key, marker);
- }
- }
- }
- catch (Exception e)
- {
-// TODO B2BGUIPlugin.getPlugin().getMsgLogger().writeCurrentThread();
- }
- updateListeners();
- }
-
-
- protected abstract Object locateObjectForOffset(int offset);
-
- protected Object locateObjectForMarker(IMarker marker)
- {
- Object result = null;
- int offset = marker.getAttribute(IMarker.CHAR_START, -1);
- if (offset != -1)
- {
- result = locateObjectForOffset(offset);
- }
- return result;
- }
-
-
- protected Object getKeyForObject(Object object)
- {
- return object;
- }
-
-
- public Image getOverlayImageForObject(Object object)
- {
- Image result = null;
- try
- {
- IMarker marker = getMarkerForObject(object);
- if (marker != null)
- {
- if (marker.isSubtypeOf(IMarker.TASK))
- {
- result= taskOverlayImage;
- }
- else if (marker.isSubtypeOf(IMarker.BOOKMARK))
- {
- result = bookmarkOverlayImage;
- }
- else if (marker.isSubtypeOf(IMarker.PROBLEM))
- {
- switch (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO))
- {
- case IMarker.SEVERITY_INFO: { result = problemInfoOverlayImage; break; }
- case IMarker.SEVERITY_WARNING: { result = problemWarningOverlayImage; break; }
- case IMarker.SEVERITY_ERROR: { result = problemErrorOverlayImage; break; }
- }
- }
- }
- }
- catch (Exception e)
- {
- }
- return result;
- }
-
-
- public IMarker getMarkerForObject(Object object)
- {
- IMarker result = null;
- Object key = object != null ? getKeyForObject(object) : null;
- if (key != null)
- {
- result = (IMarker)hashtable.get(key);
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/UIPlugin.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/UIPlugin.java
deleted file mode 100644
index ffb1780..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/UIPlugin.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UIPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static UIPlugin plugin;
-
- /**
- * The constructor.
- */
- public UIPlugin() {
- super();
- plugin = this;
- }
-
- public UIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static UIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle aResourceBundle = getDefault().getResourceBundle();
- try {
- return (aResourceBundle != null) ? aResourceBundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * This gets the string resource and does one substitution.
- */
- public static String getString(String key, Object s1)
- {
- return MessageFormat.format(getResourceString(key), new Object [] { s1 });
- }
-
- /**
- * This gets the string resource and does two substitutions.
- */
- public static String getString(String key, Object s1, Object s2)
- {
- return MessageFormat.format(getResourceString(key), new Object [] { s1, s2 });
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- return Platform.getResourceBundle(plugin.getBundle());
- } catch (MissingResourceException x) {
- log(x);
- }
- return null;
- }
-
- public ImageDescriptor getImageDescriptor(String name) {
- try {
- URL url= new URL(getBundle().getEntry("/"), name);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException e) {
- return ImageDescriptor.getMissingImageDescriptor();
- }
- }
-
- public Image getImage(String iconName)
- {
- ImageRegistry imageRegistry = getImageRegistry();
-
- if (imageRegistry.get(iconName) != null)
- {
- return imageRegistry.get(iconName);
- }
- else
- {
- imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
- return imageRegistry.get(iconName);
- }
- }
-
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public static void log(String message, Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, e));
- }
-
- public static void log(String message) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
- }
-
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, e.getLocalizedMessage(), e));
- }
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- // TODO Auto-generated method stub
- super.start(context);
- }
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- // TODO Auto-generated method stub
- super.stop(context);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/WindowUtility.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/WindowUtility.java
deleted file mode 100644
index 532e260..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/WindowUtility.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Shell;
-
-public class WindowUtility
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static Object getSelection(ISelection selection)
- {
- if (selection == null)
- {
- return null;
- } // end of if ()
-
- Object result = null;
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection es= (IStructuredSelection)selection;
- Iterator i= es.iterator();
- if (i.hasNext())
- {
- result= i.next();
- }
- }
- return result;
- }
-
- public static List getSelectionList(ISelection selection)
- {
- List result = null;
- if (selection != null)
- {
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection es= (IStructuredSelection)selection;
- result = new Vector();
- for (Iterator i= es.iterator(); i.hasNext(); )
- {
- result.add(i.next());
- }
- }
- }
- return result;
- }
-
- public static void openErrorCreatingFile(Shell shell, IResource resource)
- {
- String title = null;
- String briefMessage = null;
- String reason = null;
- String details = null;
-
-// KCPort TODO
-// title = B2BGUIPlugin.getInstance().getString("_UI_ERROR_CREATING_FILE_TITLE");
-// briefMessage = B2BGUIPlugin.getInstance().getString("_UI_ERROR_CREATING_FILE_SHORT_DESC", resource.getName());
-// details = B2BGUIPlugin.getInstance().getString("_UI_ERROR_CREATING_FILE_LONG_DESC", resource.getLocation().toOSString());
-//
-// IResource parent = resource.getParent();
-// if (parent != null)
-// {
-// if (parent.isReadOnly())
-// {
-// reason = B2BGUIPlugin.getInstance().getString("_UI_PARENT_FOLDER_IS_READ_ONLY", parent.getName());
-// }
-// else
-// {
-// // on windows the isReadOnly() = false for read only shared directory... so we give a hint
-// reason = B2BGUIPlugin.getInstance().getString("_UI_UNKNOWN_ERROR_WITH_HINT", parent.getName());
-// }
-// }
-//
-// if (reason == null)
-// {
-// reason = B2BGUIPlugin.getInstance().getString("_UI_UNKNOWN_ERROR");
-// }
-
- openError(shell, title, briefMessage, reason, details);
- }
-
- public static void openError(Shell shell, String title, String briefMessage, String reason, String detailedMessage)
- {
- ErrorDialog.openError(shell, title, briefMessage, createStatus(reason, detailedMessage));
- }
-
- private static IStatus createStatus(String reason, String msg)
- {
-// KCPort TODO
-// String pluginId = B2BGUIPlugin.getInstance().getDescriptor().getUniqueIdentifier();
- String pluginId = "";
- MultiStatus multiStatus = new MultiStatus(pluginId, 0, reason, null);
- Status status = new Status(IStatus.ERROR, pluginId, 0, msg, null);
- multiStatus.add(status);
- return multiStatus;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/ActionHandlerListener.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/ActionHandlerListener.java
deleted file mode 100644
index 0ff85b0..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/ActionHandlerListener.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.actionhandler;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.internal.PartSite;
-import org.eclipse.wst.common.ui.actionhandler.action.CopyAction;
-import org.eclipse.wst.common.ui.actionhandler.action.CutAction;
-import org.eclipse.wst.common.ui.actionhandler.action.EditAction;
-import org.eclipse.wst.common.ui.actionhandler.action.PasteAction;
-
-
-
-public class ActionHandlerListener implements IPartListener, MenuListener
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Constructor for ActionHandlerListener.
- */
- public ActionHandlerListener()
- {
- super();
- createEditActions();
- }
-
- /**
- * Method connectPart. This call registers your part to the actionhandler listener
- * if it hasn't been registered already and hooks up the generic cut/copy/paste action handlers.
- * Invoke this method from the init() routine of your #IViewPart or #IEditorPart if you do not
- * have any custom cut/copy/paste action handlers.
- *
- * If you have a customized cut/copy/paste action handlers, invoke this method after you
- * have finished your custom processing to add/remove your actionhandlers.
- *
- * @param part - the workbench part that you would like to connect the generic cut/copy/paste handlers
- */
- static public void connectPart(IWorkbenchPart part)
- {
- getInstance().connectWorkbenchPart(part);
- }
-
- static protected ActionHandlerListener actionHandlerListener;
- static protected ActionHandlerListener getInstance()
- {
- if (actionHandlerListener == null)
- {
- actionHandlerListener = new ActionHandlerListener();
- }
- return actionHandlerListener;
- }
-
-
-
- protected ArrayList workbenchWindows = new ArrayList();
- public void listenToWorkbenchWindow(IWorkbenchWindow workbenchWindow)
- {
- if (!workbenchWindows.contains(workbenchWindow))
- {
- workbenchWindows.add(workbenchWindow);
- workbenchWindow.getPartService().addPartListener(this);
- MenuManager editMenu = (MenuManager) ((ApplicationWindow)workbenchWindow).getMenuBarManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
- if (editMenu != null)
- editMenu.getMenu().addMenuListener(this);
- }
- }
-
- protected void createEditActions()
- {
- cut = new CutAction();
- copy = new CopyAction();
- paste = new PasteAction();
- }
-
- protected IActionBars getActionBars(IWorkbenchPart part)
- {
- IActionBars actionBars = null;
- if (part != null)
- {
- IWorkbenchPartSite partSite = part.getSite();
- if (partSite instanceof PartSite)
- {
- actionBars = ((PartSite)partSite).getActionBars();
- }
- }
- return actionBars;
- }
-
- /**
- * Method connectWorkbenchPart. Ensure we are already listening to the workbenchwindow,
- * register the part's id and then connect the cut/copy/paste actions
- * @param part
- */
- public void connectWorkbenchPart(IWorkbenchPart part)
- {
- IWorkbenchWindow wbw = part.getSite().getWorkbenchWindow();
- listenToWorkbenchWindow(wbw);
- registerPartId(part);
- connectCutCopyPasteActions(part);
- }
-
- /**
- * Method isRegisteredPart. Returns whether the part has already been
- * registered as being a candidate for the generic cut/copy/paste actions.
- *
- * @param part
- * @return boolean
- */
- public boolean isRegisteredPart(IWorkbenchPart part)
- {
- String partId = part.getSite().getId();
- return registeredParts.contains(partId);
- }
-
- protected ArrayList registeredParts = new ArrayList();
- protected void registerPartId(IWorkbenchPart part)
- {
- if (!isRegisteredPart(part))
- {
- String partId = part.getSite().getId();
- registeredParts.add(partId);
- }
- }
-
- /**
- * Method connectCutCopyPasteActions. Connect the cut/copy/paste actions
- * to the workbench part.
- *
- * @param part
- */
- public void connectCutCopyPasteActions(IWorkbenchPart part)
- {
- IActionBars actionBars = getActionBars(part);
- if (actionBars != null)
- {
- part.getSite().getKeyBindingService().registerAction(cut);
- part.getSite().getKeyBindingService().registerAction(copy);
- part.getSite().getKeyBindingService().registerAction(paste);
- //connectCutCopyPasteActions(actionBars);
- }
- }
-
-
- /**
- * Method connectCutCopyPasteActions. Only set the actionhandlers if
- * there isn't one active for the appropriate action.
- *
- * @param actionBars
- */
- public void connectCutCopyPasteActions(IActionBars actionBars)
- {
- if (actionBars.getGlobalActionHandler(ActionFactory.CUT.getId()) == null)
- {
- actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
- }
- if (actionBars.getGlobalActionHandler(ActionFactory.COPY.getId()) == null)
- {
- actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
- }
- if (actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId()) == null)
- {
- actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
- }
- enableActions();
- actionBars.updateActionBars();
- }
-
- protected IWorkbenchPart getWorkbenchPart()
- {
- IWorkbenchWindow wbw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (wbw == null)
- return null;
-
- IWorkbenchPage wbp = wbw.getActivePage();
- if (wbp == null)
- return null;
-
- return wbp.getActivePart();
- }
-
- protected void updateActions()
- {
- IWorkbenchPart part = getWorkbenchPart();
- if (part != null &&
- isRegisteredPart(part))
- {
- IActionBars actionBars = getActionBars(part);
-
- Control focusControl = cut.getFocusControl();
- boolean enable = true;
- if (isValidFocusControl() &&
- actionBars != null)
- {
- String clipboardText = paste.getClipboardText();
- String selectionText = copy.getSelectionText();
- boolean isReadOnly = paste.isReadOnlyFocusControl();
- boolean clipboardNotEmpty = clipboardText != null && !clipboardText.equals("");
- boolean textSelected = selectionText != null && !selectionText.equals("");
-
- cut.setEnabled(!isReadOnly && textSelected);
- copy.setEnabled(textSelected && !(focusControl instanceof Combo && isReadOnly));
- paste.setEnabled(!isReadOnly && clipboardNotEmpty);
- }
- else
- {
- cut.setEnabled(false);
- copy.setEnabled(false);
- paste.setEnabled(false);
- }
- actionBars.updateActionBars();
- }
- }
-
- protected boolean isValidFocusControl()
- {
- // delgate to one of the edit actions
- return cut.isValidFocusControl();
- }
-
- protected void enableActions()
- {
- cut.setEnabled(true);
- copy.setEnabled(true);
- paste.setEnabled(true);
- }
-
- /**
- * Connect the cut/copy/paste actions if a registered part is activated.
- *
- * @see IPartListener#partActivated(IWorkbenchPart)
- */
- public void partActivated(IWorkbenchPart part)
- {
- if (isRegisteredPart(part))
- {
-// System.out.println("registered part activated" + part);
- connectCutCopyPasteActions(part);
- }
- }
-
- protected EditAction cut,copy,paste;
-
- /**
- * @see IPartListener#partBroughtToTop(IWorkbenchPart)
- */
- public void partBroughtToTop(IWorkbenchPart part)
- {
- }
- /**
- * @see IPartListener#partClosed(IWorkbenchPart)
- */
- public void partClosed(IWorkbenchPart part)
- {
- }
- /**
- * @see IPartListener#partDeactivated(IWorkbenchPart)
- */
- public void partDeactivated(IWorkbenchPart part)
- {
- }
- /**
- * @see IPartListener#partOpened(IWorkbenchPart)
- */
- public void partOpened(IWorkbenchPart part)
- {
- }
-
-
- /**
- * If the menu is hidden on a registered part, then renable all actions. This
- * takes away the need for us to monitor the control traversal. If the individual
- * action isn't applicable when it is invoked, the action becomes a no op.
- * @see MenuListener#menuHidden(MenuEvent)
- */
- public void menuHidden(MenuEvent e)
- {
- IWorkbenchPart part = getWorkbenchPart();
- if (part != null &&
- isRegisteredPart(part))
- {
- enableActions();
-
- IActionBars actionbars = getActionBars(part);
- actionbars.updateActionBars();
- }
- }
-
- /**
- * Update the cut/copy/paste enablement (if a registered part is active) just
- * before showing the edit menu.
- *
- * @see MenuListener#menuShown(MenuEvent)
- */
- public void menuShown(MenuEvent e)
- {
- updateActions();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/CopyAction.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/CopyAction.java
deleted file mode 100644
index e0e1a83..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/CopyAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.actionhandler.action;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-public class CopyAction extends EditAction
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#getActionDefinitionId()
- */
- public String getActionDefinitionId()
- {
- return IWorkbenchActionDefinitionIds.COPY;
- }
-
- public void run()
- {
- Control control = getFocusControl();
- if (control instanceof Text)
- {
- ((Text)control).copy();
- }
- else if (control instanceof StyledText)
- {
- ((StyledText)control).copy();
- }
- else if (control instanceof Combo)
- {
- ((Combo)control).copy();
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/CutAction.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/CutAction.java
deleted file mode 100644
index 4433fb2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/CutAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.actionhandler.action;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-public class CutAction extends EditAction
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#getActionDefinitionId()
- */
- public String getActionDefinitionId()
- {
- return IWorkbenchActionDefinitionIds.CUT;
- }
-
- public void run()
- {
- Control control = getFocusControl();
- if (control instanceof Text)
- {
- ((Text)control).cut();
- }
- if (control instanceof StyledText)
- {
- ((StyledText)control).cut();
- }
- if (control instanceof Combo)
- {
- ((Combo)control).cut();
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/EditAction.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/EditAction.java
deleted file mode 100644
index 6d82f99..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/EditAction.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.actionhandler.action;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-public class EditAction extends Action
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public Control getFocusControl()
- {
- return Display.getCurrent().getFocusControl();
- }
-
- public String getClipboardText()
- {
- Control focusControl = getFocusControl();
- if (focusControl != null)
- {
- Clipboard clipboard = new Clipboard(getFocusControl().getDisplay());
- TextTransfer textTransfer = TextTransfer.getInstance();
- String availableText = (String) clipboard.getContents(textTransfer);
- clipboard.dispose();
- return availableText;
- }
- return null;
-// String string = "";
-// if (OS.OpenClipboard (0)) {
-// int hMem = OS.GetClipboardData (OS.IsUnicode ? OS.CF_UNICODETEXT : OS.CF_TEXT);
-// if (hMem != 0) {
-// int byteCount = OS.GlobalSize (hMem);
-// int ptr = OS.GlobalLock (hMem);
-// if (ptr != 0) {
-// /* Use the character encoding for the default locale */
-// TCHAR buffer = new TCHAR (0, byteCount / TCHAR.sizeof);
-// OS.MoveMemory (buffer, ptr, byteCount);
-// string = buffer.toString (0, buffer.strlen ());
-// OS.GlobalUnlock (hMem);
-// }
-// }
-// OS.CloseClipboard ();
-// }
-// return string;
- }
-
- public String getSelectionText()
- {
- Control control = getFocusControl();
- if (control instanceof Text)
- {
- return ((Text)control).getSelectionText();
- }
- if (control instanceof StyledText)
- {
- return ((StyledText)control).getSelectionText();
- }
- if (control instanceof Combo)
- {
- Combo combo = (Combo)control;
- Point selection = combo.getSelection();
- return combo.getText().substring(selection.x, selection.y);
- }
- return "";
- }
-
- public boolean isReadOnlyFocusControl()
- {
- Control control = getFocusControl();
- if (control instanceof Text)
- {
- return !((Text)control).getEditable();
- }
- if (control instanceof StyledText)
- {
- return !((StyledText)control).getEditable();
- }
- if (control instanceof Combo)
- {
- Combo combo = (Combo)control;
- return (combo.getStyle() & SWT.READ_ONLY) == SWT.READ_ONLY;
- }
- return false;
- }
-
- public boolean isValidFocusControl()
- {
- Control control = getFocusControl();
- return (control instanceof Text ||
- control instanceof StyledText ||
- control instanceof Combo);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/PasteAction.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/PasteAction.java
deleted file mode 100644
index 64e0d46..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/actionhandler/action/PasteAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.actionhandler.action;
-
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-public class PasteAction extends EditAction
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#getActionDefinitionId()
- */
- public String getActionDefinitionId()
- {
- return IWorkbenchActionDefinitionIds.PASTE;
- }
-
- public void run()
- {
- Control control = getFocusControl();
- if (control instanceof Text)
- {
- ((Text)control).paste();
- }
- if (control instanceof StyledText)
- {
- ((StyledText)control).paste();
- }
- if (control instanceof Combo)
- {
- ((Combo)control).paste();
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dialogs/SelectSingleFileDialog.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dialogs/SelectSingleFileDialog.java
deleted file mode 100644
index 5076a20..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dialogs/SelectSingleFileDialog.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
-import org.eclipse.ui.internal.WorkbenchImages;
-import org.eclipse.wst.common.ui.viewers.SelectSingleFileView;
-
-
-
-public class SelectSingleFileDialog extends TitleAreaDialog
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2001, 2002.";
- protected SelectSingleFileView selectSingleFileView;
- protected Button okButton;
-
- public SelectSingleFileDialog(Shell parentShell, IStructuredSelection selection, boolean isFileMandatory)
- {
- super(parentShell);
- if (selection == null)
- {
- selection = new StructuredSelection();
- }
- selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory)
- {
- public void createFilterControl(Composite composite)
- {
- SelectSingleFileDialog.this.createFilterControl(composite);
- }
- };
- }
-
- protected Control createDialogArea(Composite parent)
- {
- Composite dialogArea = (Composite)super.createDialogArea(parent);
-
- //TODO.. enable context help
- //WorkbenchHelp.setHelp(dialogArea, B2BGUIContextIds.BTBG_SELECT_SINGLE_FILE_DIALOG);
-
- Composite composite = new Composite(dialogArea, SWT.NONE);
- composite.setLayout(new GridLayout());
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = 350;
- gd.heightHint = 350;
- composite.setLayoutData(gd);
-
- SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener()
- {
- public void setControlComplete(boolean isComplete)
- {
- okButton.setEnabled(isComplete);
- }
- };
- selectSingleFileView.setListener(listener);
- selectSingleFileView.createControl(composite);
- return dialogArea;
- }
-
- protected void createButtonsForButtonBar(Composite parent)
- {
- okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
- okButton.setEnabled(false);
- createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
- }
-
- public void create()
- {
- super.create();
- selectSingleFileView.setVisibleHelper(true);
- setTitleImage(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_DLGBAN_SAVEAS_DLG).createImage());
- }
-
- public void createFilterCombo(Composite composite)
- {
- }
-
- public IFile getFile()
- {
- return selectSingleFileView.getFile();
- }
-
- public void addFilterExtensions(String[] filterExtensions)
- {
- selectSingleFileView.addFilterExtensions(filterExtensions);
- }
-
- public void addFilterExtensions(String[] filterExtensions, IFile [] excludedFiles)
- {
- selectSingleFileView.addFilterExtensions(filterExtensions, excludedFiles);
- }
-
- public void createFilterControl(Composite composite)
- {
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DefaultDragAndDropCommand.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DefaultDragAndDropCommand.java
deleted file mode 100644
index 8e6fc0d..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DefaultDragAndDropCommand.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dnd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.swt.dnd.DND;
-
-
-abstract public class DefaultDragAndDropCommand implements DragAndDropCommand
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- * This keeps track of the owner that is the target of the drag and drop.
- */
- protected Object target;
-
- /**
- * This keeps track of the location of the drag and drop.
- */
- protected float location;
-
- /**
- * This keeps track of the lower range of locations in which the effect of this command remains unchanged.
- */
- protected float lowerLocationBound;
-
- /**
- * This keeps track of the upper range of locations in which the effect of this command remains unchanged.
- */
- protected float upperLocationBound;
-
- /**
- * This keeps track of the permitted operations.
- */
- protected int operations;
-
- /**
- * This keeps track of the current operation that will be returned by {@link #getOperation}.
- */
- protected int operation;
-
- /**
- * This keeps track of the feedback that will be returned by {@link #getFeedback}.
- */
- protected int feedback;
-
- /**
- * This keeps track of the collection of dragged sources.
- */
- protected Collection sources;
-
- public DefaultDragAndDropCommand(Object target, float location, int operations, int operation, Collection sources)
- {
- this.target = target;
- this.location = location;
- this.operations = operations;
- this.operation = operation;
- this.sources = new ArrayList(sources);
- if (!canExecute())
- {
- this.operation = DND.DROP_NONE;
- }
-
- }
-
- public int getFeedback()
- {
- if (isAfter())
- {
- return DND.FEEDBACK_INSERT_AFTER;
- }
- else
- {
- return DND.FEEDBACK_INSERT_BEFORE;
- }
- }
-
- public boolean isAfter()
- {
- return location > 0.5;
- }
-
- public int getOperation()
- {
- return operation;
- }
-
- public void reinitialize(Object target, float location, int operations, int operation, Collection sources)
- {
- this.target = target;
- this.location = location;
- this.operations = operations;
- this.operation = operation;
- this.sources = new ArrayList(sources);
- if (!canExecute())
- {
- this.operation = DND.DROP_NONE;
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DragAndDropCommand.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DragAndDropCommand.java
deleted file mode 100644
index 627f481..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DragAndDropCommand.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dnd;
-
-import java.util.Collection;
-
-public interface DragAndDropCommand
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- // public DragAndDropCommand(Object target, float location, int operations, int operation, Collection sources);
-
- public boolean canExecute();
-
- public void execute();
-
- public int getFeedback();
-
- public int getOperation();
-
- public void reinitialize(Object target, float location, int operations, int operation, Collection sources);
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DragAndDropManager.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DragAndDropManager.java
deleted file mode 100644
index 83b0ff2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/DragAndDropManager.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dnd;
-
-import java.util.Collection;
-
-public interface DragAndDropManager
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public DragAndDropCommand createCommand(Object target, float location, int operations, int operation, Collection source);
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ObjectTransfer.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ObjectTransfer.java
deleted file mode 100644
index 90b1c78..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ObjectTransfer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dnd;
-
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.TransferData;
-
-
-/**
- * This derived implementation of a byte array transfer short circuits the transfer process
- * so that a local transfer does not serialize the object
- * and hence can and will return the original object, not just a clone.
- * You only really need ever know about {@link #getInstance ObjectTransfer.getInstance()},
- * so that you can include it in when adding drag support to a viewer.
- * See {@link EditingDomainViewerDropAdapter} and {@link ViewerDragAdapter} for more details.
- * <p>
- * As an addded guard, the time is recorded and serialized in javaToNative
- * to that navive to java can ensure that it's returns the value that was really to have been transferred.
- */
-public class ObjectTransfer extends ByteArrayTransfer
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- * This is the register transfer type name.
- */
- protected static final String TYPE_NAME = "local-transfer-format";
-
- /**
- * This is the ID that is registered to the name.
- */
- protected static final int TYPE_ID = registerType(TYPE_NAME);
-
- /**
- * This is initialized and returned by {@link #getInstance}.
- */
- protected static ObjectTransfer instance;
-
- /**
- * This returns the one instance of this transfer agent.
- */
- public static ObjectTransfer getInstance()
- {
- if (instance == null)
- {
- instance = new ObjectTransfer();
- }
-
- return instance;
- }
-
- /**
- * This records the time at which the transfer data was recorded.
- */
- protected long startTime;
-
- /**
- * This records the data being transferred.
- */
- protected Object object;
-
- /**
- * This creates an instance; typically you get one from {@link #getInstance}.
- */
- protected ObjectTransfer()
- {
- }
-
- /**
- * This returns the transfer ids that this agent supports.
- */
- protected int[] getTypeIds()
- {
- return new int[] { TYPE_ID };
- }
-
- /**
- * This returns the transfer names that this agent supports.
- */
- public String[] getTypeNames()
- {
- return new String[] { TYPE_NAME };
- }
-
- /**
- * This records the object and current time and encodes only the current time into the transfer data.
- */
- public void javaToNative(Object object, TransferData transferData)
- {
- startTime = System.currentTimeMillis();
- this.object = object;
- if (transferData != null)
- {
- super.javaToNative(String.valueOf(startTime).getBytes(), transferData);
- }
- }
-
- /**
- * This decodes the time of the transfer and returns the recorded the object if the recorded time and the decoded time match.
- */
- public Object nativeToJava(TransferData transferData)
- {
- long startTime = Long.valueOf(new String((byte[])super.nativeToJava(transferData))).longValue();
- return
- this.startTime == startTime ?
- object :
- null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ViewerDragAdapter.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ViewerDragAdapter.java
deleted file mode 100644
index f04ed93..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ViewerDragAdapter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dnd;
-
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
-
-
-/**
- * This is an implemention of {@link DragSourceListener}.
- * It allows the selection in effect at the start of the drag and drop interaction to be recorded,
- * which is especially important for a drag and drop interaction within a single view.
- * This is how one of these adapters is typically hooked up:
- * <pre>
- * viewer.addDragSupport
- * (DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK,
- * new Transfer [] { LocalTransfer.getInstance() },
- * ViewerDragAdapter(viewer));
- * </pre>
- * Doing so simply allows a drag operation to be initiated from the viewer
- * such that the viewer's selection is transferred to the drop target.
- * See {@link EditingDomainViewerDropAdapter} and {@link LocalTransfer} for more details.
- */
-public class ViewerDragAdapter implements DragSourceListener
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- * This keeps track of the viewer to which we are listening.
- */
- protected Viewer viewer;
-
- /**
- * This keeps track of the selection that is in effect at the start of the drag operation
- */
- protected ISelection selection;
-
- /**
- * This creates an instance for the given viewer.
- */
- public ViewerDragAdapter(Viewer viewer)
- {
- super();
-
- // Remember the viewer and listen to SWT.DragDetect to alert the start of the drag operation.
- //
- this.viewer = viewer;
- }
-
- /**
- * This is called when dragging is initiated; it records the {@link #selection} of {@link #viewer}.
- */
- public void dragStart(DragSourceEvent event)
- {
- selection = viewer.getSelection();
- }
-
- /**
- * This is called when dragging is completed; it forgets the {@link #selection}.
- */
- public void dragFinished(DragSourceEvent event)
- {
- selection = null;
- }
-
- /**
- * This is called to transfer the data.
- */
- public void dragSetData(DragSourceEvent event)
- {
- if (ObjectTransfer.getInstance().isSupportedType(event.dataType))
- {
- event.data = selection;
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ViewerDropAdapter.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ViewerDropAdapter.java
deleted file mode 100644
index 3988a7f..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/dnd/ViewerDropAdapter.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.dnd;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.custom.TableTreeItem;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetAdapter;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-
-
-/**
- * This implementation of a drop target listener
- * is designed to turn a drag and drop operation into a {@link Command} based on the model objects of an {@link EditingDomain}
- * and created by {@link DragAndDropManager#create}.
- * It is designed to do early data transfer so the the enablement and feedback of the drag and drop interaction
- * can intimately depend on the state of the model objects involed.
- * <p>
- * The base implementation of this class should be sufficient for most applications.
- * Any change in behaviour is typically accomplished by overriding
- * {@link ItemProviderAdapter}.createDragAndDropCommand
- * to return a derived implementation of {@link DragAndDropCommand}.
- * This is how one these adapters is typically hooked up:
- * <pre>
- * viewer.addDropSupport
- * (DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK,
- * new Transfer [] { ObjectTransfer.getInstance() },
- * EditingDomainViewerDropAdapter(viewer));
- * </pre>
- * <p>
- * This implementation prefers to use a {@link ObjectTransfer},
- * which short-circuits the transfer process for simple transfers within the workbench,
- * the method {@link #getDragSource} can be overriden to change the behaviour.
- * The implementation also only handles an {@link IStructuredSelection},
- * but the method {@link #extractDragSource} can be overriden to change the behaviour.
- * <p>
- * You can call {@link #setHoverThreshold} to set the amount of time, in milliseconds,
- * to hover over an item before {@link #hover} is called;
- * the default is 1500 milliseconds.
- */
-public class ViewerDropAdapter extends DropTargetAdapter
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- * This is the viewer for which this is a drop target listener.
- */
- protected Viewer viewer;
-
- /**
- * This is the collection of source objects being dragged.
- */
- protected Collection source;
-
- /**
- * This is the command created during dragging which provides the feedback and will carry out the action upon completion.
- */
- // protected Command command;
- protected DragAndDropCommand command;
-
- /**
- * This records the object for which the {@link #command} was created.
- */
- protected Object commandTarget;
-
- /**
- * The amount of time to hover over a tree item before expanding it
- */
- protected int hoverThreshold = 1500;
-
- /**
- * The is the time the mouse first started hovering over the current item.
- */
- protected long hoverStart = 0;
-
- /**
- * This keeps track of the most recent item for the {@link #hoverStart}.
- */
- protected Widget previousItem;
-
- /**
- * This keeps track of the original operation that was in effect before we set the event.detail in here.
- */
- protected int originalOperation;
-
- /**
- * This keeps track of the information used to create the current command.
- */
- protected DragAndDropCommandInformation dragAndDropCommandInformation;
-
- protected DragAndDropManager dragAndDropManager;
-
- /**
- * This creates and instance of the given domain and viewer.
- */
- public ViewerDropAdapter(Viewer viewer, DragAndDropManager dragAndDropManager)
- {
- this.viewer = viewer;
- this.dragAndDropManager = dragAndDropManager;
- }
-
- /**
- * This is called when the mouse first enters or starts dragging in the viewer.
- */
- public void dragEnter(DropTargetEvent event)
- {
- originalOperation = event.detail;
- helper(event);
- }
-
- /**
- * This is called when the mouse leaves or stops dragging in the viewer
- */
- public void dragLeave(DropTargetEvent event)
- {
- // Clean up the command if there is one.
- //
- if (command != null)
- {
-// command.dispose();
- command = null;
- commandTarget = null;
- }
-
- // Reset the other values.
- //
- previousItem = null;
- hoverStart = 0;
- source = null;
- }
-
- /**
- * This is called when the operation has changed in some way, typically because the user changes keyboard modifiers.
- */
- public void dragOperationChanged(DropTargetEvent event)
- {
- originalOperation = event.detail;
- helper(event);
- }
-
- /**
- * This is called repeated when the mouse over the viewer.
- */
- public void dragOver(DropTargetEvent event)
- {
- helper(event);
- }
-
- /**
- * This is called just as the mouse is released over the viewer to initiate a drop.
- */
- public void dropAccept(DropTargetEvent event)
- {
- // There seems to be a bug in SWT that the view may have scrolled.
- // helper(event);
- }
-
- /**
- * This is called to indate that the drop action should be invoked.
- */
- public void drop(DropTargetEvent event)
- {
- // There seems to be a bug in SWT that the view may have scrolled.
- // helper(event);
- if (dragAndDropCommandInformation != null)
- {
- command = dragAndDropCommandInformation.createCommand();
-
- // Execute the command
- command.execute();
-
- // Clean up the state.
- //
- command = null;
- commandTarget = null;
- previousItem = null;
- hoverStart = 0;
- source = null;
- }
- }
-
- /**
- * This method is called the same way for each of the {@link org.eclipse.swt.dnd.DropTargetListener} methods, except during leave.
- */
- protected void helper(DropTargetEvent event)
- {
- // Try to get the source if there isn't one.
- //
- if (source == null)
- {
- source = getDragSource(event);
- }
- else if (event.currentDataType == null)
- {
- setCurrentDataType(event);
- }
-
- // If there's still no source, wait until the next time to try again.
- //
- if (source == null)
- {
- event.detail = DND.DROP_NONE;
- event.feedback = DND.FEEDBACK_SELECT;
- }
- // Otherwise, if we need to scroll...
- //
- else if (scrollIfNeeded(event))
- {
- // In the case that we scroll, we just do all the work on the next event and only just scroll now.
- //
- event.feedback = DND.FEEDBACK_SELECT;
- }
- else
- {
- // Get the data from the item, if there is one.
- //
- Object target = event.item == null ? null : event.item.getData();
- if (target instanceof TableTreeItem)
- {
- target = ((TableTreeItem)target).getData();
- }
-
- // Do the logic to determine the hover information.
- // If we're over a new item from before.
- //
- if (event.item != previousItem)
- {
- // Remember the item and the time.
- //
- previousItem = event.item;
- hoverStart = event.time;
- }
- else if (target != null)
- {
- if (event.time - hoverStart > hoverThreshold)
- {
- hover(target);
-
- // We don't need to hover over this guy again.
- //
- hoverStart = Integer.MAX_VALUE;
- }
- }
-
- // Determine if we can create a valid command at the current mouse location.
- //
- boolean valid = false;
-
- // If we don't have a previous cached command...
- //
- if (command == null)
- {
- // Create the command and test if it is executable.
- //
- commandTarget = target;
- command = dragAndDropManager.createCommand(target, getLocation(event), event.operations, event.detail, source);
- valid = command.canExecute();
- }
- else
- {
- int operation = originalOperation != event.detail ? originalOperation : event.detail;
-
- // Check if the cached command is able to provide drag and drop feedback.
- //
- if (target == commandTarget)// && command instanceof DragAndDropFeedback)
- {
- float location = getLocation(event);
-
- dragAndDropCommandInformation =
- new DragAndDropCommandInformation(target, location, event.operations, operation, source);
-
- // If so, revalidate the command.
- //
- command.reinitialize(target, location, event.operations, operation, source);
- valid = command.canExecute();
- }
- else
- {
- // If not, dispose the current command and create a new one.
- //
- // command.dispose();
- commandTarget = target;
-
- dragAndDropCommandInformation =
- new DragAndDropCommandInformation(target, getLocation(event), event.operations, operation, source);
-
- // DragAndDropManager.create(domain, target, getLocation(event), event.operations, operation, source);
- //
- command = dragAndDropCommandInformation.createCommand();
-
- valid = command.canExecute();
- }
- }
-
- // If this command can provide detailed drag and drop feedback...
- //
- //if (command instanceof DragAndDropCommand)
- if (command != null)
- {
- // Use the feedback for the operation and mouse point from the command.
- //
- event.detail = command.getOperation();
- event.feedback = command.getFeedback();
- }
- else if (valid)
- {
- // All we can know is to provide selection feedback.
- //
- event.feedback = DND.FEEDBACK_SELECT;
- }
- else
- {
- // There is no executable command, so we'd better nix the whole deal.
- //
- event.detail = DND.DROP_NONE;
- event.feedback = DND.FEEDBACK_SELECT;
- }
- }
- }
-
-
- protected void setCurrentDataType(DropTargetEvent event)
- {
- ObjectTransfer objectTransfer = ObjectTransfer.getInstance();
- TransferData [] dataTypes = event.dataTypes;
- for (int i = 0; i < dataTypes.length; ++i)
- {
- TransferData transferData = dataTypes[i];
- // If the local tansfer supports this datatype, switch to that data type
- //
- if (objectTransfer.isSupportedType(transferData))
- {
- event.currentDataType = transferData;
- }
- }
- }
-
- /**
- * This attempts to extract the drag source from the event early, i.e., before the drop method.
- * This implementation tries to use a {@link org.eclipse.wst.common.ui.dnd.ObjectTransfer}.
- */
- protected Collection getDragSource(DropTargetEvent event)
- {
- // Check whether the current data type can be transfered locally.
- //
- ObjectTransfer objectTransfer = ObjectTransfer.getInstance();
- if (!objectTransfer.isSupportedType(event.currentDataType))
- {
- // Iterate over the data types to see if there is a datatype that supports a local transfer.
- //
- setCurrentDataType(event);
- return null;
- }
- else
- {
- // Transfer the data and extract it.
- //
- Object object = objectTransfer.nativeToJava(event.currentDataType);
- return extractDragSource(object);
- }
- }
-
- /**
- * This extracts a collection of dragged source objects from the given object retrieved from the transfer agent.
- * This default implementation converts a structured selection into a collection of elements.
- */
- protected Collection extractDragSource(Object object)
- {
- // Transfer the data and convert the structured selection to a collection of objects.
- //
- if (object instanceof IStructuredSelection)
- {
- Collection result = new ArrayList();
- for (Iterator elements = ((IStructuredSelection)object).iterator(); elements.hasNext(); )
- {
- result.add(elements.next());
- }
- return result;
- }
- else
- {
- return Collections.EMPTY_LIST;
- }
- }
-
- /**
- * This gets the amount of time, in milliseconds, to hover over an item before {@link #hover} is called.
- */
- public int getHoverThreshold()
- {
- return hoverThreshold;
- }
-
- /**
- * This set the amount of time, in milliseconds, to hover over an item before {@link #hover} is called.
- */
- public void setHoverThreshold(int hoverThreshold)
- {
- this.hoverThreshold = hoverThreshold;
- }
-
- /**
- * This is called when the cursor has hovered over the given target for longer than {@link #hoverThreshold}.
- */
- protected void hover(Object target)
- {
- if (viewer instanceof AbstractTreeViewer)
- {
- ((AbstractTreeViewer)viewer).expandToLevel(target, 1);
- }
- }
-
- /**
- * This returns whether a scroll was performed based on the given drag coordinates.
- */
- protected boolean scrollIfNeeded(DropTargetEvent event)
- {
- // By default we'll not scroll
- //
- boolean result = false;
-
- // We only handle a tree item right now.
- //
- if (event.item instanceof TreeItem)
- {
- // Tree items have special data that will help.
- //
- TreeItem treeItem = (TreeItem)event.item;
-
- // We need need the point in the coordinates of the control and the control's bounds.
- //
- Tree tree = treeItem.getParent();
- Point point = tree.toControl(new Point(event.x, event.y));
- Rectangle bounds = tree.getClientArea();
-
- // This is the distance in pixels from the top or bottom that will cause scrolling.
- //
- int scrollEpsilon = Math.min(treeItem.getBounds().height, bounds.height / 3);
-
- // This will be the item that should be scrolled into the view.
- //
- TreeItem scrollTreeItem = null;
-
- // If we should scroll up.
- //
- if (point.y < scrollEpsilon)
- {
- // Determine the parent to find the sibling.
- //
- TreeItem parent = treeItem.getParentItem();
- // Walk through the siblings.
- //
- TreeItem [] children = parent == null ? tree.getItems() : parent.getItems();
- for (int i = 0; i < children.length; ++i)
- {
- // Is this a match.
- //
- if (children[i] == treeItem)
- {
- // If there is a previous sibling...
- //
- if (i > 0)
- {
- scrollTreeItem = children[i - 1];
-
- // Get the last deepest descendent of this previous sibling.
- //
- for (;;)
- {
- children = scrollTreeItem.getItems();
- if (children != null && children.length != 0 && scrollTreeItem.getExpanded())
- {
- scrollTreeItem = children[children.length - 1];
- }
- else
- {
- break;
- }
- }
- }
- else
- {
- // The parent must be the previous.
- //
- scrollTreeItem = parent;
- }
-
- // We're done after the match.
- //
- break;
- }
- }
- }
- // If we should scroll down...
- //
- else if (bounds.height - point.y < scrollEpsilon)
- {
- // If this thing has visible children, then the first child must be next.
- //
- TreeItem [] children = treeItem.getItems();
- if (children != null && children.length != 0 && treeItem.getExpanded())
- {
- scrollTreeItem = children[0];
- }
- else
- {
- // We need the parent to determine siblings and will walk up the tree if we are the last sibling.
- //
- while (scrollTreeItem == null)
- {
- // If there's no parent, we're done.
- //
- TreeItem parent = treeItem.getParentItem();
- // Walk the children.
- //
- children = parent == null ? tree.getItems() : parent.getItems();
- for (int i = 0; i < children.length; ++i)
- {
- // When we find the child.
- //
- if (children[i] == treeItem)
- {
- // If the next index is a valid index...
- //
- if (++i < children.length)
- {
- // We've found the item.
- //
- scrollTreeItem = children[i];
- }
-
- // We're done with this parent.
- //
- break;
- }
- }
-
- if (parent == null)
- {
- break;
- }
-
- // Walk up.
- //
- treeItem = parent;
- }
- }
- }
-
- // If we should scroll.
- //
- if (scrollTreeItem != null)
- {
- // Only scroll if we're on an item for a while.
- //
- if (previousItem != null && event.time - hoverStart > 200)
- {
- ScrollBar verticalScrollBar = tree.getVerticalBar();
- if (verticalScrollBar != null)
- {
- int before = verticalScrollBar.getSelection();
-
- // Make sure the item is scrolled in place.
- //
- tree.showItem(scrollTreeItem);
-
- // Make sure we don't scroll again quickly.
- //
- previousItem = null;
-
- // Indicate that we've done a scroll and nothing else should be done.
- //
- result = before != verticalScrollBar.getSelection();
- }
- }
- else
- {
- // If the item changes, reset the timer information.
- //
- if (event.item != previousItem)
- {
- previousItem = event.item;
- hoverStart = event.time;
- }
- }
- }
- }
- else if (event.item instanceof TableItem)
- {
- // Table items have special data that will help.
- //
- TableItem tableItem = (TableItem)event.item;
-
- // We need need the point in the coordinates of the control and the control's bounds.
- //
- Table table = tableItem.getParent();
- Point point = table.toControl(new Point(event.x, event.y));
- Rectangle bounds = table.getClientArea();
- if (table.getHeaderVisible())
- {
- int offset = table.getItemHeight();
- bounds.y += offset;
- bounds.height -= offset;
- point.y -= offset;
- }
-
- // The position of this item.
- //
- int index = table.indexOf(tableItem);
-
- // This is the distance in pixels from the top or bottom that will cause scrolling.
- //
- int scrollEpsilon = Math.min(tableItem.getBounds(0).height, bounds.height / 3);
-
- // This will be the item that should be scrolled into the view.
- //
- TableItem scrollTableItem = null;
-
- // If we should scroll up.
- //
- if (point.y < scrollEpsilon)
- {
- if (index > 0)
- {
- scrollTableItem = table.getItems()[index - 1];
- }
- }
- // If we should scroll down...
- //
- else if (bounds.height - point.y < scrollEpsilon)
- {
- if (index + 1 < table.getItems().length)
- {
- scrollTableItem = table.getItems()[index + 1];
- }
- }
-
- // If we should scroll.
- //
- if (scrollTableItem != null)
- {
- // Only scroll if we're on an item for a while.
- //
- if (previousItem != null && event.time - hoverStart > 200)
- {
- ScrollBar verticalScrollBar = table.getVerticalBar();
- if (verticalScrollBar != null)
- {
- int before = verticalScrollBar.getSelection();
-
- // Make sure the item is scrolled in place.
- //
- table.showItem(scrollTableItem);
-
- // Make sure we don't scroll again quickly.
- //
- previousItem = null;
-
- // Indicate that we've done a scroll and nothing else should be done.
- //
- result = before != verticalScrollBar.getSelection();
- }
- }
- else
- {
- // If the item changes, reset the timer information.
- //
- if (event.item != previousItem)
- {
- previousItem = event.item;
- hoverStart = event.time;
- }
- }
- }
- }
-
- return result;
- }
-
- protected static float getLocation(DropTargetEvent event)
- {
- if (event.item instanceof TreeItem)
- {
- TreeItem treeItem = (TreeItem)event.item;
- Control control = treeItem.getParent();
- Point point = control.toControl(new Point(event.x, event.y));
- Rectangle bounds = treeItem.getBounds();
- return (float)(point.y - bounds.y) / (float)bounds.height;
- }
- else if (event.item instanceof TableItem)
- {
- TableItem tableItem = (TableItem)event.item;
- Control control = tableItem.getParent();
- Point point = control.toControl(new Point(event.x, event.y));
- Rectangle bounds = tableItem.getBounds(0);
- return (float)(point.y - bounds.y) / (float)bounds.height;
- }
- else
- {
- return 0.0F;
- }
- }
-
- protected class DragAndDropCommandInformation
- {
- // protected EditingDomain domain;
- protected Object target;
- protected float location;
- protected int operations;
- protected int operation;
- protected Collection source;
- public DragAndDropCommandInformation
- (Object target, float location, int operations, int operation, Collection source)
- {
- this.target = target;
- this.location = location;
- this.operations = operations;
- this.operation = operation;
- this.source = new ArrayList(source);
- }
-
- public DragAndDropCommand createCommand()
- {
- return dragAndDropManager.createCommand(target, location, operations, operation, source);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/ChangeHelper.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/ChangeHelper.java
deleted file mode 100644
index 8188269..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/ChangeHelper.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.internal.resources;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-
-public class ChangeHelper
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- protected IEditorPart editor;
-
- public ChangeHelper(IEditorPart editor)
- {
- this.editor = editor;
- }
-
- boolean handlingEditorInput = false;
-
- public void handleEditorInputChanged()
- {
- if (handlingEditorInput)
- return;
-
- handlingEditorInput = true;
-
- if (isDeleted(editor.getEditorInput()))
- {
- // if saveas is allowed, give the user an opportunity to
- // save the existing contents to another file
- if (editor.isDirty() && editor.isSaveAsAllowed())
- {
- boolean isDone = false;
- while (isDone == false)
- {
- String[] buttons= { UIPlugin.getResourceString("_UI_SAVE_BUTTON"),
- UIPlugin.getResourceString("_UI_CLOSE_BUTTON") };
-
- final MessageDialog msg = new MessageDialog(editor.getSite().getShell(),
- UIPlugin.getResourceString("_UI_FILE_CHANGED_TITLE"),
- null,
- UIPlugin.getResourceString("_UI_FILE_DELETED_SAVE_CHANGES"),
- MessageDialog.QUESTION,
- buttons,
- 0);
-
- int rc = msg.open();
- if (rc == 0)
- {
- editor.doSaveAs();
- }
- else
- {
- close(false);
- break;
- }
- if (!editor.isDirty())//!isDeleted(editor.getEditorInput()))
- {
- isDone = true;
- }
- }
- // refresh it so it gets removed from the workspace
-// WorkbenchUtility.refreshLocalWorkspaceFile(((IFileEditorInput)editor.getEditorInput()).getFile(), new NullProgressMonitor());
- }
- else
- {
- // otherwise time to shutdown the editor.
-// MessageDialog.openConfirm(editor.getSite().getShell(), B2BGUIPlugin.getGUIString("_UI_FILE_CHANGED_TITLE"), B2BGUIPlugin.getGUIString("_UI_FILE_DELETED_EDITOR_CLOSED"));
- close(false);
- }
- }
- else
- {
- // The file has just had its contents modified
- if (editor instanceof IExternalChangeEditorListener)
- {
-
- boolean rc = MessageDialog.openQuestion(editor.getSite().getShell(), UIPlugin.getResourceString("_UI_FILE_CHANGED_TITLE"), UIPlugin.getResourceString("_UI_FILE_CHANGED_LOAD_CHANGES"));
- if (rc == true)
- {
- ((IExternalChangeEditorListener)editor).reload();
- }
- }
- }
- handlingEditorInput = false;
- }
-
- // close the editor
- public void close(final boolean save)
- {
- Display display= editor.getSite().getShell().getDisplay();
- display.asyncExec(new Runnable()
- {
- public void run()
- {
- editor.getSite().getPage().closeEditor(editor, save);
- }
- });
- }
-
- /*
- * check if file is deleted
- */
- public boolean isDeleted(Object element)
- {
- if (element instanceof IFileEditorInput)
- {
- IFileEditorInput input= (IFileEditorInput) element;
-
- IPath path= input.getFile().getLocation();
- if (path == null)
- {
- return true;
- }
- return !path.toFile().exists();
- }
- return false;
- }
-}// ChangeHelper
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/IExternalChangeEditorListener.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/IExternalChangeEditorListener.java
deleted file mode 100644
index 5474096..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/IExternalChangeEditorListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.internal.resources;
-
-import org.eclipse.core.runtime.IPath;
-
-public interface IExternalChangeEditorListener
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public void handleEditorInputChanged();
- public void handleEditorPathChanged(IPath newPath);
- public void reload();
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/IValidateEditEditor.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/IValidateEditEditor.java
deleted file mode 100644
index d24fd7d..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/IValidateEditEditor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.internal.resources;
-
-public interface IValidateEditEditor
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- public void undoChange();
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/PropertyResourceChangeListener.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/PropertyResourceChangeListener.java
deleted file mode 100644
index 1d64b25..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/PropertyResourceChangeListener.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.internal.resources;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-
-public class PropertyResourceChangeListener extends ResourceChangeListener implements IPropertyListener
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- public PropertyResourceChangeListener(IEditorPart editPart)
- {
- super(editPart);
- editPart.addPropertyListener(this);
- }
-
- boolean dirtyState = false;
- IFile[] iFileList = null;
- IEditorPart editorPart = null;
- Runnable currentRunnable = null;
- boolean inValidateEditCall = false;
-
- public void propertyChanged(Object source, int propId)
- {
- if (propId == IEditorPart.PROP_DIRTY)
- {
- if ((source instanceof IEditorPart) && (currentRunnable == null))
- {
- editorPart = (IEditorPart)source;
- if (editorPart.isDirty() && (editorPart.getEditorInput() instanceof IFileEditorInput))
- {
- IFileEditorInput editorInput = (IFileEditorInput)(editorPart.getEditorInput());
- // Only call validateEdit if the file is read only
- if (editorInput.getFile().isReadOnly())
- {
- iFileList = new IFile[1];
- iFileList[0] = editorInput.getFile();
-
- currentRunnable = new Runnable()
- {
- public void run()
- {
- inValidateEditCall = true;
- IStatus status = ResourcesPlugin.getWorkspace().validateEdit(iFileList, editorPart.getSite().getShell());
- if (status.getCode() != IStatus.OK)
- {
- ((IValidateEditEditor)editorPart).undoChange();
- setDirtyState(editorPart.isDirty());
-
- if (status.getCode() == IStatus.ERROR)
- MessageDialog.openError(Display.getCurrent().getActiveShell() ,
- UIPlugin.getResourceString("_UI_ERROR_VALIDATE_EDIT_FAIL_ONE_FILE"),
- status.getMessage());
- }
- else
- {
- checkChanged(editorPart);
- }
-
- inValidateEditCall = false;
- currentRunnable = null;
- }
- };
-
- // we need to ensure that this is run via 'asyncExec' since these
- // notifications can come from a non-ui thread
- if (Display.getCurrent() != null)
- Display.getCurrent().timerExec(100,currentRunnable);
- else
- Display.getDefault().timerExec(100,currentRunnable);
- }
- }
- }
- }
- }
-
-public boolean inValidateEditCall()
-{
- return inValidateEditCall;
-}
-
-/**
- * Gets the dirtyState.
- * @return Returns a boolean
- */
-public boolean getDirtyState() {
- return dirtyState;
-}
-
-/**
- * Sets the dirtyState.
- * @param dirtyState The dirtyState to set
- */
-public void setDirtyState(boolean dirtyState) {
- this.dirtyState = dirtyState;
-}
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/ResourceChangeListener.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/ResourceChangeListener.java
deleted file mode 100644
index 18b64d4..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/internal/resources/ResourceChangeListener.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.internal.resources;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class ResourceChangeListener implements IPartListener, IResourceChangeListener, IResourceDeltaVisitor
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- protected ArrayList recognizedEditorParts = new ArrayList();
- protected IEditorPart editor;
- protected long fileTimestamp;
-
- public ResourceChangeListener(IEditorPart editPart)
- {
- editor = editPart;
- // add a part activate listener
- editor.getSite().getWorkbenchWindow().getPartService().addPartListener(this);
- // add resource change listener
- getFile().getWorkspace().addResourceChangeListener(this);
- setTimestamp();
- }
-
- protected void setTimestamp()
- {
- fileTimestamp = computeModificationStamp(getFile());
- }
-
- /**
- * Computes the initial modification stamp for the given resource.
- *
- * @param resource the resource
- * @return the modification stamp
- */
- protected long computeModificationStamp(IResource resource) {
- long modificationStamp= resource.getModificationStamp();
-
- IPath path= resource.getLocation();
- if (path == null)
- return modificationStamp;
-
- modificationStamp= path.toFile().lastModified();
- return modificationStamp;
- }
-
- protected IFile getFile()
- {
- IFileEditorInput fileInput = (IFileEditorInput) editor.getEditorInput();
- return fileInput.getFile();
- }
-
- protected void checkChanged(final IEditorPart editorPart)
- {
- if (!getFile().exists() ||
- fileTimestamp != computeModificationStamp(getFile()))
- {
- if (editorPart instanceof IExternalChangeEditorListener)
- {
- editorPart.getSite().getShell().getDisplay().asyncExec(new Runnable()
- {
- public void run()
- {
- ((IExternalChangeEditorListener)editorPart).handleEditorInputChanged();
- setTimestamp();
- }
- });
- }
- }
- }
-
- /**
- * @see IPartListener#partActivated(IWorkbenchPart)
- */
- public void partActivated(IWorkbenchPart part)
- {
- if (part == editor)
- checkChanged(editor);
- }
-
- /**
- * @see IPartListener#partBroughtToTop(IWorkbenchPart)
- */
- public void partBroughtToTop(IWorkbenchPart arg0) {
-// if (arg0 == editor)
-// B2BGUIPlugin.getPlugin().getMsgLogger().write("part brought to top");
- }
-
- /**
- * @see IPartListener#partClosed(IWorkbenchPart)
- */
- public void partClosed(IWorkbenchPart part) {
- if (part == editor)
- {
- // add a part activate listener
- editor.getSite().getWorkbenchWindow().getPartService().removePartListener(this);
- // add resource change listener
- getFile().getWorkspace().removeResourceChangeListener(this);
-// B2BGUIPlugin.getPlugin().getMsgLogger().write("part closed");
- }
- }
-
- /**
- * @see IPartListener#partDeactivated(IWorkbenchPart)
- */
- public void partDeactivated(IWorkbenchPart part) {}
-
- /**
- * @see IPartListener#partOpened(IWorkbenchPart)
- */
- public void partOpened(IWorkbenchPart part) {}
-
- // IResourceChangeListener interface
- public void resourceChanged(IResourceChangeEvent event)
- {
- IResourceDelta resourceDelta = event.getDelta();
-
- try
- {
- if (resourceDelta != null)
- {
- resourceDelta.accept(this);
- }
- }
- catch (Exception e)
- {
-// B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception caught during resource change" + e);
-// B2BGUIPlugin.getPlugin().getMsgLogger().writeCurrentThread();
- }
- }
-
- // IResourceDeltaVisitor
- public boolean visit(IResourceDelta delta)
- {
- if (delta.getResource().equals(getFile()))
- {
- switch (delta.getKind())
- {
- case IResourceDelta.CHANGED:
- setTimestamp();
- break;
- case IResourceDelta.REMOVED:
- if ((IResourceDelta.MOVED_TO & delta.getFlags()) != 0)
- {
- final IPath movedToPath = delta.getMovedToPath();
-
- editor.getSite().getShell().getDisplay().asyncExec(new Runnable()
- {
- public void run()
- {
- // if the resource has moved or been renamed, let the editor do some work now
- ((IExternalChangeEditorListener)editor).handleEditorPathChanged(movedToPath);
- setTimestamp();
- }
- });
- }
- else
- {
- editor.getSite().getShell().getDisplay().asyncExec(new Runnable()
- {
- public void run()
- {
- // if the resource is deleted, let the editor do some work now
- ((IExternalChangeEditorListener)editor).handleEditorInputChanged();
- setTimestamp();
- }
- });
-
- }
- break;
-
- default:
- break;
- }
- }
- return true;
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/resource/ResourceDeleteListener.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/resource/ResourceDeleteListener.java
deleted file mode 100644
index b1f852e..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/resource/ResourceDeleteListener.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.resource;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-
-public class ResourceDeleteListener implements IResourceChangeListener, IResourceDeltaVisitor
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- protected ArrayList recognizedEditorParts = new ArrayList();
-
- public void addEditorPartClass(Class editorPartClass)
- {
- recognizedEditorParts.add(editorPartClass);
- }
-
- public void resourceChanged(IResourceChangeEvent event)
- {
- IResourceDelta resourceDelta = event.getDelta();
-
- try
- {
- if (resourceDelta != null)
- {
- resourceDelta.accept(this);
- }
- }
- catch (Exception e)
- {
-// B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception caught during resource change" + e);
-// B2BGUIPlugin.getPlugin().getMsgLogger().writeCurrentThread();
- }
- }
-
- public boolean visit(IResourceDelta delta)
- {
- if (delta.getKind() == IResourceDelta.REMOVED)
- {
- // handle removed resource
- //closeEditors(delta.getResource());
- /*
- * defect 235374
- * Without ayncExec, RuntimeException is raised:
- * "The resource tree is locked for modifications."
- * from Resource.refreshLocal().
- */
- Display.getDefault().asyncExec
- (new CloseEditors(recognizedEditorParts,delta.getResource()));
- }
- return true;
- }
-
- public static class CloseEditors implements Runnable
- {
- private IResource resource;
- private ArrayList recognizedEditorParts;
-
- public CloseEditors(ArrayList editorParts, IResource res)
- {
- recognizedEditorParts = editorParts;
- resource = res;
- }
-
- public void run()
- {
- // close all associated editors that are editing this resource,
- // if it is one of the recognizedEditorParts
- IWorkbenchWindow windows[] =
- UIPlugin.getDefault().getWorkbench().getWorkbenchWindows();
-
- for (int i = 0; i < windows.length; i++)
- {
- IWorkbenchPage pages[] = windows[i].getPages();
-
- for (int j = 0; j < pages.length; j++ )
- {
- IEditorPart editors[] = pages[j].getEditors();
- for (int k = 0; k < editors.length; k++)
- {
- IEditorPart editor = editors[k];
- IEditorInput editorInput = editor.getEditorInput();
-
- if (editorInput instanceof IFileEditorInput)
- {
- if (((IFileEditorInput)editorInput).getFile().equals(resource) &&
- recognizedEditorParts.contains(editor.getClass()))
- {
- IWorkbenchPage page = pages[j];
- page.closeEditor(editor, false);
- }
- }
- }
- }
- }
- }
- }
-
- /*
- private void closeEditors(IResource deletedResource)
- {
- // close all associated editors that are editing this resource,
- // if it is one of the recognizedEditorParts
- IWorkbenchWindow windows[] = B2BGUIPlugin.getInstance().getWorkbench().getWorkbenchWindows();
-
- for (int i = 0; i < windows.length; i++)
- {
- IWorkbenchPage pages[] = windows[i].getPages();
-
- for (int j = 0; j < pages.length; j++ )
- {
- IEditorPart editors[] = pages[j].getEditors();
- for (int k = 0; k < editors.length; k++)
- {
- IEditorPart editor = editors[k];
- IEditorInput editorInput = editor.getEditorInput();
-
- if (editorInput instanceof IFileEditorInput)
- {
- if (((IFileEditorInput)editorInput).getFile().equals(deletedResource) &&
- recognizedEditorParts.contains(editor.getClass()))
- {
- IWorkbenchPage page = pages[j];
- org.eclipse.swt.widgets.
- Display.getDefault().asyncExec(new CloseEditor(page, editor));
- }
- }
- }
- }
- }
- }
- */
-
- public static class CloseEditor implements Runnable
- {
- protected IWorkbenchPage page;
- protected IEditorPart editor;
- public CloseEditor(IWorkbenchPage page, IEditorPart editor)
- {
- this.page = page;
- this.editor = editor;
- }
- public void run()
- {
- page.closeEditor(editor, false);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/NavigableTableViewer.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/NavigableTableViewer.java
deleted file mode 100644
index 2f63b32..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/NavigableTableViewer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.viewers;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Table;
-
-public class NavigableTableViewer extends TableViewer
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- TableNavigator navigator;
-
- public NavigableTableViewer(Table parent)
- {
- super(parent);
- navigator = new TableNavigator(getTable(), this);
- }
-
- //override setCellEditors to put in call to moveAboveCellEditors for TableNavigator
- public void setCellEditors(CellEditor[] editors)
- {
- super.setCellEditors(editors);
- navigator.moveCellEditorsAbove(editors);
-
- }
-
- //override refresh so that TableNavigator is refreshed for all model changes
- public void refresh()
- {
- if( !this.getTable().isDisposed() )
- {
- super.refresh();
- navigator.refresh();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/ResourceFilter.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/ResourceFilter.java
deleted file mode 100644
index 3212435..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/ResourceFilter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.viewers;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-public class ResourceFilter extends ViewerFilter
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- protected String[] fExtensions;
- protected IFile[] fExcludedFiles;
- protected Collection fExcludes;
-
- public ResourceFilter(String[] extensions, Collection exclude)
- {
- fExtensions= extensions;
- fExcludes= exclude;
- fExcludedFiles = null;
- }
-
- public ResourceFilter(String[] extensions, IFile[] excludedFiles, Collection exclude)
- {
- fExtensions= extensions;
- fExcludes= exclude;
- fExcludedFiles = excludedFiles;
- }
-
- public boolean isFilterProperty(Object element, Object property)
- {
- return false;
- }
-
- public boolean select(Viewer viewer, Object parent, Object element)
- {
- if (element instanceof IFile)
- {
- if (fExcludes != null && fExcludes.contains(element))
- {
- return false;
- }
- String name= ((IFile)element).getName();
- if (fExcludedFiles != null)
- {
- for (int j= 0; j < fExcludedFiles.length; j++)
- {
- if ( ((IFile)element).getLocation().
- toOSString().compareTo((fExcludedFiles[j]).getLocation().toOSString()) == 0 )
- return false;
- }
- }
- if (fExtensions.length == 0)
- {
- // assume that we don't want to filter any files based on
- // extension
- return true;
- }
- for (int i= 0; i < fExtensions.length; i++)
- {
- if (name.endsWith(fExtensions[i]))
- {
- return true;
- }
- }
- return false;
- }
- else if (element instanceof IContainer)
- { // IProject, IFolder
- try
- {
- IResource[] resources= ((IContainer)element).members();
- for (int i= 0; i < resources.length; i++)
- {
- // recursive!
- if (select(viewer, parent, resources[i]))
- {
- return true;
- }
- }
- }
- catch (CoreException e)
- {
- }
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectMultiFilePage.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectMultiFilePage.java
deleted file mode 100644
index 5b86876..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectMultiFilePage.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.viewers;
-
-import java.util.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.core.resources.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.model.*;
-import org.eclipse.ui.wizards.datatransfer.*;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-
-// Page to specify the source files
-public class SelectMultiFilePage extends WizardPage {
- public static final String copyright =
- "(c) Copyright IBM Corporation 2000, 2001, 2002.";
- IWorkbench workbench;
- IStructuredSelection selection;
- boolean isFileMandatory;
- TreeViewer sourceFileViewer;
- Button addButton;
- Button removeButton;
- Button removeAllButton;
- org.eclipse.swt.widgets.List selectedListBox;
- Button importButton;
- private Vector fFilters;
- protected IFile[] fileNames;
- IWorkspaceRoot workspaceRoot;
-
- private final static int SIZING_LISTS_HEIGHT = 200;
- private final static int SIZING_LISTS_WIDTH = 150;
-
- // parameter isFileMandatory is used to determine if at least one file must be selected
- // before being able to proceed to the next page
- public SelectMultiFilePage(
- IWorkbench workbench,
- IStructuredSelection selection,
- boolean isFileMandatory) {
- super("SelectMultiFilePage");
- this.workbench = workbench;
- this.selection = selection;
- this.isFileMandatory = isFileMandatory;
- this.workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- this.fileNames = null;
- }
-
- public void createControl(Composite parent) {
-
- Composite pageContent = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- pageContent.setLayout(layout);
- pageContent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- GridData outerFrameGridData = (GridData) pageContent.getLayoutData();
- // outerFrameGridData.horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
- // outerFrameGridData.verticalAlignment = GridData.VERTICAL_ALIGN_FILL;
-
- // WorkbenchHelp.setHelp(
- // pageContent,
- // B2BGUIContextIds.BTBG_SELECT_MULTI_FILE_PAGE);
-
- createLabels(pageContent);
- createSourceViewer(pageContent);
- createButtonPanel(pageContent);
- createSelectedListBox(pageContent);
- createImportButton(pageContent);
-
- setControl(pageContent);
- if (isFileMandatory)
- setPageComplete(false);
-
- }
-
- public IFile[] getFiles() {
- return fileNames;
- }
-
- // This is a convenience method that allows filtering of the given file
- // exensions. It internally creates a ResourceFilter so that users of this
- // class don't have to construct one.
- // If the extensions provided don't have '.', one will be added.
- public void addFilterExtensions(String[] filterExtensions) {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions =
- new String[filterExtensions.length];
- for (int i = 0; i < filterExtensions.length; i++) {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- correctedFilterExtensions[i] = filterExtensions[i];
- else
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
-
- ViewerFilter filter =
- new ResourceFilter(correctedFilterExtensions, null);
- addFilter(filter);
- }
-
- public boolean isValidSourceFileViewerSelection(ISelection selection) {
- return true;
- }
-
- public void setVisible(boolean visible) {
- if (visible == true) {
- if (fFilters != null) {
- sourceFileViewer.resetFilters();
- for (Iterator i = fFilters.iterator(); i.hasNext();)
- sourceFileViewer.addFilter((ViewerFilter) i.next());
- }
- sourceFileViewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
- }
- super.setVisible(visible);
- }
-
- public void setFiles(String[] fileNames) {
- int size = Arrays.asList(fileNames).size();
- Vector iFileNames = new Vector();
- for (int i = 0; i < size; i++) {
- IResource resource = workspaceRoot.findMember(fileNames[i]);
- if (resource instanceof IFile)
- iFileNames.addElement(resource);
- }
- IFile[] dummyArray = new IFile[iFileNames.size()];
- this.fileNames = (IFile[]) (iFileNames.toArray(dummyArray));
- }
-
- public void resetFilters() {
- fFilters = null;
- }
-
- public void addFilter(ViewerFilter filter) {
- if (fFilters == null)
- fFilters = new Vector();
- fFilters.add(filter);
- }
-
- public void setAddButtonEnabled(boolean isEnabled) {
- addButton.setEnabled(isEnabled);
- }
-
- public void setRemoveButtonEnabled(boolean isEnabled) {
- removeButton.setEnabled(isEnabled);
- }
-
- private void createLabels(Composite pageContent) {
- Label label = new Label(pageContent, SWT.LEFT);
- label.setText(UIPlugin.getResourceString("_UI_LABEL_SOURCE_FILES"));
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.horizontalSpan = 2;
- label.setLayoutData(data);
-
- label = new Label(pageContent, SWT.LEFT);
- label.setText(UIPlugin.getResourceString("_UI_LABEL_SELECTED_FILES"));
- }
-
- public boolean checkIfFileInTarget(IFile fileToCheck) {
- String[] strings = selectedListBox.getItems();
- int size = selectedListBox.getItemCount();
- for (int i = 0; i < size; i++) {
- if (strings[i].compareTo(fileToCheck.getFullPath().toString())
- == 0)
- return true;
- }
- return false;
- }
-
- private void createSourceViewer(Composite parent) {
- sourceFileViewer =
- new TreeViewer(
- new Tree(
- parent,
- SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER));
- sourceFileViewer.setContentProvider(new WorkbenchContentProvider());
- sourceFileViewer.setLabelProvider(new WorkbenchLabelProvider());
- sourceFileViewer
- .addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- java.util.List list;
- ISelection selection = event.getSelection();
- boolean newFilesSelected = false;
-
- if (selection instanceof IStructuredSelection) {
- list = ((IStructuredSelection) selection).toList();
- for (Iterator i = list.iterator(); i.hasNext();) {
- IResource resource = (IResource) i.next();
- if (resource instanceof IFile) {
- if (checkIfFileInTarget((IFile) resource) == false)
- newFilesSelected = true;
- }
- }
- setAddButtonEnabled(newFilesSelected);
- }
- }
- });
- sourceFileViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- addSelectedFilesToTargetList();
- }
- });
-
- Control treeWidget = sourceFileViewer.getTree();
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = SIZING_LISTS_WIDTH;
- gd.heightHint = SIZING_LISTS_HEIGHT;
- treeWidget.setLayoutData(gd);
- }
-
- private void createButtonPanel(Composite pageContent) {
- Composite buttonPanel = new Composite(pageContent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- buttonPanel.setLayout(layout);
-
- GridData gridData = new GridData();
- gridData.grabExcessHorizontalSpace = false;
- gridData.grabExcessVerticalSpace = true;
- gridData.verticalAlignment = GridData.CENTER;
- gridData.horizontalAlignment = GridData.CENTER;
- buttonPanel.setLayoutData(gridData);
-
- addButton = new Button(buttonPanel, SWT.PUSH);
- addButton.setText(UIPlugin.getResourceString("_UI_ADD_BUTTON"));
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.CENTER;
- addButton.setLayoutData(gridData);
- addButton.addSelectionListener(new ButtonSelectListener());
- addButton.setToolTipText(
- UIPlugin.getResourceString("_UI_ADD_BUTTON_TOOL_TIP"));
- addButton.setEnabled(false);
-
- removeButton = new Button(buttonPanel, SWT.PUSH);
- removeButton.setText(UIPlugin.getResourceString("_UI_REMOVE_BUTTON"));
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.CENTER;
- removeButton.setLayoutData(gridData);
- removeButton.addSelectionListener(new ButtonSelectListener());
- removeButton.setToolTipText(
- UIPlugin.getResourceString("_UI_REMOVE_BUTTON_TOOL_TIP"));
- removeButton.setEnabled(false);
-
- removeAllButton = new Button(buttonPanel, SWT.PUSH);
- removeAllButton.setText(UIPlugin.getResourceString("_UI_REMOVE_ALL_BUTTON"));
- gridData = new GridData();
- gridData.horizontalAlignment = GridData.FILL;
- gridData.verticalAlignment = GridData.CENTER;
- removeAllButton.setLayoutData(gridData);
- removeAllButton.addSelectionListener(new ButtonSelectListener());
- removeAllButton.setToolTipText(
- UIPlugin.getResourceString("_UI_REMOVE_ALL_BUTTON_TOOL_TIP"));
- removeAllButton.setEnabled(false);
- }
-
- private void createSelectedListBox(Composite parent) {
- selectedListBox = new List(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- selectedListBox.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent event) {
- }
-
- public void widgetSelected(SelectionEvent event) {
- java.util.List list;
- if (selectedListBox.getSelectionCount() > 0)
- setRemoveButtonEnabled(true);
- else
- setRemoveButtonEnabled(false);
- return;
- }
- });
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = SIZING_LISTS_WIDTH;
- gd.heightHint = SIZING_LISTS_HEIGHT;
- selectedListBox.setLayoutData(gd);
- }
-
- void createImportButton(Composite parent) {
- importButton = new Button(parent, SWT.PUSH);
- importButton.setText(UIPlugin.getResourceString("_UI_IMPORT_BUTTON"));
-
- GridData gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- importButton.setLayoutData(gridData);
- importButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- FileSystemImportWizard importWizard =
- new FileSystemImportWizard();
- importWizard.init(workbench, selection);
- Shell shell = Display.getCurrent().getActiveShell();
- WizardDialog wizardDialog =
- new WizardDialog(shell, importWizard);
- wizardDialog.create();
- wizardDialog.open();
- sourceFileViewer.refresh();
- }
- });
- importButton.setToolTipText(
- UIPlugin.getResourceString("_UI_IMPORT_BUTTON_TOOL_TIP"));
- }
-
- public void addSelectedFilesToTargetList() {
- ISelection selection = sourceFileViewer.getSelection();
-
- if (isValidSourceFileViewerSelection(selection)) {
- java.util.List list = null;
- if (selection instanceof IStructuredSelection) {
- list = ((IStructuredSelection) selection).toList();
-
- if (list != null) {
- list = ((IStructuredSelection) selection).toList();
- for (Iterator i = list.iterator(); i.hasNext();) {
- IResource resource = (IResource) i.next();
- if (resource instanceof IFile) {
- // Check if its in the list. Don't add it if it is.
- String resourceName =
- resource.getFullPath().toString();
- if (selectedListBox.indexOf(resourceName) == -1)
- selectedListBox.add(resourceName);
- }
- }
- setFiles(selectedListBox.getItems());
- }
-
- setAddButtonEnabled(false);
-
- if (selectedListBox.getItemCount() > 0) {
- removeAllButton.setEnabled(true);
- if (isFileMandatory)
- setPageComplete(true);
- if (selectedListBox.getSelectionCount() > 0)
- setRemoveButtonEnabled(true);
- else
- setRemoveButtonEnabled(false);
- }
- }
- }
- }
-
- class ButtonSelectListener implements SelectionListener {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == addButton) {
- addSelectedFilesToTargetList();
- } else if (e.widget == removeButton) {
- String[] strings = selectedListBox.getSelection();
- int size = selectedListBox.getSelectionCount();
- for (int i = 0; i < size; i++) {
- selectedListBox.remove(strings[i]);
- }
- removeButton.setEnabled(false);
- if (selectedListBox.getItemCount() == 0) {
- removeAllButton.setEnabled(false);
- if (isFileMandatory)
- setPageComplete(false);
- }
- setFiles(selectedListBox.getItems());
- } else if (e.widget == removeAllButton) {
- selectedListBox.removeAll();
- removeButton.setEnabled(false);
- removeAllButton.setEnabled(false);
- if (isFileMandatory)
- setPageComplete(false);
- setFiles(selectedListBox.getItems());
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectSingleFilePage.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectSingleFilePage.java
deleted file mode 100644
index b77cad2..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectSingleFilePage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.viewers;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-//import org.eclipse.ui.help.WorkbenchHelp;
-
-public class SelectSingleFilePage extends WizardPage
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2001, 2002.";
- protected IWorkbench workbench;
- protected SelectSingleFileView selectSingleFileView;
-
- // parameter isFileMandatory is used to determine if a file must be selected
- // before being able to proceed to the next page
- public SelectSingleFilePage(IWorkbench workbench, IStructuredSelection selection, boolean isFileMandatory)
- {
- super("SelectSingleFilePage");
- this.workbench = workbench;
- selectSingleFileView = new SelectSingleFileView(selection, isFileMandatory);
- }
-
- public void setVisible(boolean visible)
- {
- selectSingleFileView.setVisibleHelper(visible);
- super.setVisible(visible);
- }
-
- public void createControl(Composite parent)
- {
- SelectSingleFileView.Listener listener = new SelectSingleFileView.Listener()
- {
- public void setControlComplete(boolean isComplete)
- {
- setPageComplete(isComplete);
- }
- };
- selectSingleFileView.setListener(listener);
- Control control = selectSingleFileView.createControl(parent);
-// WorkbenchHelp.setHelp(control, B2BGUIContextIds.BTBG_SELECT_SINGLE_FILE_PAGE);
- setControl(control);
- }
-
- public void addFilter(ViewerFilter filter)
- {
- selectSingleFileView.addFilter(filter);
- }
-
- public void addFilterExtensions(String[] filterExtensions)
- {
- selectSingleFileView.addFilterExtensions(filterExtensions);
- }
-
- public void resetFilters()
- {
- selectSingleFileView.resetFilters();
- }
-
- public IFile getFile()
- {
- return selectSingleFileView.getFile();
- }
-
-
- /**
- * Returns the selectSingleFileView.
- * @return SelectSingleFileView
- */
- public TreeViewer getSourceFileViewer() {
- return selectSingleFileView.sourceFileViewer;
- }
-
- /**
- * Returns the selectSingleFileView.
- * @return SelectSingleFileView
- */
- public SelectSingleFileView getSelectSingleFileView() {
- return selectSingleFileView;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectSingleFileView.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectSingleFileView.java
deleted file mode 100644
index b7cb3f0..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/SelectSingleFileView.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.viewers;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.wizards.datatransfer.FileSystemImportWizard;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-
-
-public class SelectSingleFileView
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2001, 2002.";
- protected Composite composite;
- protected IStructuredSelection selection;
- protected boolean isFileMandatory;
- protected TreeViewer sourceFileViewer;
- protected Button importButton;
- protected Vector fFilters;
- protected IFile selectedFile;
- protected ISelection defaultSelection;
- protected Listener listener;
-
- public static interface Listener
- {
- public void setControlComplete(boolean isComplete);
- }
-
- public SelectSingleFileView(IStructuredSelection selection, boolean isFileMandatory)
- {
- this.selection = selection;
- this.isFileMandatory = isFileMandatory;
- this.selectedFile= null;
- this.defaultSelection = null;
- }
-
- public Composite createControl(Composite parent)
- {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- Label label = new Label(composite, SWT.NONE);
- label.setText(UIPlugin.getResourceString("_UI_LABEL_SOURCE_FILES"));
- createSourceViewer(composite);
- createFilterControl(composite);
- createImportButton(composite);
- return composite;
- }
-
-
- protected void createFilterControl(Composite composite)
- {
- }
-
-public void setListener(Listener listener)
- {
- this.listener = listener;
- }
-
- protected void createSourceViewer(Composite parent)
- {
- sourceFileViewer = new TreeViewer(new Tree(parent, SWT.SINGLE | SWT.BORDER));
- sourceFileViewer.setContentProvider(new WorkbenchContentProvider());
- sourceFileViewer.setLabelProvider(new WorkbenchLabelProvider());
- sourceFileViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- boolean isComplete = true;
- java.util.List list;
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- list = ((IStructuredSelection)selection).toList();
- for (Iterator i = list.iterator(); i.hasNext();)
- {
- IResource resource = (IResource) i.next();
- if (resource instanceof IFile)
- {
- selectedFile = (IFile) resource;
- if (isFileMandatory)
- {
- isComplete = true;
- break;
- }
- }
- else
- {
- selectedFile = null;
- if (isFileMandatory)
- {
- isComplete = false;
- }
- }
- }
-
- if (listener != null)
- {
- listener.setControlComplete(isComplete);
- }
- }
- }
- });
- Control treeWidget = sourceFileViewer.getTree();
- GridData gd = new GridData(GridData.FILL_BOTH);
- treeWidget.setLayoutData(gd);
- }
-
-
- protected void createImportButton(Composite parent)
- {
- importButton = new Button(parent, SWT.NONE);
- importButton.setText(UIPlugin.getResourceString("_UI_IMPORT_BUTTON"));
-
- GridData gridData = new GridData();
- gridData.horizontalAlignment = GridData.CENTER;
- importButton.setLayoutData(gridData);
- importButton.addSelectionListener(new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- // This listener is if the Import Wizard adds a new few, we want
- // it to be selected when we come back from it
- ImportAddResourceListener importAddResourceListener= new ImportAddResourceListener();
-
- ResourcesPlugin.getWorkspace().addResourceChangeListener(importAddResourceListener);
-
- FileSystemImportWizard importWizard = new FileSystemImportWizard();
- IWorkbench workbench = UIPlugin.getDefault().getWorkbench();
- selection = (IStructuredSelection) sourceFileViewer.getSelection();
- importWizard.init(workbench, selection != null ? selection : new StructuredSelection());
- Shell shell = Display.getCurrent().getActiveShell();
- WizardDialog wizardDialog = new WizardDialog(shell, importWizard);
- wizardDialog.create();
- wizardDialog.open();
- sourceFileViewer.refresh();
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(importAddResourceListener);
- IFile importedFile = importAddResourceListener.getImportedFile();
- if (importedFile != null)
- {
- StructuredSelection structuredSelection = new StructuredSelection(importedFile);
- sourceFileViewer.setSelection(structuredSelection);
- }
- }
- });
- importButton.setToolTipText(UIPlugin.getResourceString("_UI_IMPORT_BUTTON_TOOL_TIP"));
- }
-
- public IFile getFile()
- {
- return selectedFile;
- }
-
- public void setDefaultSelection(ISelection selection)
- {
- this.defaultSelection = selection;
- }
-
- public void resetFilters()
- {
- fFilters=null;
- }
-
- public void addFilter(ViewerFilter filter)
- {
- if (fFilters == null)
- {
- fFilters= new Vector();
- }
- fFilters.add(filter);
- }
-
- // This is a convenience method that allows filtering of the given file
- // exensions. It internally creates a ResourceFilter so that users of this
- // class don't have to construct one.
- // If the extensions provided don't have '.', one will be added.
- public void addFilterExtensions(String[] filterExtensions)
- {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions = new String[filterExtensions.length];
- for (int i=0; i < filterExtensions.length; i++)
- {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- {
- correctedFilterExtensions[i] = filterExtensions[i];
- }
- else
- {
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
- }
-
- ViewerFilter filter = new ResourceFilter(correctedFilterExtensions, null);
- addFilter(filter);
- }
-
-// This is a convenience method that allows filtering of the given file
-// exensions. It internally creates a ResourceFilter so that users of this
-// class don't have to construct one.
-// If the extensions provided don't have '.', one will be added.
- public void addFilterExtensions(String[] filterExtensions, IFile [] excludedFiles)
- {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions = new String[filterExtensions.length];
- for (int i=0; i < filterExtensions.length; i++)
- {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- {
- correctedFilterExtensions[i] = filterExtensions[i];
- }
- else
- {
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
- }
- ViewerFilter filter;
- if (excludedFiles != null)
- {
- filter = new ResourceFilter(correctedFilterExtensions, excludedFiles, null);
- }
- else
- {
- filter = new ResourceFilter(correctedFilterExtensions, null);
- }
- addFilter(filter);
- }
-
- // This is a convenience method that allows filtering of the given file
- // exensions. It internally creates a ResourceFilter so that users of this
- // class don't have to construct one.
- // If the extensions provided don't have '.', one will be added.
- public void setFilterExtensions(String[] filterExtensions)
- {
- // First add the '.' to the filterExtensions if they don't already have one
- String[] correctedFilterExtensions = new String[filterExtensions.length];
- for (int i=0; i < filterExtensions.length; i++)
- {
- // If the extension doesn't start with a '.', then add one.
- if (filterExtensions[i].startsWith("."))
- {
- correctedFilterExtensions[i] = filterExtensions[i];
- }
- else
- {
- correctedFilterExtensions[i] = "." + filterExtensions[i];
- }
- }
- ViewerFilter filter = new ResourceFilter(correctedFilterExtensions, null);
- fFilters= new Vector();
- fFilters.add(filter);
- if (sourceFileViewer != null)
- {
- sourceFileViewer.getTree().setRedraw(false);
- sourceFileViewer.resetFilters();
- for (Iterator i=fFilters.iterator(); i.hasNext();)
- {
- sourceFileViewer.addFilter((ViewerFilter)i.next());
- }
- sourceFileViewer.getTree().setRedraw(true);
- sourceFileViewer.getTree().redraw();
- }
- }
-
- // this method should be called by a Wizard page or Dialog when it becomes visible
- public void setVisibleHelper(boolean visible)
- {
- if (visible == true)
- {
- if (fFilters != null)
- {
- sourceFileViewer.resetFilters();
- for (Iterator i=fFilters.iterator(); i.hasNext();)
- sourceFileViewer.addFilter((ViewerFilter)i.next());
- }
- sourceFileViewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
- sourceFileViewer.expandToLevel(2);
-
- if (defaultSelection != null)
- {
- sourceFileViewer.setSelection(defaultSelection, true);
- }
- else if (!sourceFileViewer.getSelection().isEmpty())
- {
- sourceFileViewer.setSelection(sourceFileViewer.getSelection());
- }
- else
- {
- if (isFileMandatory && listener != null)
- {
- listener.setControlComplete(false);
- }
- }
- }
- }
-
- class ImportAddResourceListener implements IResourceChangeListener, IResourceDeltaVisitor
- {
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- Vector importedFiles;
-
- ImportAddResourceListener()
- {
- importedFiles = new Vector();
- }
-
- public void resourceChanged(IResourceChangeEvent event)
- {
- IResourceDelta resourceDelta = event.getDelta();
-
- try
- {
- if (resourceDelta != null)
- {
- resourceDelta.accept(this);
- }
- }
- catch (Exception e)
- {
- //TODO... log exception
- //UIPlugin.getMsgLogger().write("Exception caught during resource change" + e);
- //UIPlugin.getMsgLogger().writeCurrentThread();
- }
- }
-
- public boolean visit(IResourceDelta delta)
- {
- if (delta.getKind() == IResourceDelta.ADDED)
- {
- if (delta.getResource() instanceof IFile)
- importedFiles.add(delta.getResource());
- }
- return true;
- }
-
- public Collection getImportedFiles()
- {
- return importedFiles;
- }
-
- // This returns the first imported file in the list of imported files
- public IFile getImportedFile()
- {
- if (importedFiles.isEmpty() == false)
- return (IFile)importedFiles.firstElement();
-
- return null;
- }
- }
-
- public void addSelectionChangedTreeListener(ISelectionChangedListener treeListener) {
- sourceFileViewer.addSelectionChangedListener(treeListener);
- }
-}
-
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/TableNavigator.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/TableNavigator.java
deleted file mode 100644
index 0b07833..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/viewers/TableNavigator.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.viewers;
-
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.swt.custom.TableCursor;
-import org.eclipse.swt.custom.TableTreeItem;
-import org.eclipse.jface.viewers.*;
-
-
- /**
- * Adds a TableCursor to a StructuredViewer - for keyboard navigation of the table
- * The intent of this class is to provide the standard listeners for using F2 to
- * activate cell editors.
- *
- * Due to a current bug in the TableCursor, TableViewers using this class must make
- * a call similar to the TableNavigator method moveCellEditorsAbove(cellEditors)
- * whenever a setCellEditors call is made in the StructuredViewer. This is so that the
- * cell editor control shows up above the table cursor control.
- */
-
-public class TableNavigator extends TableCursor
-{
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static final String TABLETREEITEM_ID = "TableTreeItemID";
-
- final Table table;
-
- public TableNavigator(Table table, StructuredViewer viewer)
- {
- super(table, SWT.NONE);
- this.table = table;
- final Table currentTable = table;
- final StructuredViewer sViewer = viewer;
-
- // Linux index out of bounds fix. See defect 253429, 253433, and more
- setVisible(false);
-
- addPaintListener(viewer);
- addKeyListeners(viewer);
- addMouseListeners(viewer);
- addSelectionListener(new SelectionAdapter()
- {
- /**
- * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
- if (sViewer instanceof TableTreeViewer)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
- StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
- sViewer.setSelection(selection, true);
- }
- }
-
-
- });
- addFocusListener(new FocusAdapter(){
- public void focusGained(FocusEvent e)
- {
- // if e.source is not a child of the table then set selection - this is for tab into viewer
- Object eventSource = e.getSource();
- if (eventSource instanceof Control)
- {
- if (!isChild(currentTable, (Control)eventSource))
- {
- if (currentTable.getItemCount() > 0 && currentTable.getSelectionCount() <= 0)
- {
- if (sViewer instanceof TableTreeViewer)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)getRow().getData(TABLETREEITEM_ID);
- StructuredSelection selection = new StructuredSelection(tableTreeItem.getData());
- sViewer.setSelection(selection, true);
- }
- else
- {
- currentTable.setSelection(0);
- setSelection(0,0);
- }
- }
- }
- else
- {
- if (currentTable.getItems().length > 0)
- {
- // cursor can end up on a non-existent table row
- // currently no way to get the current table cursor row
- // so for now just catch the exception since it doesn't
- // cause any side effects.
- try
- {
- setVisible(true);
- }
- catch (Exception ee)
- {
- currentTable.setSelection(0);
- setSelection(0,0);
- }
- }
- else // do not show table cursor if there are no elements in the table - avoid repaint
- {
- setVisible(false);
- }
- }
- }
- }
-
- protected boolean isChild(Control parent, Control child)
- {
- Control tempChild = child;
- while (tempChild != null)
- {
- if (tempChild == parent)
- {
- return true;
- }
- tempChild = tempChild.getParent();
- }
- return false;
- }
-
- /**
- * @see org.eclipse.swt.events.FocusAdapter#focusLost(FocusEvent)
- */
- public void focusLost(FocusEvent e)
- {
- // Set the table navigator to be not visible if the the table
- // is not in focus and a child of the table is not in focus
- // note that we do this asynchronously so we don't mess up the
- // current focus handling.
- Display.getDefault().asyncExec(new Runnable()
- {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run()
- {
- if (currentTable != null && !currentTable.isDisposed() && !currentTable.isFocusControl() &&
- !isChild(currentTable, Display.getDefault().getFocusControl()))
- {
- setVisible(false);
- }
- }
- });
- }
-
- });
-
-
-
-
- table.addFocusListener(new FocusAdapter()
- {
- /**
- * @see org.eclipse.swt.events.FocusListener#focusGained(FocusEvent)
- */
- public void focusGained(FocusEvent e)
- {
- // only display navigator if there are items in the table
- // and if the focus wasn't gained from our own table navigator
- // (ie focus came from outside)
- if (currentTable.getItemCount() > 0 &&
- (Display.getDefault().getFocusControl() != null) &&
- !Display.getDefault().getFocusControl().equals(TableNavigator.this))
- {
- // note that we do this asynchronously so we don't mess up the
- // current focus handling.
- Display.getDefault().asyncExec(new Runnable()
- {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run()
- {
- if (!isVisible())
- {
- try
- {
- setVisible(true);
- setFocus();
- }
- catch (Exception e)
- {
- // catch IllegalArgumentExceptions here - index out of bounds on tableviewer
- if (currentTable.getItemCount() > 0)
- {
- currentTable.setSelection(0);
- setSelection(0,0);
- }
- else // do not show table cursor if there are no elements in the table - avoid repaint
- {
- setVisible(false);
- }
- }
- }
- }
- });
- }
- }
- });
- }
-
- public Table getTable()
- {
- return table;
- }
-
- public void addPaintListener(StructuredViewer viewer)
- {
- final StructuredViewer tableViewer = viewer;
-
- addPaintListener(new PaintListener()
- {
- public void paintControl(PaintEvent e)
- {
- TableItem[] selection = table.getSelection();
- final TableItem row = (selection.length == 0) ? table.getItem(table.getTopIndex()) : selection[0];
- final String cellText = row.getText(getColumn());
- final Image cellImage = row.getImage(getColumn());
- final int col = getColumn();
-
- Display.getCurrent().asyncExec(new Runnable()
- {
- public void run()
- {
- if (!row.isDisposed())
- {
- String newText = row.getText(getColumn());
- TableItem cursorRow = getRow();
- if (!newText.equals(cellText) || !(row.getImage(col) == cellImage))
- {
- redraw();
- }
- }
- }
- });
- }
- });
- }
-
-
- public SelectionKeyAdapter getKeyAdapter(StructuredViewer viewer)
- {
- if (keyAdapter == null)
- {
- return new SelectionKeyAdapter(viewer);
- }
- else return keyAdapter;
- }
-
- public void setKeyAdapter(SelectionKeyAdapter kAdapter)
- {
- keyAdapter = kAdapter;
- }
-
- protected SelectionKeyAdapter keyAdapter = null;
-
- public class SelectionKeyAdapter extends KeyAdapter
- {
- StructuredViewer structuredViewer;
-
- public SelectionKeyAdapter(StructuredViewer viewer)
- {
- super();
- this.structuredViewer = viewer;
- }
-
- int lastKeyPressed = -1; // used to cache the last key for key combos
-
- public void keyPressed(KeyEvent e)
- {
- TableItem row = getRow();
- int column = getColumn();
-
- // hack to emulate SHIFT+F10 popup menu - otherwise table cursor
- // obscures the table popup mechanism and it doesn't work.
- if (lastKeyPressed == SWT.SHIFT && e.keyCode == SWT.F10)
- {
- Menu popup = getTable().getMenu();
- popup.setVisible(true);
- }
- lastKeyPressed = e.keyCode;
-
- //jvh - look for + or - key
- // column == 0
- if (row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
- {
- if (column == 0 && e.character == '+')
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), true);
- refresh();
- }
- else if (column == 0 && e.character == '-')
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), false);
- refresh();
- }
- }
- // use F2 to invoke editing for a cell
- if (e.keyCode == SWT.F2)
- {
- if (structuredViewer instanceof TableViewer)
- {
- ((TableViewer)structuredViewer).editElement(row.getData(), column);
- }
- else if (structuredViewer instanceof TableTreeViewer)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
- }
- }
- }
- }
-
- public void addKeyListeners(StructuredViewer viewer)
- {
- final StructuredViewer structuredViewer = viewer;
-
- addKeyListener(getKeyAdapter(structuredViewer));
- }
-
- public void addMouseListeners(StructuredViewer viewer)
- {
- final StructuredViewer structuredViewer = viewer;
-
- addMouseListener(new MouseAdapter()
- {
-
- public void mouseUp(MouseEvent e)
- {
- TableItem row = getRow();
- int column = getColumn();
-
- // use mouse button 1 to invoke editing for a cell
- if (e.button == 1)
- {
- if (structuredViewer instanceof TableViewer)
- {
- ((TableViewer)structuredViewer).editElement(row.getData(), column);
- }
- else if (structuredViewer instanceof TableTreeViewer && column == 1)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- ((TableTreeViewer)structuredViewer).editElement(tableTreeItem.getData(), column);
- }
-
- if (structuredViewer instanceof TableTreeViewer && row.getData(TABLETREEITEM_ID) instanceof TableTreeItem)
- {
- if (column == 0)
- {
- TableTreeItem tableTreeItem = (TableTreeItem)row.getData(TABLETREEITEM_ID);
- boolean expandState = tableTreeItem.getExpanded();
- ((TableTreeViewer)structuredViewer).setExpandedState(tableTreeItem.getData(), !expandState);
- refresh();
- }
- }
- }
- }
- });
- }
-
-
- /**
- * Ensure that cell editor control shows up above the table cursor control.
- * Should be called whenever the table viewer makes a new call to setCellEditors
- * i.e. in constructor and in refreshCellEditors
- *
- * @param - array of cell editors for the StructuredViewer
- */
-
- public void moveCellEditorsAbove(CellEditor[] editorArray)
- {
- for (int i = 0; i < editorArray.length ; i++)
- {
- CellEditor cEd = editorArray[i];
- if (cEd != null && cEd.getControl() != null)
- {
- cEd.getControl().moveAbove(null);
- }
- }
- }
-
- public void refresh()
- {
- Display.getCurrent().asyncExec(new Runnable()
- {
- public void run()
- {
- if (!isDisposed() && isVisible())
- redraw();
- }
- });
- }
-}
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationOperation.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationOperation.java
deleted file mode 100644
index 7919178..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationOperation.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.wizards;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-import org.eclipse.wst.common.ui.UIPlugin;
-import org.osgi.framework.Bundle;
-
-public class ExampleProjectCreationOperation implements IRunnableWithProgress {
-
- private IResource elementToOpen;
-
- private IOverwriteQuery overwriteQuery;
-
- private ExampleProjectCreationWizardPage[] pages;
-
- /**
- * Constructor for ExampleProjectCreationOperation
- */
- public ExampleProjectCreationOperation(ExampleProjectCreationWizardPage[] myPages, IOverwriteQuery myOverwriteQuery) {
- elementToOpen = null;
- pages = myPages;
- overwriteQuery = myOverwriteQuery;
- }
-
- private IProject configNewProject(IWorkspaceRoot root, String name, String[] natureIds, IProject[] referencedProjects, IProgressMonitor monitor) throws InvocationTargetException {
- try {
- IProject project = root.getProject(name);
- if (!project.exists()) {
- project.create(null);
- }
- if (!project.isOpen()) {
- project.open(null);
- }
- IProjectDescription desc = project.getDescription();
- desc.setLocation(null);
- desc.setNatureIds(natureIds);
- desc.setReferencedProjects(referencedProjects);
-
- project.setDescription(desc, new SubProgressMonitor(monitor, 1));
-
- return project;
- }
- catch (CoreException e) {
- throw new InvocationTargetException(e);
- }
- }
-
- private void createProject(IWorkspaceRoot root, ExampleProjectCreationWizardPage page, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- IConfigurationElement desc = page.getConfigurationElement();
-
- IConfigurationElement[] imports = desc.getChildren("import"); //$NON-NLS-1$
- IConfigurationElement[] natures = desc.getChildren("nature"); //$NON-NLS-1$
- IConfigurationElement[] references = desc.getChildren("references"); //$NON-NLS-1$
- int nImports = (imports == null) ? 0 : imports.length;
- int nNatures = (natures == null) ? 0 : natures.length;
- int nReferences = (references == null) ? 0 : references.length;
-
- monitor.beginTask(UIPlugin.getResourceString("ExampleProjectCreationOperation.op_desc_proj"), nImports + 1); //$NON-NLS-1$
-
- String name = page.getProjectName();
-
- String[] natureIds = new String[nNatures];
- for (int i = 0; i < nNatures; i++) {
- natureIds[i] = natures[i].getAttribute("id"); //$NON-NLS-1$
- }
- IProject[] referencedProjects = new IProject[nReferences];
- for (int i = 0; i < nReferences; i++) {
- referencedProjects[i] = root.getProject(references[i].getAttribute("id")); //$NON-NLS-1$
- }
-
- IProject proj = configNewProject(root, name, natureIds, referencedProjects, monitor);
-
- for (int i = 0; i < nImports; i++) {
- doImports(proj, imports[i], new SubProgressMonitor(monitor, 1));
- }
-
- String open = desc.getAttribute("open"); //$NON-NLS-1$
- if (open != null && open.length() > 0) {
- IResource fileToOpen = proj.findMember(new Path(open));
- if (fileToOpen != null) {
- elementToOpen = fileToOpen;
- }
- }
-
- }
-
- private void doImports(IProject project, IConfigurationElement curr, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- IPath destPath;
- String name = curr.getAttribute("dest"); //$NON-NLS-1$
- if (name == null || name.length() == 0) {
- destPath = project.getFullPath();
- }
- else {
- IFolder folder = project.getFolder(name);
- if (!folder.exists()) {
- folder.create(true, true, null);
- }
- destPath = folder.getFullPath();
- }
- String importPath = curr.getAttribute("src"); //$NON-NLS-1$
- if (importPath == null) {
- importPath = ""; //$NON-NLS-1$
- UIPlugin.log("projectsetup descriptor: import missing"); //$NON-NLS-1$
- return;
- }
-
- ZipFile zipFile = getZipFileFromPluginDir(importPath, getContributingPlugin(curr));
- importFilesFromZip(zipFile, destPath, new SubProgressMonitor(monitor, 1));
- }
- catch (CoreException e) {
- throw new InvocationTargetException(e);
- }
- }
-
- private String getContributingPlugin(IConfigurationElement configurationElement) {
- Object parent = configurationElement;
- while (parent != null) {
- if (parent instanceof IExtension)
- return ((IExtension) parent).getNamespace();
- parent = ((IConfigurationElement) parent).getParent();
- }
- return null;
- }
-
- public IResource getElementToOpen() {
- return elementToOpen;
- }
-
- private ZipFile getZipFileFromPluginDir(String pluginRelativePath, String symbolicName) throws CoreException {
- try {
- Bundle bundle = Platform.getBundle(symbolicName);
- URL starterURL = new URL(bundle.getEntry("/"), pluginRelativePath); //$NON-NLS-1$
- return new ZipFile(Platform.asLocalURL(starterURL).getFile());
- }
- catch (IOException e) {
- String message = pluginRelativePath + ": " + e.getMessage(); //$NON-NLS-1$
- Status status = new Status(IStatus.ERROR, UIPlugin.getPluginId(), IStatus.ERROR, message, e);
- throw new CoreException(status);
- }
- }
-
- private void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- ZipFileStructureProvider structureProvider = new ZipFileStructureProvider(srcZipFile);
- ImportOperation op = new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, overwriteQuery);
- op.run(monitor);
- }
-
- /*
- * @see IRunnableWithProgress#run(IProgressMonitor)
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- try {
- monitor.beginTask(UIPlugin.getResourceString("ExampleProjectCreationOperation.op_desc"), pages.length); //$NON-NLS-1$
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
- for (int i = 0; i < pages.length; i++) {
- createProject(root, pages[i], new SubProgressMonitor(monitor, 1));
- }
- }
- finally {
- monitor.done();
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationWizard.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationWizard.java
deleted file mode 100644
index 2dda34c..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationWizard.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-public class ExampleProjectCreationWizard extends BasicNewResourceWizard implements INewWizard, IExecutableExtension {
-
- private class ImportOverwriteQuery implements IOverwriteQuery {
-
- private int openDialog(final String file) {
- final int[] result = {IDialogConstants.CANCEL_ID};
- getShell().getDisplay().syncExec(new Runnable() {
- public void run() {
- String title = UIPlugin.getResourceString("ExampleProjectCreationWizard.overwritequery.title"); //$NON-NLS-1$
- String msg = UIPlugin.getString("ExampleProjectCreationWizard.overwritequery.message", file); //$NON-NLS-1$
- String[] options = {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.CANCEL_LABEL};
- MessageDialog dialog = new MessageDialog(getShell(), title, null, msg, MessageDialog.QUESTION, options, 0);
- result[0] = dialog.open();
- }
- });
- return result[0];
- }
-
- public String queryOverwrite(String file) {
- String[] returnCodes = {YES, NO, ALL, CANCEL};
- int returnVal = openDialog(file);
- return returnVal < 0 ? CANCEL : returnCodes[returnVal];
- }
- }
-
- private IConfigurationElement wizardConfigElement;
- private IConfigurationElement exampleConfigElement;
-
- private String EXAMPLE_WIZARD_XP_ID = "org.eclipse.wst.common.ui.exampleProjectCreationWizard"; //$NON-NLS-1$
-
- private ExampleProjectCreationWizardPage[] pages;
-
- private final String WEB_BROWSER_ID = "org.eclipse.wst.internet.webbrowser"; //$NON-NLS-1$
-
- public ExampleProjectCreationWizard() {
- super();
- setDialogSettings(UIPlugin.getDefault().getDialogSettings());
- setWindowTitle(UIPlugin.getResourceString("ExampleProjectCreationWizard.title")); //$NON-NLS-1$
- setNeedsProgressMonitor(true);
- }
-
- /*
- * @see Wizard#addPages
- */
- public void addPages() {
- super.addPages();
-
- if(exampleConfigElement == null) return;
- IConfigurationElement[] children = exampleConfigElement.getChildren("projectsetup"); //$NON-NLS-1$
- if (children == null || children.length == 0) {
- UIPlugin.log("descriptor must contain one ore more projectsetup tags"); //$NON-NLS-1$
- return;
- }
-
- pages = new ExampleProjectCreationWizardPage[children.length];
-
- for (int i = 0; i < children.length; i++) {
- pages[i] = new ExampleProjectCreationWizardPage(i, children[i]);
- addPage(pages[i]);
- }
- }
-
- protected IConfigurationElement[] getExtendedConfigurationElements() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint exampleWizardXP = registry.getExtensionPoint(EXAMPLE_WIZARD_XP_ID);
- if(exampleWizardXP == null){
- return new IConfigurationElement[0];
- }
- IExtension extension = exampleWizardXP.getExtension(getWizardExtensionId());
- if(extension != null){
- return extension.getConfigurationElements();
- }
- IConfigurationElement[] exampleWizardCEs = exampleWizardXP.getConfigurationElements();
- return exampleWizardCEs;
- }
-
- protected ImageDescriptor getImageDescriptor(String banner) {
- return UIPlugin.getDefault().getImageDescriptor(banner);
- }
-
- private void handleException(Throwable target) {
- String title = UIPlugin.getResourceString("ExampleProjectCreationWizard.op_error.title"); //$NON-NLS-1$
- String message = UIPlugin.getResourceString("ExampleProjectCreationWizard.op_error.message"); //$NON-NLS-1$
- if (target instanceof CoreException) {
- IStatus status = ((CoreException) target).getStatus();
- ErrorDialog.openError(getShell(), title, message, status);
- UIPlugin.log(status);
- }
- else {
- MessageDialog.openError(getShell(), title, target.getMessage());
- UIPlugin.log(target);
- }
- }
-
- public void initializeDefaultPageImageDescriptor() {
- if (exampleConfigElement != null) {
- String banner = exampleConfigElement.getAttribute("banner"); //$NON-NLS-1$
- if (banner != null) {
- URL imageURL = Platform.find(Platform.getBundle(exampleConfigElement.getDeclaringExtension().getNamespace()), new Path(banner));
- ImageDescriptor desc = ImageDescriptor.createFromURL(imageURL);
- setDefaultPageImageDescriptor(desc);
- }
- }
- }
-
- private void openResource(final IResource resource) {
- if (resource.getType() != IResource.FILE) {
- return;
- }
- IWorkbenchWindow window = UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window == null) {
- return;
- }
- final IWorkbenchPage activePage = window.getActivePage();
- if (activePage != null) {
- final Display display = getShell().getDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- try {
- IDE.openEditor(activePage, (IFile) resource, WEB_BROWSER_ID, true);
- }
- catch (PartInitException e) {
- UIPlugin.log(e);
- }
- }
- });
- BasicNewResourceWizard.selectAndReveal(resource, activePage.getWorkbenchWindow());
- }
- }
-
- /*
- * @see Wizard#performFinish
- */
- public boolean performFinish() {
- ExampleProjectCreationOperation runnable = new ExampleProjectCreationOperation(pages, new ImportOverwriteQuery());
-
- IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(runnable);
- try {
- getContainer().run(false, true, op);
- }
- catch (InvocationTargetException e) {
- handleException(e.getTargetException());
- return false;
- }
- catch (InterruptedException e) {
- return false;
- }
- BasicNewProjectResourceWizard.updatePerspective(wizardConfigElement);
- IResource res = runnable.getElementToOpen();
- if (res != null) {
- openResource(res);
- }
- return true;
- }
-
- /**
- * Stores the configuration element for the wizard. The config element
- * will be used in <code>performFinish</code> to set the result
- * perspective.
- */
- public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
- wizardConfigElement = cfig;
- String title = wizardConfigElement.getAttribute("name"); //$NON-NLS-1$
- if (title != null) {
- setWindowTitle(title);
- }
- String wizardId = getWizardExtensionId(); //$NON-NLS-1$
- IConfigurationElement[] exampleWizardCEs = getExtendedConfigurationElements();
- for (int i = 0; i < exampleWizardCEs.length; i++) {
- IConfigurationElement element = exampleWizardCEs[i];
- String extWizardId = element.getAttribute("id"); //$NON-NLS-1$
- if(wizardId != null && extWizardId != null && wizardId.equals(extWizardId)){
- exampleConfigElement = element;
- }
- }
-// initializeDefaultPageImageDescriptor();
- }
-
- public String getWizardExtensionId(){
- return wizardConfigElement.getAttribute("id"); //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationWizardPage.java b/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationWizardPage.java
deleted file mode 100644
index b2926ab..0000000
--- a/plugins/org.eclipse.wst.common.ui/src/org/eclipse/wst/common/ui/wizards/ExampleProjectCreationWizardPage.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-
-package org.eclipse.wst.common.ui.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.eclipse.wst.common.ui.UIPlugin;
-
-public class ExampleProjectCreationWizardPage extends WizardNewProjectCreationPage {
-
- private IConfigurationElement configurationElement;
-
- public ExampleProjectCreationWizardPage(int pageNumber, IConfigurationElement elem) {
-
- super("page" + pageNumber); //$NON-NLS-1$
- configurationElement = elem;
-
- String name = getAttribute(elem, "name"); //$NON-NLS-1$
- setInitialProjectName(calculateInitialProjectName(name));
-
- setDescription(getAttribute(configurationElement, "pagedescription")); //$NON-NLS-1$
- setTitle(getAttribute(configurationElement, "pagetitle")); //$NON-NLS-1$
-
- }
-
- /*
- * Set the default project name that is to appear on the initialPage page
- * of this wizard.
- */
- protected String calculateInitialProjectName(String projectName) {
- IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (!projectHandle.exists()) {
- return projectName;
- }
- // Change the name until it doesn't exists. Try 9 times and then
- // give up.
- for (int i = 1; i < 10; i++) {
- projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName + i);
- if (!projectHandle.exists()) {
- return projectName + i;
- }
- }
- return projectName + "9"; //$NON-NLS-1$
-
- }
-
- private String getAttribute(IConfigurationElement elem, String tag) {
- String res = elem.getAttribute(tag);
- if (res == null) {
- return '!' + tag + '!';
- }
- return res;
- }
-
-
-
- /**
- * Returns the configuration element of this page.
- *
- * @return Returns a IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement() {
- return configurationElement;
- }
-
- /**
- * @see org.eclipse.ui.dialogs.WizardNewProjectCreationPage#validatePage()
- */
- protected boolean validatePage() {
- if (!super.validatePage())
- return false;
-
- String projectName = getProjectName();
- if (projectName == null)
- return false;
-
- IWizard wizard = getWizard();
- if (wizard instanceof ExampleProjectCreationWizard) {
- IWizardPage[] pages = wizard.getPages();
- for (int i = 0; i < pages.length; i++) {
- if ((pages[i] != this) && (pages[i] instanceof ExampleProjectCreationWizardPage)) {
- if (projectName.equals(((ExampleProjectCreationWizardPage) pages[i]).getProjectName())) {
- setErrorMessage(UIPlugin.getResourceString("ExampleProjectCreationWizardPage.error.alreadyexists")); //$NON-NLS-1$
- return false;
- }
- }
- }
- }
-
- return true;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.classpath b/plugins/org.eclipse.wst.common.uriresolver/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.cvsignore b/plugins/org.eclipse.wst.common.uriresolver/.cvsignore
deleted file mode 100644
index 5b853a4..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-uriresolver.jar
-build.xml
-temp.folder
-org.eclipse.wst.common.uriresolver_1.0.0.jar
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.project b/plugins/org.eclipse.wst.common.uriresolver/.project
deleted file mode 100644
index e19b693..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.uriresolver</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/README.txt b/plugins/org.eclipse.wst.common.uriresolver/README.txt
deleted file mode 100644
index acaf514..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-API for an URI resolver.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.uriresolver/build.properties b/plugins/org.eclipse.wst.common.uriresolver/build.properties
deleted file mode 100644
index 08364ab..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = plugin.xml,\
- uriresolver.jar
-jars.compile.order = uriresolver.jar
-source.uriresolver.jar = src/
-output.uriresolver.jar = bin/
diff --git a/plugins/org.eclipse.wst.common.uriresolver/plugin.xml b/plugins/org.eclipse.wst.common.uriresolver/plugin.xml
deleted file mode 100644
index 820fba0..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.common.uriresolver"
- name="org.eclipse.wst.common.uriresolver"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.wst.common.uriresolver.URIResolverPlugin">
-
- <runtime>
- <library name="uriresolver.jar">
- <export name="*" />
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- </requires>
-
-
- <extension-point id="resolverExtensions" name="URI Resolver Extension"/>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolver.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolver.java
deleted file mode 100644
index 88451b2..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolver.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver;
-
-/**
- * A URIResolver is used to resolve URI references to resources.
- *
- */
-public interface URIResolver {
-
- /**
- * @param baseLocation - the location of the resource that contains the uri
- * @param publicId - an optional public identifier (i.e. namespace name), or null if none
- * @param systemId - an absolute or relative URI, or null if none
- * @return an absolute URI
- */
- public String resolve(String baseLocation, String publicId, String systemId);
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolverExtension.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolverExtension.java
deleted file mode 100644
index 377a144..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolverExtension.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * An extension to augment the behaviour of a URIResolver. Extensions are project aware
- * so that they can apply specialized project specific resolving rules.
- */
-public interface URIResolverExtension {
- public String resolve(IProject project, String baseLocation, String publicId, String systemId);
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolverPlugin.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolverPlugin.java
deleted file mode 100644
index e652718..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/URIResolverPlugin.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.uriresolver.internal.ExtensibleURIResolver;
-import org.eclipse.wst.common.uriresolver.internal.URIResolverExtensionRegistry;
-import org.eclipse.wst.common.uriresolver.internal.URIResolverExtensionRegistryReader;
-
-
-public class URIResolverPlugin extends Plugin {
- protected static URIResolverPlugin instance;
- protected URIResolverExtensionRegistry xmlResolverExtensionRegistry;
-
- public static URIResolverPlugin getInstance()
- {
- return instance;
- }
-
- public URIResolverPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- instance = this;
- }
-
-
- public static URIResolver createResolver()
- {
- return createResolver(null);
- }
-
- public static URIResolver createResolver(Map properties)
- {
- // TODO... utilize properties
- return new ExtensibleURIResolver();
- }
-
- //public static URIResolver createResolver(IProject project)
- //{
- // return new ExtensibleURIResolver(project);
- //}
-
- public URIResolverExtensionRegistry getXMLResolverExtensionRegistry()
- {
- if (xmlResolverExtensionRegistry == null)
- {
- xmlResolverExtensionRegistry = new URIResolverExtensionRegistry();
- new URIResolverExtensionRegistryReader(xmlResolverExtensionRegistry).readRegistry();
- }
- return xmlResolverExtensionRegistry;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/ExtensibleURIResolver.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/ExtensibleURIResolver.java
deleted file mode 100644
index a16713a..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/ExtensibleURIResolver.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.uriresolver.URIResolver;
-import org.eclipse.wst.common.uriresolver.URIResolverExtension;
-import org.eclipse.wst.common.uriresolver.URIResolverPlugin;
-
-
-/**
- * @author csalter
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExtensibleURIResolver implements URIResolver
-{
-
- //protected IProject project;
-
- //TODO... consider ctor that takes a project arg
- //public ExtensibleURIResolver(IProject project)
- //{
- // this.project = project;
- //}
-
- public ExtensibleURIResolver()
- {
- }
-
- public String resolve(String baseLocation, String publicId, String systemId)
- {
- String result = systemId;
-
- // compute the project that holds the resource
- //
- IProject project = computeProject(baseLocation);
- String fileName = null; // todo.. get the file name for systemId
-
- URIResolverExtensionRegistry resolverRegistry = URIResolverPlugin.getInstance().getXMLResolverExtensionRegistry();
- List list = resolverRegistry.getExtensionDescriptors(project);
-
- // get the list of applicable pre-normalized resolvers from the
- // extension registry
- //
- for (Iterator i = resolverRegistry.getMatchingURIResolvers(list, URIResolverExtensionRegistry.STAGE_PRENORMALIZATION).iterator(); i.hasNext();)
- {
- URIResolverExtension resolver = (URIResolverExtension) i.next();
- result = resolver.resolve(project, baseLocation, publicId, result);
- }
-
- // normalize the uri
- //
- result = normalize(baseLocation, result);
-
- // get the list of applicable post-normalized resolvers from the
- // extension registry
- //
- for (Iterator i = resolverRegistry.getMatchingURIResolvers(list, URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION).iterator(); i.hasNext();)
- {
- URIResolverExtension resolver = (URIResolverExtension) i.next();
- result = resolver.resolve(project, baseLocation, publicId, result);
- }
-
- return result;
- }
-
- protected String normalize(String baseLocation, String systemId)
- {
- // If no systemId has been specified there is nothing to do
- // so return null;
- if(systemId == null)
- return null;
- String result = systemId;
- // normalize the URI
- URI systemURI = URI.createURI(systemId);
- if (systemURI.isRelative())
- {
- URI baseURI = URI.createURI(baseLocation);
- try
- {
- result = systemURI.resolve(baseURI).toString();
- }
- catch(IllegalArgumentException e)
- {}
-
- }
- return result;
- }
-
- protected IProject computeProject(String baseLocation)
- {
- if(baseLocation != null)
- {
- String pattern = "file:///";
- if (baseLocation.startsWith(pattern))
- {
- baseLocation = baseLocation.substring(pattern.length());
- }
- IPath path = new Path(baseLocation);
- //path = path.removeFirstSegments(1);
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
- //IContainer c =
- // ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(path);
- return file != null ? file.getProject() : null;
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URI.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URI.java
deleted file mode 100644
index 3aac823..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URI.java
+++ /dev/null
@@ -1,2019 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.io.File;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A representation of a Uniform Resource Identifier (URI), as specified by
- * <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>, with certain
- * enhancements. A <code>URI</code> instance can be created by specifying
- * values for its components, or by providing a single URI string, which is
- * parsed into its components. Static factory methods whose names begin
- * with "create" are used for both forms of object creation. No public or
- * protected constructors are provided; this class can not be subclassed.
- *
- * <p>Like <code>String</code>, <code>URI</code> is an immutable class;
- * a <code>URI</code> instance offers several by-value methods that return a
- * new <code>URI</code> object based on its current state. Most useful,
- * a relative <code>URI</code> can be {@link #resolve(URI) resolve}d against
- * a base absolute <code>URI</code> -- the latter typically identifies the
- * document in which the former appears. The inverse to this is {@link
- * #deresolve(URI) deresolve}, which answers the question, "what relative
- * URI will resolve, against the given base, to this absolute URI?"
- *
- * <p>In the <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC</a>, much
- * attention is focused on a hierarchical naming system used widely to
- * locate resources via common protocols such as HTTP, FTP, and Gopher, and
- * to identify files on a local file system. Acordingly, most of this
- * class's functionality is for handling such URIs, which can be identified
- * via {@link #isHierarchical()}.
- *
- * <p><a name="device_explaination">
- * The primary enhancement beyond the RFC description is an optional
- * device component. Instead of treating the device as just another segment
- * in the path, it can be stored as a separate component (almost a
- * sub-authority), with the root below it. For example, resolving
- * <code>/bar</code> against <code>file:///c:/foo</code> would result in
- * <code>file:///c:/bar</code> being returned. Also, you cannot take
- * the parent of a device, so resolving <code>..</code> against
- * <code>file:///c:/</code> would not yield <code>file:///</code>, as you
- * might expect. This feature is useful when working with file-scheme
- * URIs, as devices do not typically occur in protocol-based ones. A
- * device-enabled <code>URI</code> can be created by parsing a string with
- * {@link #createURI} or by specifying a non-null <code>device</code>
- * paramter for either the {@link #createHierarchicalURI(String, String,
- * String, String, String) no-path} or the {@link
- * #createHierarchicalURI(String, String, String, String[], String, String)
- * absolute-path} form of <code>createHierarchicalURI()</code>.
- *
- * <p>Compared to the RFC description, this implementation is quite relaxed
- * about validity. Static methods whose names begin with "valid" test
- * whether a given string is a valid value for the various URI components.
- * Presently, these tests place no restrictions beyond what would have been
- * required in order for {@link #createURI} to
- * have parsed them correctly from a single URI string. Note that all of
- * the static factory methods invoke the appropriate validation methods and
- * throw exceptions in response to a negative result, ensuring that
- * invalid URIs are never created.
- *
- * <p>Finally, note the difference between a <code>null</code> parameter to
- * the static factory methods and an empty string. The former signifies the
- * absense of a given URI component, while the latter simply makes the
- * component blank. This can have a significant effect when resolving. For
- * example, consider the following two URIs: <code>/bar</code> (with no
- * authority) and <code>///bar</code> (with a blank authority). Imagine
- * resolving them against a base with an authority, such as
- * <code>http://www.eclipse.org/</code>. The former case will yield
- * <code>http://www.eclipse.org/bar</code>, as the base authority will be
- * preserved. In the latter case, the empty authority will override the
- * base authority, resulting in <code>http:///bar</code>!
- */
-public final class URI
-{
- // Common to all URI types.
- private final int hashCode;
- private final boolean hierarchical;
- private final String scheme; // null -> relative URI reference
- private final String authority;
- private final String fragment;
- private URI cachedTrimFragment;
- private String cachedToString;
-
- // Applicable only to a hierarchical URI.
- private final String device;
- private final boolean absolutePath;
- private final String[] segments; // empty last segment -> trailing separator
- private final String query;
-
- // Identifies a file-type absolute URI.
- private static final String SCHEME_FILE = "file";
- private static final String SCHEME_JAR = "jar";
-
- // Special segment values interpreted at resolve and resolve time.
- private static final String SEGMENT_EMPTY = "";
- private static final String SEGMENT_SELF = ".";
- private static final String SEGMENT_PARENT = "..";
- private static final String[] NO_SEGMENTS = new String[0];
-
- // Separators for parsing a URI string
- private static final char SCHEME_SEPARATOR = ':';
- private static final String AUTHORITY_SEPARATOR = "//";
- private static final char DEVICE_IDENTIFIER = ':';
- private static final char SEGMENT_SEPARATOR = '/';
- private static final char QUERY_SEPARATOR = '?';
- private static final char FRAGMENT_SEPARATOR = '#';
- private static final char USER_INFO_SEPARATOR = '@';
- private static final char PORT_SEPARATOR = ':';
- private static final char FILE_EXTENSION_SEPARATOR = '.';
- private static final char[] MAJOR_SEPARATORS = {
- SCHEME_SEPARATOR, SEGMENT_SEPARATOR, QUERY_SEPARATOR, FRAGMENT_SEPARATOR };
- private static final char[] SEGMENT_END = {
- SEGMENT_SEPARATOR, QUERY_SEPARATOR, FRAGMENT_SEPARATOR };
-
- /**
- * Static factory method for a generic, non-hierarchical URI. There is no
- * concept of a relative non-hierarchical URI; such an object cannot be
- * created.
- *
- * @exception java.lang.IllegalArgumentException if <code>scheme</code> is
- * null, or if <code>scheme</code>, <code>opaquePart</code>, or
- * <code>fragment</code> is not valid according to {@link #validScheme},
- * {@link #validOpaquePart}, or {@link #validFragment}, respectively.
- */
- public static URI createGenericURI(String scheme, String opaquePart,
- String fragment)
- {
- if (scheme == null)
- {
- throw new IllegalArgumentException("relative non-hierarchical URI");
- }
-
- return new URI(false, scheme, opaquePart, null, false, NO_SEGMENTS,
- null, fragment);
- }
-
- /**
- * Static factory method for a hierarchical URI with no path. The
- * URI will be relative if <code>scheme</code> is non-null, and absolute
- * otherwise. An absolute URI with no path requires a non-null
- * <code>authority</code> and/or <code>device</code>.
- *
- * @exception java.lang.IllegalArgumentException if <code>scheme</code> is
- * non-null while <code>authority</code> and <code>device</code> are null,
- * or if <code>scheme</code>, <code>authority</code>, <code>device</code>,
- * <code>query</code>, or <code>fragment</code> is not valid according to
- * {@link #validScheme}, {@link #validAuthority}, {@link #validDevice},
- * {@link #validQuery}, or {@link #validFragment}, respectively.
- */
- public static URI createHierarchicalURI(String scheme, String authority,
- String device, String query,
- String fragment)
- {
- if (scheme != null && authority == null && device == null)
- {
- throw new IllegalArgumentException(
- "absolute hierarchical URI without authority, device, path");
- }
-
- return new URI(true, scheme, authority, device, false, NO_SEGMENTS,
- query, fragment);
- }
-
- /**
- * Static factory method for a hierarchical URI with absolute path.
- * The URI will be relative if <code>scheme</code> is non-null, and
- * absolute otherwise.
- *
- * @param segments an array of non-null strings, each representing one
- * segment of the path. As an absolute path, it is automatically
- * preceeded by a <code>/</code> separator. If desired, a trailing
- * separator should be represented by an empty-string segment as the last
- * element of the array.
- *
- * @exception java.lang.IllegalArgumentException if <code>scheme</code>,
- * <code>authority</code>, <code>device</code>, <code>segments</code>,
- * <code>query</code>, or <code>fragment</code> is not valid according to
- * {@link #validScheme}, {@link #validAuthority}, {@link #validDevice},
- * {@link #validSegments}, {@link #validQuery}, or {@link #validFragment},
- * respectively.
- */
- public static URI createHierarchicalURI(String scheme, String authority,
- String device, String[] segments,
- String query, String fragment)
- {
- return new URI(true, scheme, authority, device, true, fix(segments),
- query, fragment);
- }
-
- /**
- * Static factory method for a relative hierarchical URI with relative
- * path.
- *
- * @param segments an array of non-null strings, each representing one
- * segment of the path. A trailing separator is represented by an
- * empty-string segment at the end of the array.
- *
- * @exception java.lang.IllegalArgumentException if <code>segments</code>,
- * <code>query</code>, or <code>fragment</code> is not valid according to
- * {@link #validSegments}, {@link #validQuery}, or {@link #validFragment},
- * respectively.
- */
- public static URI createHierarchicalURI(String[] segments, String query,
- String fragment)
- {
- return new URI(true, null, null, null, false, fix(segments), query,
- fragment);
- }
-
- // Converts null to length-zero array, and clones array to ensure
- // immutability.
- private static String[] fix(String[] segments)
- {
- return segments == null ? NO_SEGMENTS : (String[])segments.clone();
- }
-
- /**
- * Static factory method based on parsing a URI string, with
- * <a href="#device_explaination">explicit device support</a> enabled.
- * The specified string is parsed as described in <a
- * href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>, and an
- * appropriate <code>URI</code> is created and returned. Note that
- * validity testing is not as strict as in the RFC; essentially, only
- * separator characters are considered. So, for example, non-Latin
- * alphabet characters appearing in the scheme would not be considered an
- * error.
- *
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme},
- * {@link #validOpaquePart}, {@link #validAuthority}, {@link
- * #validDevice}, {@link #validSegments}, {@link #validQuery}, or {@link
- * #validFragment}, as appropriate.
- */
- public static URI createURI(String uri)
- {
- return parseIntoURI(uri);
- }
-
- /**
- * Static factory method based on parsing a URI string, with
- * <a href="#device_explaination">explicit device support</a> enabled.
- * Note that validity testing is not a strict as in the RFC; essentially,
- * only separator characters are considered. So, for example, non-Latin
- * alphabet characters appearing in the scheme would not be considered an
- * error.
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme},
- * {@link #validOpaquePart}, {@link #validAuthority}, {@link
- * #validDevice}, {@link #validSegments}, {@link #validQuery}, or {@link
- * #validFragment}, as appropriate.
- * @deprecated
- */
- public static URI createDeviceURI(String uri)
- {
- return parseIntoURI(uri);
- }
-
- // String-parsing implementation.
- private static URI parseIntoURI(String uri)
- {
- boolean hierarchical = true;
- String scheme = null;
- String authority = null;
- String device = null;
- boolean absolutePath = false;
- String[] segments = NO_SEGMENTS;
- String query = null;
- String fragment = null;
-
- int i = 0;
- int j = findSeparator(uri, i, MAJOR_SEPARATORS);
-
- if (j < uri.length() && uri.charAt(j) == SCHEME_SEPARATOR)
- {
- scheme = uri.substring(i, j);
- i = j + 1;
- }
-
- if (uri.startsWith(AUTHORITY_SEPARATOR, i))
- {
- i += AUTHORITY_SEPARATOR.length();
- j = findSeparator(uri, i, SEGMENT_END);
- authority = uri.substring(i, j);
- i = j;
- }
- else if (scheme != null &&
- (i == uri.length() ||
- uri.charAt(i) != SEGMENT_SEPARATOR &&
- !(scheme.equalsIgnoreCase(SCHEME_FILE) || scheme.equalsIgnoreCase(SCHEME_JAR))))
- {
- hierarchical = false;
- j = findSeparator(uri, i, new char[] { FRAGMENT_SEPARATOR });
- authority = uri.substring(i, j);
- i = j;
- }
-
- if (i < uri.length() &&
- uri.charAt(i) == SEGMENT_SEPARATOR)
- {
- j = findSeparator(uri, i + 1, SEGMENT_END);
- String s = uri.substring(i + 1, j);
-
- if (s.length() > 0 && s.charAt(s.length() - 1) == DEVICE_IDENTIFIER)
- {
- device = s;
- i = j;
- }
- }
-
- if (i < uri.length() && uri.charAt(i) == SEGMENT_SEPARATOR)
- {
- i++;
- absolutePath = true;
- }
-
- if (segmentsRemain(uri, i))
- {
- List segmentList = new ArrayList();
-
- while (segmentsRemain(uri, i))
- {
- j = findSeparator(uri, i, SEGMENT_END);
- segmentList.add(uri.substring(i, j));
- i = j;
-
- if (i < uri.length() && uri.charAt(i) == SEGMENT_SEPARATOR)
- {
- if (!segmentsRemain(uri, ++i)) segmentList.add(SEGMENT_EMPTY);
- }
- }
- segments = new String[segmentList.size()];
- segmentList.toArray(segments);
- }
-
- if (i < uri.length() && uri.charAt(i) == QUERY_SEPARATOR)
- {
- j = findSeparator(uri, ++i, new char[] { FRAGMENT_SEPARATOR });
- query = uri.substring(i, j);
- i = j;
- }
-
- if (i < uri.length()) // && uri.charAt(i) == FRAGMENT_SEPARATOR (implied)
- {
- fragment = uri.substring(++i);
- }
-
- return new URI(hierarchical, scheme, authority, device, absolutePath,
- segments, query, fragment);
- }
-
- /**
- * Static factory method based on parsing File path string, with
- * <a href="#device_explaination">explicit device support</a> enabled.
- * Note that validity testing is not a strict as in the RFC; essentially,
- * only separator characters are considered. So, for example, non-Latin
- * alphabet characters appearing in a path segment would not be considered an
- * error.
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme},
- * {@link #validOpaquePart}, {@link #validAuthority}, {@link
- * #validDevice}, {@link #validSegments}, {@link #validQuery}, or {@link
- * #validFragment}, as appropriate.
- */
- public static URI createFileURI(String pathName)
- {
- File file = new File(pathName);
- String uri = File.separatorChar != '/' ? pathName.replace(File.separatorChar, SEGMENT_SEPARATOR) : pathName;
- if (file.isAbsolute())
- {
- URI result = parseIntoURI((uri.charAt(0) == SEGMENT_SEPARATOR ? "file:" : "file:/") + uri);
- return result;
- }
- else
- {
- URI result = parseIntoURI(uri);
- if (result.scheme() != null)
- {
- throw new IllegalArgumentException("invalid relative pathName: " + pathName);
- }
- return result;
- }
- }
-
- /**
- * Static factory method based on parsing a platform-relative path string.
- * The <code>pathName</code> must be of the form
- *<pre>
- * /project-name/path
- *</pre>
- * and the result will be of the form
- *<pre>
- * platform:/resource/project-name/path
- *</pre>
- * The leading separator of the path will be provided if not present.
- * This scheme supports relocatable projects in Eclipse and in stand-alone EMF.
- * @exception java.lang.IllegalArgumentException if any component parsed
- * from <code>uri</code> is not valid according to {@link #validScheme},
- * {@link #validOpaquePart}, {@link #validAuthority}, {@link
- * #validDevice}, {@link #validSegments}, {@link #validQuery}, or {@link
- * #validFragment}, as appropriate.
- * @see org.eclipse.core.runtime.Platform#resolve
- */
- public static URI createPlatformResourceURI(String pathName)
- {
- URI result = parseIntoURI((pathName.charAt(0) == SEGMENT_SEPARATOR ? "platform:/resource" : "platform:/resource/") + pathName);
- return result;
- }
-
- // Checks whether the string contains any more segments after the one that
- // starts at position i.
- private static boolean segmentsRemain(String uri, int i)
- {
- return i < uri.length() && uri.charAt(i) != QUERY_SEPARATOR &&
- uri.charAt(i) != FRAGMENT_SEPARATOR;
- }
-
- // Finds the next occurance of one of the characters specified in
- // separators in the given URI, beginning at index i. The index of the
- // first separator, or uri.length() if there is no such character, is
- // returned. Before searching, i is limited to be in the range
- // [0, uri.length()].
- private static int findSeparator(String uri, int i, char[] separators)
- {
- int len = uri.length();
- if (i >= len) return len;
-
- outerLoop: for (i = i > 0 ? i : 0; i < len; i++)
- {
- for (int j = 0, slen = separators.length; j < slen; j++)
- {
- if (uri.charAt(i) == separators[j]) break outerLoop;
- }
- }
- return i;
- }
-
- // Private constructor for use of static factory methods. Does validation
- // of each component, but assumes that the inter-component requirements
- // described in the factory doc-comments are all satisfied.
- private URI(boolean hierarchical, String scheme, String authority,
- String device, boolean absolutePath, String[] segments,
- String query, String fragment)
- {
- String name = null;
- String value = null;
-
- if (!validScheme(scheme))
- {
- throw new IllegalArgumentException("invalid scheme: " + scheme);
- }
- if (!hierarchical && !validOpaquePart(authority))
- {
- throw new IllegalArgumentException("invalid opaquePart: " + authority);
- }
- if (hierarchical && !validAuthority(authority))
- {
- throw new IllegalArgumentException("invalid authority: " + authority);
- }
- if (!validDevice(device))
- {
- throw new IllegalArgumentException("invalid device: " + device);
- }
- if (!validSegments(segments))
- {
- String s = segments == null ? "invalid segments: " + segments :
- "invalid segment: " + firstInvalidSegment(segments);
- throw new IllegalArgumentException(s);
- }
- if (!validQuery(query))
- {
- throw new IllegalArgumentException("invalid query: " + query);
- }
- if (!validFragment(fragment))
- {
- throw new IllegalArgumentException("invalid fragment: " + fragment);
- }
-
- int hashCode = 0;
- if (hierarchical)
- {
- ++hashCode;
- }
- if (absolutePath)
- {
- hashCode += 2;
- }
- if (scheme != null)
- {
- hashCode ^= scheme.hashCode();
- }
- if (authority != null)
- {
- hashCode ^= authority.hashCode();
- }
- if (device != null)
- {
- hashCode ^= device.hashCode();
- }
- if (query != null)
- {
- hashCode ^= query.hashCode();
- }
- if (fragment != null)
- {
- hashCode ^= fragment.hashCode();
- }
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- hashCode ^= segments[i].hashCode();
- }
-
- this.hashCode = hashCode;
- this.hierarchical = hierarchical;
- this.scheme = scheme;
- this.authority = authority;
- this.device = device;
- this.absolutePath = absolutePath;
- this.segments = segments;
- this.query = query;
- this.fragment = fragment;
- }
-
- // Searches the specified string for any of the specified target
- // characters, and if any occur, returns true; false otherwise.
- private static boolean contains(String s, char[] targets)
- {
- for (int i = 0, len = s.length(); i < len; i++)
- {
- for (int j = 0, tlen = targets.length; j < tlen; j++)
- {
- if (s.charAt(i) == targets[j]) return true;
- }
- }
- return false;
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the scheme component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid scheme may be null or contain any characters except for the
- * following: <code>: / ? #</code>
- */
- public static boolean validScheme(String value)
- {
- return value == null || !contains(value, MAJOR_SEPARATORS);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the opaque part component of a URI; <code>false</code>
- * otherwise.
- *
- * <p>A valid opaque part must be non-null, non-empty, and not contain the
- * <code>#</code> character. In addition, its first character must not be
- * <code>/</code>
- */
- public static boolean validOpaquePart(String value)
- {
- return value != null && value.indexOf(FRAGMENT_SEPARATOR) == -1 &&
- value.length() > 0 && value.charAt(0) != SEGMENT_SEPARATOR;
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the authority component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid authority may be null or contain any characters except for
- * the following: <code>/ ? #</code>
- */
- public static boolean validAuthority(String value)
- {
- return value == null || !contains(value, SEGMENT_END);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the device component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid device may be null or non-empty, containing any characters
- * except for the following: <code>/ ? #</code> In addition, its last
- * character must be <code>:</code>
- */
- public static boolean validDevice(String value)
- {
- if (value == null) return true;
- int len = value.length();
- return len > 0 && value.charAt(len - 1) == DEVICE_IDENTIFIER &&
- !contains(value, SEGMENT_END);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * a valid path segment of a URI; <code>false</code> otherwise.
- *
- * <p>A valid path segment must be non-null and not contain any of the
- * following characters: <code>/ ? #</code>
- */
- public static boolean validSegment(String value)
- {
- return value != null && !contains(value, SEGMENT_END);
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * a valid path segment array of a URI; <code>false</code> otherwise.
- *
- * <p>A valid path segment array must be non-null and contain only path
- * segements that are valid, according to {@link #validSegment}.
- */
- public static boolean validSegments(String[] value)
- {
- if (value == null) return false;
- for (int i = 0, len = value.length; i < len; i++)
- {
- if (!validSegment(value[i])) return false;
- }
- return true;
- }
-
- // Returns null if the specicied value is null or would be a valid path
- // segment array of a URI; otherwise, the value of the first invalid
- // segment.
- private static String firstInvalidSegment(String[] value)
- {
- if (value == null) return null;
- for (int i = 0, len = value.length; i < len; i++)
- {
- if (!validSegment(value[i])) return value[i];
- }
- return null;
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the query component of a URI; <code>false</code> otherwise.
- *
- * <p>A valid query may be null or contain any characters except for
- * <code>#</code>
- */
- public static boolean validQuery(String value)
- {
- return value == null || value.indexOf(FRAGMENT_SEPARATOR) == -1;
- }
-
- /**
- * Returns <code>true</code> if the specified <code>value</code> would be
- * valid as the fragment component of a URI; <code>false</code> otherwise.
- *
- * <p>A fragment is taken to be unconditionally valid.
- */
- public static boolean validFragment(String value)
- {
- return true;
- }
-
- /**
- * Returns <code>true</code> if this is a relative URI, or
- * <code>false</code> if it is an absolute URI.
- */
- public boolean isRelative()
- {
- return scheme == null;
- }
-
- /**
- * Returns <code>true</code> if this a a hierarchical URI, or
- * <code>false</code> if it is of the generic form.
- */
- public boolean isHierarchical()
- {
- return hierarchical;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarcical URI with an authority
- * component; <code>false</code> otherwise.
- */
- public boolean hasAuthority()
- {
- return hierarchical && authority != null;
- }
-
- /**
- * Returns <code>true</code> if this is a non-hierarchical URI with an
- * opaque part component; <code>false</code> otherwise.
- */
- public boolean hasOpaquePart()
- {
- // note: hierarchical -> authority != null
- return !hierarchical;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with a device
- * component; <code>false</code> otherwise.
- */
- public boolean hasDevice()
- {
- // note: device != null -> hierarchical
- return device != null;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with an
- * absolute or relative path; <code>false</code> otherwise.
- */
- public boolean hasPath()
- {
- // note: (absolutePath || authority == null) -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return absolutePath || (authority == null && device == null);
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with an
- * absolute path, or <code>false</code> if it is non-hierarchical, has no
- * path, or has a relative path.
- */
- public boolean hasAbsolutePath()
- {
- // note: absolutePath -> hierarchical
- return absolutePath;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with a relative
- * path, or <code>false</code> if it is non-hierarchical, has no path, or
- * has an absolute path.
- */
- public boolean hasRelativePath()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with an empty
- * relative path; <code>false</code> otherwise.
- *
- * <p>Note that <code>!hasEmpty()</code> does <em>not</em> imply that this
- * URI has any path segments; however, <code>hasRelativePath &&
- * !hasEmptyPath()</code> does.
- */
- public boolean hasEmptyPath()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath &&
- segments.length == 0;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI with a query
- * component; <code>false</code> otherwise.
- */
- public boolean hasQuery()
- {
- // note: query != null -> hierarchical
- return query != null;
- }
-
- /**
- * Returns <code>true</code> if this URI has a fragment component;
- * <code>false</code> otherwise.
- */
- public boolean hasFragment()
- {
- return fragment != null;
- }
-
- /**
- * Returns <code>true</code> if this is a current document reference; that
- * is, if it is a relative hierarchical URI with no authority, device or
- * query components, and no path segments; <code>false</code> is returned
- * otherwise.
- */
- public boolean isCurrentDocumentReference()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath &&
- segments.length == 0 && query == null;
- }
-
- /**
- * Returns <code>true</code> if this is a {@link
- * #isCurrentDocumentReference() current document reference} with no
- * fragment component; <code>false</code> otherwise.
- *
- * @see #isCurrentDocumentReference()
- */
- public boolean isEmpty()
- {
- // note: authority == null -> hierarchical
- // (authority == null && device == null && !absolutePath) -> scheme == null
- return authority == null && device == null && !absolutePath &&
- segments.length == 0 && query == null && fragment == null;
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI that may refer
- * directly to a locally accessible file. This is considered to be the
- * case for a file-scheme absolute URI, or for a relative URI with no query;
- * <code>false</code> is returned otherwise.
- */
- public boolean isFile()
- {
- return isHierarchical() &&
- ((isRelative() && !hasQuery()) || SCHEME_FILE.equalsIgnoreCase(scheme));
- }
-
- /**
- * Returns the hash code.
- */
- public int hashCode()
- {
- return hashCode;
- }
-
- /**
- * Returns <code>true</code> if <code>obj</code> is an instance of
- * <code>URI</code> equal to this one; <code>false</code> otherwise.
- *
- * <p>Equality is determined strictly by comparing components, not by
- * attempting to interpret what resource is being identified.
- */
- public boolean equals(Object obj)
- {
- if (this == obj) return true;
- if (!(obj instanceof URI)) return false;
- URI uri = (URI) obj;
-
- return hashCode == uri.hashCode() &&
- hierarchical == uri.isHierarchical() &&
- absolutePath == uri.hasAbsolutePath() &&
- equals(scheme, uri.scheme()) &&
- equals(authority, hierarchical ? uri.authority() : uri.opaquePart()) &&
- equals(device, uri.device()) &&
- equals(query, uri.query()) &&
- equals(fragment, uri.fragment()) &&
- segmentsEqual(uri);
- }
-
- // Tests whether this URI's path segment array is equal to that of the
- // given uri.
- private boolean segmentsEqual(URI uri)
- {
- if (segments.length != uri.segmentCount()) return false;
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (!segments[i].equals(uri.segment(i))) return false;
- }
- return true;
- }
-
- // Tests two objects for equality, tolerating nulls; null is considered
- // to be a valid value that is only equal to itself.
- private static boolean equals(Object o1, Object o2)
- {
- return o1 == null ? o2 == null : o1.equals(o2);
- }
-
- /**
- * If this is an absolute URI, returns the scheme component;
- * <code>null</code> otherwise.
- */
- public String scheme()
- {
- return scheme;
- }
-
- /**
- * If this is a non-hierarchical URI, returns the opaque part component;
- * <code>null</code> otherwise.
- */
- public String opaquePart()
- {
- return isHierarchical() ? null : authority;
- }
-
- /**
- * If this is a hierarchical URI with an authority component, returns it;
- * <code>null</code> otherwise.
- */
- public String authority()
- {
- return isHierarchical() ? authority : null;
- }
-
- /**
- * If this is a hierarchical URI with an authority component that has a
- * user info portion, returns it; <code>null</code> otherwise.
- */
- public String userInfo()
- {
- if (!hasAuthority()) return null;
-
- int i = authority.indexOf(USER_INFO_SEPARATOR);
- return i < 0 ? null : authority.substring(0, i);
- }
-
- /**
- * If this is a hierarchical URI with an authority component that has a
- * host portion, returns it; <code>null</code> otherwise.
- */
- public String host()
- {
- if (!hasAuthority()) return null;
-
- int i = authority.indexOf(USER_INFO_SEPARATOR);
- int j = authority.indexOf(PORT_SEPARATOR);
- return j < 0 ? authority.substring(i + 1) : authority.substring(i + 1, j);
- }
-
- /**
- * If this is a hierarchical URI with an authority component that has a
- * port portion, returns it; <code>null</code> otherwise.
- */
- public String port()
- {
- if (!hasAuthority()) return null;
-
- int i = authority.indexOf(PORT_SEPARATOR);
- return i < 0 ? null : authority.substring(i + 1);
- }
-
- /**
- * If this is a hierarchical URI with a device component, returns it;
- * <code>null</code> otherwise.
- */
- public String device()
- {
- return device;
- }
-
- /**
- * If this is a hierarchical URI with a path, returns an array containing
- * the segments of the path; an empty array otherwise. The leading
- * separator in an absolute path is not represented in this array, but a
- * trailing separator is represented by an empty-string segment as the
- * final element.
- */
- public String[] segments()
- {
- return (String[])segments.clone();
- }
-
- /**
- * Returns an unmodifiable list containing the same segments as the array
- * returned by {@link #segments()}.
- */
- public List segmentsList()
- {
- return Collections.unmodifiableList(Arrays.asList(segments));
- }
-
- /**
- * Returns the number of elements in the segment array that would be
- * returned by {@link #segments()}.
- */
- public int segmentCount()
- {
- return segments.length;
- }
-
- /**
- * Provides fast, indexed access to individual segments in the path
- * segment array.
- *
- * @exception java.lang.IndexOutOfBoundsException if <code>i < 0</code> or
- * <code>i >= segmentCount()</code>.
- */
- public String segment(int i)
- {
- return segments[i];
- }
-
- /**
- * Returns the last segment in the segment array, or <code>null</code>.
- */
- public String lastSegment()
- {
- int len = segments.length;
- if (len == 0) return null;
- return segments[len - 1];
- }
-
- /**
- * If this is a hierarchical URI with a path, returns a string
- * representation of the path; <code>null</code> otherwise. The path
- * consists of a leading segment separator character (a slash), if the
- * path is absolute, followed by the slash-separated path segments. If
- * this URI has a separate <a href="#device_explaination">device
- * component</a>, it is <em>not</em> included in the path. If it has a
- * device stored as a path segment, it is included.
- */
- public String path()
- {
- if (!hasPath()) return null;
-
- StringBuffer result = new StringBuffer();
- if (hasAbsolutePath()) result.append(SEGMENT_SEPARATOR);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(SEGMENT_SEPARATOR);
- result.append(segments[i]);
- }
- return result.toString();
- }
-
- /**
- * If this is a hierarchical URI with a path, returns a string
- * representation of the path, including the authority and the
- * <a href="#device_explaination">device component</a>;
- * <code>null</code> otherwise.
- * <p>The format of this string is
- * <pre>
- * //authority/device/pathSegment1/pathSegment2...
- *</pre>
- */
- public String devicePath()
- {
- if (!hasPath()) return null;
-
- StringBuffer result = new StringBuffer();
- if (hasAuthority())
- {
- result.append(SEGMENT_SEPARATOR);
- result.append(SEGMENT_SEPARATOR);
- result.append(authority);
-
- if (hasDevice()) result.append(SEGMENT_SEPARATOR);
- }
-
- if (hasDevice()) result.append(device);
- if (hasAbsolutePath()) result.append(SEGMENT_SEPARATOR);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(SEGMENT_SEPARATOR);
- result.append(segments[i]);
- }
- return result.toString();
- }
-
- /**
- * If this is a hierarchical URI with a query component, returns it;
- * <code>null</code> otherwise.
- */
- public String query()
- {
- return query;
- }
-
-
- /**
- * Returns the URI formed from this URI and the given query.
- *
- * @exception java.lang.IllegalArgumentException if
- * <code>query</code> is not a valid query (portion) according
- * to {@link #validQuery}.
- */
- public URI appendQuery(String query)
- {
- if (!validQuery(query))
- {
- throw new IllegalArgumentException(
- "invalid query portion: " + query);
- }
- return new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, fragment);
- }
-
- /**
- * If this URI has a non-null {@link #query}, returns the URI
- * formed by removing it; this URI unchanged, otherwise.
- */
- public URI trimQuery()
- {
- if (query == null)
- {
- return this;
- }
- else
- {
- return new URI(hierarchical, scheme, authority, device, absolutePath, segments, null, fragment);
- }
- }
-
- /**
- * If this URI has a fragment component, returns it; <code>null</code>
- * otherwise.
- */
- public String fragment()
- {
- return fragment;
- }
-
- /**
- * Returns the URI formed from this URI and the given fragment.
- *
- * @exception java.lang.IllegalArgumentException if
- * <code>fragment</code> is not a valid fragment (portion) according
- * to {@link #validFragment}.
- */
- public URI appendFragment(String fragment)
- {
- if (!validFragment(fragment))
- {
- throw new IllegalArgumentException(
- "invalid fragment portion: " + fragment);
- }
- URI result = new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, fragment);
- result.cachedTrimFragment = this;
- return result;
- }
-
- /**
- * If this URI has a non-null {@link #fragment}, returns the URI
- * formed by removing it; this URI unchanged, otherwise.
- */
- public URI trimFragment()
- {
- if (fragment == null)
- {
- return this;
- }
- else if (cachedTrimFragment == null)
- {
- cachedTrimFragment = new URI(hierarchical, scheme, authority, device, absolutePath, segments, query, null);
- }
-
- return cachedTrimFragment;
- }
-
- /**
- * Resolves this URI reference against a <code>base</code> absolute
- * hierarchical URI, returning the resulting absolute URI. If already
- * absolute, the URI itself is returned. URI resolution is described in
- * detail in section 5.2 of <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC
- * 2396</a>, "Resolving Relative References to Absolute Form."
- *
- * <p>During resolution, empty segments, self references ("."), and parent
- * references ("..") are interpreted, so that they can be removed from the
- * path. Step 6(g) gives a choice of how to handle the case where parent
- * references point to a path above the root: the offending segments can
- * be preserved or discarded. This method preserves them. To have them
- * discarded, please use the {@link #resolve(URI, boolean)} method.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- */
- public URI resolve(URI base)
- {
- return resolve(base, true);
- }
-
- /**
- * Resolves this URI reference against a <code>base</code> absolute
- * hierarchical URI, returning the resulting absolute URI. If already
- * absolute, the URI itself is returned. URI resolution is described in
- * detail in section 5.2 of <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC
- * 2396</a>, "Resolving Relative References to Absolute Form."
- *
- * <p>During resultion, empty segments, self references ("."), and parent
- * references ("..") are interpreted, so that they can be removed from the
- * path. Step 6(g) gives a choice of how to handle the case where parent
- * references point to a path above the root: the offending segments can
- * be preserved or discarded. This method can do either.
- *
- * @param preserveRootParent <code>true</code> if segments refering to the
- * parent of the root path are to be preserved; <code>false</code> if they
- * are to be discarded.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- */
- public URI resolve(URI base, boolean preserveRootParents)
- {
- if (!base.isHierarchical() || base.isRelative())
- {
- throw new IllegalArgumentException(
- "resolve against non-hierarchical or relative base");
- }
-
- // an absolute URI needs no resolving
- if (!isRelative()) return this;
-
- // note: isRelative() -> hierarchical
-
- String newAuthority = authority;
- String newDevice = device;
- boolean newAbsolutePath = absolutePath;
- String[] newSegments = segments;
- String newQuery = query;
- // note: it's okay for two URIs to share a segments array, since
- // neither will ever modify it
-
- if (authority == null)
- {
- // no authority: use base's
- newAuthority = base.authority();
-
- if (device == null)
- {
- // no device: use base's
- newDevice = base.device();
-
- if (hasEmptyPath() && query == null)
- {
- // current document reference: use base path and query
- newAbsolutePath = base.hasAbsolutePath();
- newSegments = base.segments();
- newQuery = base.query();
- }
- else if (hasRelativePath())
- {
- // relative path: merge with base and keep query (note: if the
- // base has no path and this a non-empty relative path, there is
- // an implied root in the resulting path)
- newAbsolutePath = base.hasAbsolutePath() || !hasEmptyPath();
- newSegments = newAbsolutePath ? mergePath(base, preserveRootParents)
- : NO_SEGMENTS;
- }
- // else absolute path: keep it and query
- }
- // else keep device, path, and query
- }
- // else keep authority, device, path, and query
-
- // always keep fragment, even if null, and use scheme from base
- return new URI(true, base.scheme(), newAuthority, newDevice,
- newAbsolutePath, newSegments, newQuery, fragment);
- }
-
- // Merges this URI's relative path with the base non-relative path. If
- // base has no path, treat it as the root absolute path, unless this has
- // no path either.
- private String[] mergePath(URI base, boolean preserveRootParents)
- {
- if (base.hasRelativePath())
- {
- throw new IllegalArgumentException("merge against relative path");
- }
- if (!hasRelativePath())
- {
- throw new IllegalStateException("merge non-relative path");
- }
-
- int baseSegmentCount = base.segmentCount();
- int segmentCount = segments.length;
- String[] stack = new String[baseSegmentCount + segmentCount];
- int sp = 0;
-
- // use a stack to accumulate segments of base, except for the last
- // (i.e. skip trailing separator and anything following it), and of
- // relative path
- for (int i = 0; i < baseSegmentCount - 1; i++)
- {
- sp = accumulate(stack, sp, base.segment(i), preserveRootParents);
- }
-
- for (int i = 0; i < segmentCount; i++)
- {
- sp = accumulate(stack, sp, segments[i], preserveRootParents);
- }
-
- // if the relative path is empty or ends in an empty segment, a parent
- // reference, or a self referenfce, add a trailing separator to a
- // non-empty path
- if (sp > 0 && (segmentCount == 0 ||
- SEGMENT_EMPTY.equals(segments[segmentCount - 1]) ||
- SEGMENT_PARENT.equals(segments[segmentCount - 1]) ||
- SEGMENT_SELF.equals(segments[segmentCount - 1])))
- {
- stack[sp++] = SEGMENT_EMPTY;
- }
-
- // return a correctly sized result
- String[] result = new String[sp];
- System.arraycopy(stack, 0, result, 0, sp);
- return result;
- }
-
- // Adds a segment to a stack, skipping empty segments and self references,
- // and interpreting parent references.
- private static int accumulate(String[] stack, int sp, String segment,
- boolean preserveRootParents)
- {
- if (SEGMENT_PARENT.equals(segment))
- {
- if (sp == 0)
- {
- // special care must be taken for a root's parent reference: it is
- // either ignored or the symbolic reference itself is pushed
- if (preserveRootParents) stack[sp++] = segment;
- }
- else
- {
- // unless we're already accumulating root parent references,
- // parent references simply pop the last segment descended
- if (SEGMENT_PARENT.equals(stack[sp - 1])) stack[sp++] = segment;
- else sp--;
- }
- }
- else if (!SEGMENT_EMPTY.equals(segment) && !SEGMENT_SELF.equals(segment))
- {
- // skip empty segments and self references; push everything else
- stack[sp++] = segment;
- }
- return sp;
- }
-
- /**
- * Finds the shortest relative or, if necessary, the absolute URI that,
- * when resolved against the given <code>base</code> absolute hierarchical
- * URI using {@link #resolve(URI)}, will yield this absolute URI.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- * @exception java.lang.IllegalStateException if <code>this</code> is
- * relative.
- */
- public URI deresolve(URI base)
- {
- return deresolve(base, true, false, true);
- }
-
- /**
- * Finds an absolute URI that, when resolved against the given
- * <code>base</code> absolute hierarchical URI using {@link #resolve(URI,
- * boolean)}, will yield this absolute URI.
- *
- * @param preserveRootParents the boolean argument to <code>resolve(URI,
- * boolean)</code> for which the returned URI should resolve to this URI.
- * @param anyRelPath if <code>true</code>, the returned URI's path (if
- * any) will be relative, if possible. If <code>false</code>, the form of
- * the result's path will depend upon the next parameter.
- * @param shorterRelPath if <code>anyRelPath</code> is <code>false</code>
- * and this parameter is <code>true</code>, the returned URI's path (if
- * any) will be relative, if one can be found that is no longer (by number
- * of segments) than the absolute path. If both <code>anyRelPath</code>
- * and this parameter are <code>false</code>, it will be absolute.
- *
- * @exception java.lang.IllegalArgumentException if <code>base</code> is
- * non-hierarchical or is relative.
- * @exception java.lang.IllegalStateException if <code>this</code> is
- * relative.
- */
- public URI deresolve(URI base, boolean preserveRootParents,
- boolean anyRelPath, boolean shorterRelPath)
- {
- if (!base.isHierarchical() || base.isRelative())
- {
- throw new IllegalArgumentException(
- "deresolve against non-hierarchical or relative base");
- }
- if (isRelative())
- {
- throw new IllegalStateException("deresolve relative URI");
- }
-
- // note: these assertions imply that neither this nor the base URI has a
- // relative path; thus, both have either an absolute path or no path
-
- // different scheme: need complete, absolute URI
- if (!scheme.equals(base.scheme())) return this;
-
- // since base must be hierarchical, and since a non-hierarchical URI
- // must have both scheme and opaque part, the complete absolute URI is
- // needed to resolve to a non-hierarchical URI
- if (!isHierarchical()) return this;
-
- String newAuthority = authority;
- String newDevice = device;
- boolean newAbsolutePath = absolutePath;
- String[] newSegments = segments;
- String newQuery = query;
-
- if (equals(authority, base.authority()) &&
- (hasDevice() || hasPath() || (!base.hasDevice() && !base.hasPath())))
- {
- // matching authorities and no device or path removal
- newAuthority = null;
-
- if (equals(device, base.device()) && (hasPath() || !base.hasPath()))
- {
- // matching devices and no path removal
- newDevice = null;
-
- // exception if (!hasPath() && base.hasPath())
-
- if (!anyRelPath && !shorterRelPath)
- {
- // user rejects a relative path: keep absolute or no path
- }
- else if (hasPath() == base.hasPath() && segmentsEqual(base) &&
- equals(query, base.query()))
- {
- // current document reference: keep no path or query
- newAbsolutePath = false;
- newSegments = NO_SEGMENTS;
- newQuery = null;
- }
- else if (!hasPath() && !base.hasPath())
- {
- // no paths: keep query only
- newAbsolutePath = false;
- newSegments = NO_SEGMENTS;
- }
- // exception if (!hasAbsolutePath())
- else if (hasCollapsableSegments(preserveRootParents))
- {
- // path form demands an absolute path: keep it and query
- }
- else
- {
- // keep query and select relative or absolute path based on length
- String[] rel = findRelativePath(base, preserveRootParents);
- if (anyRelPath || segments.length > rel.length)
- {
- // user demands a relative path or the absolute path is longer
- newAbsolutePath = false;
- newSegments = rel;
- }
- // else keep shorter absolute path
- }
- }
- // else keep device, path, and query
- }
- // else keep authority, device, path, and query
-
- // always include fragment, even if null
- return new URI(true, null, newAuthority, newDevice, newAbsolutePath,
- newSegments, newQuery, fragment);
- }
-
- // Returns true if the non-relative path includes segments that would be
- // collapsed when resolving; false otherwise. If preserveRootParents is
- // true, collapsable segments include any empty segments, except for the
- // last segment, as well as and parent and self references. If
- // preserveRootsParents is false, parent references are not collapsable if
- // they are the first segment or preceeded only by other parent
- // references.
- private boolean hasCollapsableSegments(boolean preserveRootParents)
- {
- if (hasRelativePath())
- {
- throw new IllegalStateException("test collapsability of relative path");
- }
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- String segment = segments[i];
- if ((i < len - 1 && SEGMENT_EMPTY.equals(segment)) ||
- SEGMENT_SELF.equals(segment) ||
- SEGMENT_PARENT.equals(segment) && (
- !preserveRootParents || (
- i != 0 && !SEGMENT_PARENT.equals(segments[i - 1]))))
- {
- return true;
- }
- }
- return false;
- }
-
- // Returns the shortest relative path between the the non-relative path of
- // the given base and this absolute path. If the base has no path, it is
- // treated as the root absolute path.
- private String[] findRelativePath(URI base, boolean preserveRootParents)
- {
- if (base.hasRelativePath())
- {
- throw new IllegalArgumentException(
- "find relative path against base with relative path");
- }
- if (!hasAbsolutePath())
- {
- throw new IllegalArgumentException(
- "find relative path of non-absolute path");
- }
-
- // treat an empty base path as the root absolute path
- String[] startPath = base.collapseSegments(preserveRootParents);
- String[] endPath = segments;
-
- // drop last segment from base, as in resolving
- int startCount = startPath.length > 0 ? startPath.length - 1 : 0;
- int endCount = endPath.length;
-
- // index of first segment that is different between endPath and startPath
- int diff = 0;
-
- // if endPath is shorter than startPath, the last segment of endPath may
- // not be compared: because startPath has been collapsed and had its
- // last segment removed, all preceeding segments can be considered non-
- // empty and followed by a separator, while the last segment of endPath
- // will either be non-empty and not followed by a separator, or just empty
- for (int count = startCount < endCount ? startCount : endCount - 1;
- diff < count && startPath[diff].equals(endPath[diff]); diff++);
-
- int upCount = startCount - diff;
- int downCount = endCount - diff;
-
- // a single separator, possibly preceeded by some parent reference
- // segments, is redundant
- if (downCount == 1 && SEGMENT_EMPTY.equals(endPath[endCount - 1]))
- {
- downCount = 0;
- }
-
- // an empty path needs to be replaced by a single "." if there is no
- // query, to distinguish it from a current document reference
- if (upCount + downCount == 0)
- {
- if (query == null) return new String[] { SEGMENT_SELF };
- return NO_SEGMENTS;
- }
-
- // return a correctly sized result
- String[] result = new String[upCount + downCount];
- Arrays.fill(result, 0, upCount, SEGMENT_PARENT);
- System.arraycopy(endPath, diff, result, upCount, downCount);
- return result;
- }
-
- // Collapses non-ending empty segments, parent references, and self
- // references in a non-relative path, returning the same path that would
- // be produced from the base hierarchical URI as part of a resolve.
- String[] collapseSegments(boolean preserveRootParents)
- {
- if (hasRelativePath())
- {
- throw new IllegalStateException("collapse relative path");
- }
-
- if (!hasCollapsableSegments(preserveRootParents)) return segments();
-
- // use a stack to accumulate segments
- int segmentCount = segments.length;
- String[] stack = new String[segmentCount];
- int sp = 0;
-
- for (int i = 0; i < segmentCount; i++)
- {
- sp = accumulate(stack, sp, segments[i], preserveRootParents);
- }
-
- // if the path is non-empty and originally ended in an empty segment, a
- // parent reference, or a self reference, add a trailing separator
- if (sp > 0 && (SEGMENT_EMPTY.equals(segments[segmentCount - 1]) ||
- SEGMENT_PARENT.equals(segments[segmentCount - 1]) ||
- SEGMENT_SELF.equals(segments[segmentCount - 1])))
- {
- stack[sp++] = SEGMENT_EMPTY;
- }
-
- // return a correctly sized result
- String[] result = new String[sp];
- System.arraycopy(stack, 0, result, 0, sp);
- return result;
- }
-
- /**
- * Returns the string representation of this URI. For a generic,
- * non-hierarchical URI, this looks like:
- *
- * <pre>
- * scheme:opaquePart#fragment</pre>
- *
- * <p>For a hierarchical URI, it looks like:
- * <pre>
- * scheme://authority/device/pathSegment1/pathSegment2...?query#fragment</pre>
- *
- * <p>Of course, absent components and their separators will be omitted.
- */
- public String toString()
- {
- if (cachedToString == null)
- {
- StringBuffer result = new StringBuffer();
- if (!isRelative())
- {
- result.append(scheme);
- result.append(SCHEME_SEPARATOR);
- }
-
- if (isHierarchical())
- {
- if (hasAuthority())
- {
- result.append(AUTHORITY_SEPARATOR);
- result.append(authority);
- }
-
- if (hasDevice())
- {
- result.append(SEGMENT_SEPARATOR);
- result.append(device);
- }
-
- if (hasAbsolutePath()) result.append(SEGMENT_SEPARATOR);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(SEGMENT_SEPARATOR);
- result.append(segments[i]);
- }
-
- if (hasQuery())
- {
- result.append(QUERY_SEPARATOR);
- result.append(query);
- }
- }
- else
- {
- result.append(authority);
- }
-
- if (hasFragment())
- {
- result.append(FRAGMENT_SEPARATOR);
- result.append(fragment);
- }
- cachedToString = result.toString();
- }
- return cachedToString;
- }
-
- // Returns a string representation of this URI for debugging, explicitly
- // showing each of the components.
- String toString(boolean includeSimpleForm)
- {
- StringBuffer result = new StringBuffer();
- if (includeSimpleForm) result.append(toString());
- result.append("\n hierarchical: ");
- result.append(hierarchical);
- result.append("\n scheme: ");
- result.append(scheme);
- result.append("\n authority: ");
- result.append(authority);
- result.append("\n device: ");
- result.append(device);
- result.append("\n absolutePath: ");
- result.append(absolutePath);
- result.append("\n segments: ");
- if (segments.length == 0) result.append("<empty>");
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i > 0) result.append("\n ");
- result.append(segments[i]);
- }
- result.append("\n query: ");
- result.append(query);
- result.append("\n fragment: ");
- result.append(fragment);
- return result.toString();
- }
-
- /**
- * If this URI may refer directly to a locally accessible file, as
- * determined by {@link #isFile()}, returns the URI formatted as a
- * pathname to that file; null otherwise.
- *
- * <p>The format of this string is
- * <pre>
- * //authority/device/pathSegment1/pathSegment2...</pre>
- *
- * <p>However, the character used as a separator is system-dependant and
- * obtained from {@link java.io.File#separatorChar}.
- */
- public String toFileString()
- {
- if (!isFile()) return null;
-
- StringBuffer result = new StringBuffer();
- char separator = File.separatorChar;
-
- if (hasAuthority())
- {
- result.append(separator);
- result.append(separator);
- result.append(authority);
-
- if (hasDevice()) result.append(separator);
- }
-
- if (hasDevice()) result.append(device);
- if (hasAbsolutePath()) result.append(separator);
-
- for (int i = 0, len = segments.length; i < len; i++)
- {
- if (i != 0) result.append(separator);
- result.append(segments[i]);
- }
- return result.toString();
- }
-
- /**
- * Returns the URI formed by appending the specified segment on to the end
- * of the path of this URI, if hierarchical; this URI unchanged,
- * otherwise. If this URI has an authority and/or device, but no path,
- * the segment becomes the first under the root in an absolute path.
- *
- * @exception java.lang.IllegalArgumentException if <code>segment</code>
- * is not a valid segment according to {@link #validSegment}.
- */
- public URI appendSegment(String segment)
- {
- if (!validSegment(segment))
- {
- throw new IllegalArgumentException("invalid segment: " + segment);
- }
-
- if (!isHierarchical()) return this;
-
- // absolute path or no path -> absolute path
- boolean newAbsolutePath = !hasRelativePath();
-
- int len = segments.length;
- String[] newSegments = new String[len + 1];
- System.arraycopy(segments, 0, newSegments, 0, len);
- newSegments[len] = segment;
-
- return new URI(true, scheme, authority, device, newAbsolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns the URI formed by appending the specified segments on to the
- * end of the path of this URI, if hierarchical; this URI unchanged,
- * otherwise. If this URI has an authority and/or device, but no path,
- * the segments are made to form an absolute path.
- *
- * @param segments an array of non-null strings, each representing one
- * segment of the path. If desired, a trailing separator should be
- * represented by an empty-string segment as the last element of the
- * array.
- *
- * @exception java.lang.IllegalArgumentException if <code>segments</code>
- * is not a valid segment array according to {@link #validSegments}.
- */
- public URI appendSegments(String[] segments)
- {
- if (!validSegments(segments))
- {
- String s = segments == null ? "invalid segments: " + segments :
- "invalid segment: " + firstInvalidSegment(segments);
- throw new IllegalArgumentException(s);
- }
-
- if (!isHierarchical()) return this;
-
- // absolute path or no path -> absolute path
- boolean newAbsolutePath = !hasRelativePath();
-
- int len = this.segments.length;
- int segmentsCount = segments.length;
- String[] newSegments = new String[len + segmentsCount];
- System.arraycopy(this.segments, 0, newSegments, 0, len);
- System.arraycopy(segments, 0, newSegments, len, segmentsCount);
-
- return new URI(true, scheme, authority, device, newAbsolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns the URI formed by trimming the specified number of segments
- * (including empty segments, such as one representing a trailing
- * separator) from the end of the path of this URI, if hierarchical;
- * otherwise, this URI is returned unchanged.
- *
- * <p>Note that if all segments are trimmed from an absolute path, the
- * root absolute path remains.
- *
- * @param i the number of segments to be trimmed in the returned URI. If
- * less than 1, this URI is returned unchanged; if equal to or greater
- * than the number of segments in this URI's path, all segments are
- * trimmed.
- */
- public URI trimSegments(int i)
- {
- if (!isHierarchical() || i < 1) return this;
-
- String[] newSegments = NO_SEGMENTS;
- int len = segments.length - i;
- if (len > 0)
- {
- newSegments = new String[len];
- System.arraycopy(segments, 0, newSegments, 0, len);
- }
- return new URI(true, scheme, authority, device, absolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI that has a path
- * that ends with a trailing separator; <code>false</code> otherwise.
- *
- * <p>A trailing separator is represented as an empty segment as the
- * last segment in the path; note that this definition does <em>not</em>
- * include the lone separator in the root absolute path.
- */
- public boolean hasTrailingPathSeparator()
- {
- return segments.length > 0 &&
- SEGMENT_EMPTY.equals(segments[segments.length - 1]);
- }
-
- /**
- * If this is a hierarchical URI whose path includes a file extension,
- * that file extension is returned; null otherwise. We define a file
- * extension as any string following the last period (".") in the final
- * path segment. If there is no path, the path ends in a trailing
- * separator, or the final segment contains no period, then we consider
- * there to be no file extension. If the final segment ends in a period,
- * then the file extension is an empty string.
- */
- public String fileExtension()
- {
- int len = segments.length;
- if (len == 0) return null;
-
- String lastSegment = segments[len - 1];
- int i = lastSegment.lastIndexOf(FILE_EXTENSION_SEPARATOR);
- return i < 0 ? null : lastSegment.substring(i + 1);
- }
-
- /**
- * Returns the URI formed by appending a period (".") followed by the
- * specified file extension to the last path segment of this URI, if it is
- * hierarchical with a non-empty path ending in a non-empty segment;
- * otherwise, this URI is returned unchanged.
-
- * <p>The extension is appended regardless of whether the segment already
- * contains an extension.
- *
- * @exception java.lang.IllegalArgumentException if
- * <code>fileExtension</code> is not a valid segment (portion) according
- * to {@link #validSegment}.
- */
- public URI appendFileExtension(String fileExtension)
- {
- if (!validSegment(fileExtension))
- {
- throw new IllegalArgumentException(
- "invalid segment portion: " + fileExtension);
- }
-
- int len = segments.length;
- if (len == 0) return this;
-
- String lastSegment = segments[len - 1];
- if (SEGMENT_EMPTY.equals(lastSegment)) return this;
- StringBuffer newLastSegment = new StringBuffer(lastSegment);
- newLastSegment.append(FILE_EXTENSION_SEPARATOR);
- newLastSegment.append(fileExtension);
-
- String[] newSegments = new String[len];
- System.arraycopy(segments, 0, newSegments, 0, len - 1);
- newSegments[len - 1] = newLastSegment.toString();
-
- // note: segments.length > 0 -> hierarchical
- return new URI(true, scheme, authority, device, absolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * If this URI has a non-null {@link #fileExtension}, returns the URI
- * formed by removing it; this URI unchanged, otherwise.
- */
- public URI trimFileExtension()
- {
- int len = segments.length;
- if (len == 0) return this;
-
- String lastSegment = segments[len - 1];
- int i = lastSegment.lastIndexOf(FILE_EXTENSION_SEPARATOR);
- if (i < 0) return this;
-
- String newLastSegment = lastSegment.substring(0, i);
- String[] newSegments = new String[len];
- System.arraycopy(segments, 0, newSegments, 0, len - 1);
- newSegments[len - 1] = newLastSegment;
-
- // note: segments.length > 0 -> hierarchical
- return new URI(true, scheme, authority, device, absolutePath,
- newSegments, query, fragment);
- }
-
- /**
- * Returns <code>true</code> if this is a hierarchical URI that ends in a
- * slash; that is, it has a trailing path separator or is the root
- * absolute path, and has no query and no fragment; <code>false</code>
- * is returned otherwise.
- */
- public boolean isPrefix()
- {
- return hierarchical && query == null && fragment == null &&
- (hasTrailingPathSeparator() || (absolutePath && segments.length == 0));
- }
-
- /**
- * If this is a hierarchical URI reference and <code>oldPrefix</code> is a
- * prefix of it, this returns the URI formed by replacing it by
- * <code>newPrefix</code>; <code>null</code> otherwise.
- *
- * <p>In order to be a prefix, the <code>oldPrefix</code>'s
- * {@link #isPrefix} must return <code>true</code>, and it must match this
- * URI's scheme, authority, and device. Also, the paths must match, up to
- * prefix's end.
- *
- * @exception java.lang.IllegalArgumentException if either
- * <code>oldPrefix</code> or <code>newPrefix</code> is not a prefix URI
- * according to {@link #isPrefix}.
- */
- public URI replacePrefix(URI oldPrefix, URI newPrefix)
- {
- if (!oldPrefix.isPrefix() || !newPrefix.isPrefix())
- {
- String which = oldPrefix.isPrefix() ? "new" : "old";
- throw new IllegalArgumentException("non-prefix " + which + " value");
- }
-
- // Get what's left of the segments after trimming the prefix.
- String[] tailSegments = getTailSegments(oldPrefix);
- if (tailSegments == null) return null;
-
- // If the new prefix has segments, it is not the root absolute path,
- // and we need to drop the trailing empty segment and append the tail
- // segments.
- String[] mergedSegments = tailSegments;
- if (newPrefix.segmentCount() != 0)
- {
- int segmentsToKeep = newPrefix.segmentCount() - 1;
- mergedSegments = new String[segmentsToKeep + tailSegments.length];
- System.arraycopy(newPrefix.segments(), 0, mergedSegments, 0,
- segmentsToKeep);
-
- if (tailSegments.length != 0)
- {
- System.arraycopy(tailSegments, 0, mergedSegments, segmentsToKeep,
- tailSegments.length);
- }
- }
-
- return new URI(true, newPrefix.scheme(), newPrefix.authority(),
- newPrefix.device(), newPrefix.hasAbsolutePath(),
- mergedSegments, query, fragment);
- }
-
- // If this is a hierarchical URI reference and prefix is a prefix of it,
- // returns the portion of the path remaining after that prefix has been
- // trimmed; null otherwise.
- private String[] getTailSegments(URI prefix)
- {
- if (!prefix.isPrefix())
- {
- throw new IllegalArgumentException("non-prefix trim");
- }
-
- // Don't even consider it unless this is hierarchical and has scheme,
- // authority, device and path absoluteness equal to those of the prefix.
- if (!hierarchical ||
- !equals(scheme, prefix.scheme()) ||
- !equals(authority, prefix.authority()) ||
- !equals(device, prefix.device()) ||
- absolutePath != prefix.hasAbsolutePath())
- {
- return null;
- }
-
- // If the prefix has no segments, then it is the root absolute path, and
- // we know this is an absolute path, too.
- if (prefix.segmentCount() == 0) return segments;
-
- // This must have no fewer segments than the prefix. Since the prefix
- // is not the root absolute path, its last segment is empty; all others
- // must match.
- int i = 0;
- int segmentsToCompare = prefix.segmentCount() - 1;
- if (segments.length <= segmentsToCompare) return null;
-
- for (; i < segmentsToCompare; i++)
- {
- if (!segments[i].equals(prefix.segment(i))) return null;
- }
-
- // The prefix really is a prefix of this. If this has just one more,
- // empty segment, the paths are the same.
- if (i == segments.length - 1 && SEGMENT_EMPTY.equals(segments[i]))
- {
- return NO_SEGMENTS;
- }
-
- // Otherwise, the path needs only the remaining segments.
- String[] newSegments = new String[segments.length - i];
- System.arraycopy(segments, i, newSegments, 0, newSegments.length);
- return newSegments;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionDescriptor.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionDescriptor.java
deleted file mode 100644
index 1e34175..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionDescriptor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.common.uriresolver.URIResolverExtension;
-
-
-/**
- * @author csalter
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class URIResolverExtensionDescriptor
-{
- protected URIResolverExtension resolver;
- //protected String projectNature;
- protected String fileType;
- protected String className;
- public List projectNatureIds;
- protected String resourceType;
- protected int stage = URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION;
- protected ClassLoader classLoader;
- protected boolean error;
-
- public URIResolverExtensionDescriptor(String className, ClassLoader classLoader, List projectNatureIds, String resourceType, int stage)
- {
- this.className = className;
- this.classLoader = classLoader;
- this.projectNatureIds = projectNatureIds;
- this.resourceType = resourceType;
- this.stage = stage;
- }
-
- public URIResolverExtension getResolver()
- {
-
- if (resolver == null && className != null && !error)
- {
- try
- {
- Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
- resolver = (URIResolverExtension) theClass.newInstance();
- }
- catch (Exception e)
- {
- error = true;
- e.printStackTrace();
- }
- }
- return resolver;
- }
-
- public boolean matches(String projectNatureId, String resourceType, int stage)
- {
- if(projectNatureIds.contains(projectNatureId))
- {
- return matches(this.resourceType, resourceType) && this.stage == stage;
- }
- return false;
- }
-
- public boolean matches(String a, String b)
- {
- return (a != null) ? a.equals(b) : a == b;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java
deleted file mode 100644
index 1e5bfd5..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistry.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.uriresolver.URIResolverExtension;
-
-
-
-public class URIResolverExtensionRegistry {
- protected HashMap map = new HashMap();
- public static final int STAGE_PRENORMALIZATION = 1;
- public static final int STAGE_POSTNORMALIZATION = 2;
- protected final static String NULL_PROJECT_NATURE_ID = "";
-
- public URIResolverExtensionRegistry() {
- }
-
- public void put(String className, ClassLoader classLoader, List projectNatureIds, String resourceType, int stage) {
- if(projectNatureIds == null)
- projectNatureIds = new ArrayList();
- if(projectNatureIds.isEmpty())
- {
- projectNatureIds.add(NULL_PROJECT_NATURE_ID);
- }
- URIResolverExtensionDescriptor info = new URIResolverExtensionDescriptor(className, classLoader, projectNatureIds, resourceType, stage);
-
- Iterator idsIter = projectNatureIds.iterator();
- while(idsIter.hasNext())
- {
- String key = (String)idsIter.next();
-
- List list = (List)map.get(key);
- if (list == null)
- {
- list = new ArrayList();
- map.put(key, list);
- }
-
- list.add(info);
- }
- }
-
-
- /**
- * Return a list of URIResolverExtensionDescriptor objects that apply to this project.
- *
- */
- public List getExtensionDescriptors(IProject project)
- {
- List result = new ArrayList();
- for (Iterator i = map.keySet().iterator(); i.hasNext(); )
- {
- String key = (String)i.next();
- try{
- if (key == NULL_PROJECT_NATURE_ID ||
- project == null ||
- project.hasNature(key))
- {
- result.addAll((List)map.get(key));
- }
- }
- catch (CoreException e)
- {}
- }
- return result;
- }
-
- /**
- * Return a list of URIResolver objects that match the stage.
- *
- */
- public List getMatchingURIResolvers(List resolverInfoList, int stage)
- {
- List result = new ArrayList();
- for (Iterator i = resolverInfoList.iterator(); i.hasNext(); ){
- URIResolverExtensionDescriptor info = (URIResolverExtensionDescriptor)i.next();
- if (info.stage == stage)
- {
- Object resolver = info.getResolver();
- if (resolver != null)
- {
- result.add(resolver);
- }
- }
- }
- return result;
- }
-
- public URIResolverExtension get(String key) {
- URIResolverExtensionDescriptor info = (URIResolverExtensionDescriptor) map.get(key);
- return info != null ? info.getResolver() : null;
- }
-
-
-
- /*
- protected URIResolverExtensionDescriptor getMatchingURIResolverExtensionDescriptor(List list, String projectNatureId, String resourceType, int stage)
- {
- URIResolverExtensionDescriptor result = null;
- for (Iterator i = list.iterator(); i.hasNext(); )
- {
- URIResolverExtensionDescriptor info = (URIResolverExtensionDescriptor)i.next();
- if (info.matches(projectNatureId, resourceType, stage))
- {
- result = info;
- break;
- }
- }
- return result;
- }*/
-}
-
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
deleted file mode 100644
index 4da8b1a..0000000
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2002 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Common Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/cpl-v10.html
-*
-* Contributors:
-* IBM - Initial API and implementation
-* Jens Lukowski/Innoopract - initial renaming/restructuring
-*
-*/
-package org.eclipse.wst.common.uriresolver.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.URIResolverPlugin;
-
-/**
- * @author csalter
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class URIResolverExtensionRegistryReader {
-
- protected static final String EXTENSION_POINT_ID = "resolverExtensions";
- protected static final String TAG_NAME = "resolverExtension";
- protected static final String ATT_ID = "id";
- protected static final String ELEM_PROJECT_NATURE_ID = "projectNature";
- protected static final String ATT_RESOURCE_TYPE = "resourceType";
- protected static final String ATT_CLASS = "class";
- protected static final String ATT_STAGE = "stage";
- protected static final String VAL_STAGE_PRE = "prenormalization";
- protected static final String VAL_STAGE_POST = "postnormalization";
- protected static final String ATT_VALUE = "value";
-
-
- protected URIResolverExtensionRegistry registry;
-
- public URIResolverExtensionRegistryReader(URIResolverExtensionRegistry registry) {
- this.registry = registry;
- }
-
- /**
- * read from plugin registry and parse it.
- */
- public void readRegistry() {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IExtensionPoint point = pluginRegistry.getExtensionPoint(URIResolverPlugin.getInstance().getDescriptor().getUniqueIdentifier(), EXTENSION_POINT_ID);
- if (point != null) {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- readElement(elements[i]);
- }
- }
- }
-
- /**
- * readElement() - parse and deal with an extension like:
- *
- * <extension point="org.eclipse.wst.contentmodel.util_implementation">
- * <util_implementation class = org.eclipse.wst.baseutil.CMUtilImplementationImpl />
- * </extension>
- */
- protected void readElement(IConfigurationElement element) {
- if (element.getName().equals(TAG_NAME)) {
- //String id = element.getAttribute(ATT_ID);
- String className = element.getAttribute(ATT_CLASS);
- //String projectNatureId = element.getAttribute(ATT_PROJECT_NATURE_ID);
- String resourceType = element.getAttribute(ATT_RESOURCE_TYPE);
- String stage = element.getAttribute(ATT_STAGE);
- List projectNatureIds = new ArrayList();
- IConfigurationElement[] ids = element.getChildren(ELEM_PROJECT_NATURE_ID);
- int numids = ids.length;
- for(int i = 0; i < numids; i++)
- {
- String tempid = ids[i].getAttribute(ATT_VALUE);
-
- if(tempid != null)
- {
- projectNatureIds.add(tempid);
- }
- }
- if (className != null) {
- try {
- ClassLoader classLoader = element.getDeclaringExtension().getDeclaringPluginDescriptor().getPlugin().getClass().getClassLoader();
- int stageint = URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION;
- if(stage.equalsIgnoreCase(VAL_STAGE_PRE))
- {
- stageint = URIResolverExtensionRegistry.STAGE_PRENORMALIZATION;
- }
- registry.put(className, classLoader, projectNatureIds, resourceType, stageint);
- } catch (Exception e) {
- }
- }
- }
- }
- }
diff --git a/plugins/org.eclipse.wst.validation.ui/.classpath b/plugins/org.eclipse.wst.validation.ui/.classpath
deleted file mode 100644
index a52d567..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="validateui/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.validation.ui/.cvsignore b/plugins/org.eclipse.wst.validation.ui/.cvsignore
deleted file mode 100644
index 963bc29..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-runtime
diff --git a/plugins/org.eclipse.wst.validation.ui/.project b/plugins/org.eclipse.wst.validation.ui/.project
deleted file mode 100644
index 32471f6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation.ui</name>
- <comment></comment>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.validation.ui/build.properties b/plugins/org.eclipse.wst.validation.ui/build.properties
deleted file mode 100644
index 02c26c0..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = runtime/validateui.jar,\
- plugin.xml,\
- plugin.properties
-source.runtime/validateui.jar = validateui/,\
- property_files/
-output.runtime/validateui.jar = bin/
diff --git a/plugins/org.eclipse.wst.validation.ui/build/buildcontrol.properties b/plugins/org.eclipse.wst.validation.ui/build/buildcontrol.properties
deleted file mode 100644
index 5938f6c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/buildcontrol.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-CONTACT=ruthdaly@ca.ibm.com
-ComponentShortName=validationui
-ComponentFullName=Validation Framework UI
-ComponentCompetency=Validation
-JavaCompile.1=srcjar
-BuildVerification.1=dir
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/build/package.xml b/plugins/org.eclipse.wst.validation.ui/build/package.xml
deleted file mode 100644
index 0ae0c31..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project name="com.ibm.etools.validation.ui" default="packagingPlugin" basedir="./..">
- <target name="init">
- <property name="packageDir" value=""/>
- <property name="plugin.directory" value="${basedir}"/>
- <property name="plugin.id" value="com.ibm.etools.validation.ui"/>
- <property name="plugin.version" value=""/>
- </target>
- <target name="packagingPlugin" depends="init">
- <echo message="${plugin.id}"/>
- <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
- <fileset dir="${plugin.directory}">
- <include name="plugin.properties"/>
- <include name="plugin.xml"/>
- <include name="runtime/validateui.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.validation.ui/build/sourcejar.txt b/plugins/org.eclipse.wst.validation.ui/build/sourcejar.txt
deleted file mode 100644
index b96f41c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/sourcejar.txt
+++ /dev/null
@@ -1 +0,0 @@
-validateui
diff --git a/plugins/org.eclipse.wst.validation.ui/build/wsBuild.xml b/plugins/org.eclipse.wst.validation.ui/build/wsBuild.xml
deleted file mode 100644
index 77c0b82..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build/wsBuild.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
- <!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
- <antcall target="buildjar">
- <param name="jarname" value="${defaultjarname}"/>
- <param name="jarclasspath" value="${plugin.classpath}"/>
- </antcall>
-</target>
-</project>
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.properties b/plugins/org.eclipse.wst.validation.ui/plugin.properties
deleted file mode 100644
index 5002309..0000000
--- a/plugins/org.eclipse.wst.validation.ui/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# Version 1.3
-#
-VBF_TITLE_PROPERTIES=Validation
-VBF_UI_POPUP_RUNVALIDATION=&Run Validation
-VBF_TITLE_PREFERENCE=Validation
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.xml b/plugins/org.eclipse.wst.validation.ui/plugin.xml
deleted file mode 100644
index 811d3c1..0000000
--- a/plugins/org.eclipse.wst.validation.ui/plugin.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.wst.validation.ui"
- name="Validation Framework UI"
- version="1.0.0"
- provider-name="IBM"
- description="This is only UI plugin for the validation framework. Some of the main UI functions this plugin provides are global validation references page, project validation properties page and manual run validation menu action."
- class="org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin">
-
- <runtime>
- <library name="runtime/validateui.jar">
- <export name="*"/>
- </library>
- </runtime>
- <requires>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.swt"/>
- <import plugin="org.eclipse.wst.common.frameworks.ui"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.wst.validation"/>
- </requires>
-
-
-<!-- ============================================== -->
-<!-- Popup Contributions -->
-<!-- ============================================== -->
-<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <viewerContribution
- targetID="#CommonNavigatorPopupMenu"
- id="ValidationMenuAction">
- <action
- label="%VBF_UI_POPUP_RUNVALIDATION"
- class="org.eclipse.wst.validation.internal.ui.ValidationMenuAction"
- menubarPath="additions"
- enablesFor="+"
- id="ValidationAction">
- </action>
- </viewerContribution>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Validation preference page -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%VBF_TITLE_PREFERENCE"
- class="org.eclipse.wst.validation.internal.ui.ValidationPreferencePage"
- id="ValidationPreferencePage">
- </page>
- </extension>
-
-<!-- ====================================================== -->
-<!-- Validation properties page -->
-<!-- ====================================================== -->
-<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- name="%VBF_TITLE_PROPERTIES"
- class="org.eclipse.wst.validation.internal.ui.ValidationPropertiesPage"
- id="ValidationPropertiesPage">
- </page>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation.ui/prepareforpii.xml b/plugins/org.eclipse.wst.validation.ui/prepareforpii.xml
deleted file mode 100644
index 1c3e278..0000000
--- a/plugins/org.eclipse.wst.validation.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.etools.validation.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/validate_ui.properties b/plugins/org.eclipse.wst.validation.ui/property_files/validate_ui.properties
deleted file mode 100644
index 36173e0..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/validate_ui.properties
+++ /dev/null
@@ -1,113 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# *************************************************************************
-# * Code oriented instructions:
-# *
-# * In the string, you may see the following special sequences:
-# * a) {n} where n is a number. These are replaceable parameters.
-# * b) '' In .properties files, in order to see one apostrophe (') in the final
-# * string, sometimes two apostrophes must be entered in the string. In the translated
-# * string, if there is at least one {n} in the string, then to show one apostrophe
-# * to the user, put two apostrophes in the string. If there are no {n} in the string,
-# * then put one apostrophe.
-# * For example, say that you want the user to read "George's file".
-# * GEORGE=George's file was on the desk.
-# * GEORGE2=George''s file and {0} were on the desk.
-# * GEORGE uses one apostrophe because there are no {n} and GEORGE2
-# * uses two apostrophes because there is a {n}.
-# * c) '' text '' where text can be any word(s). The text between the double
-# * apostrophes should not be translated.
-# * d) <text> where text can be any word(s). The text between the angle
-# * brackets should NOT be translated.
-# * e) "text" where text can be any word(s). The text between the quotation
-# * marks should NOT be translated.
-# *
-# *************************************************************************
-# * Other instructions
-# * a) Do not translate any text that is on a line which begins with a comment
-# * symbol (#).
-# * b) Do not translate these words:
-# * schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
-# * c) Please return the .properties files using the same directory structure.
-# * This is necessary because two of the files have the same name.
-# *
-# *************************************************************************
-# Any other comments to the translators are on lines which start like this: # 2TC:
-#
-# Version 1.12
-#
-#
-# ID:
-# VBF - Validation Builder Framework
-#
-
-#
-# Begin Validation Builder Framework UI Strings
-#
-# IDs:
-# VBF_EXC=Exception or error text
-# VBF_UI=UI label
-#
-PREF_BUTTON_OVERRIDE=Allow projects to override these preference settings
-PREF_BUTTON_FULL=Run validation when you manually build a project
-PREF_BUTTON_AUTO=Run validation automatically when you save changes to a resource
-PREF_BUTTON_SELECTALL=Select All
-PREF_BUTTON_DESELECTALL=Deselect All
-PREF_VALLIST_TITLE=The selected validators will run when validation is performed:
-PREF_LBL_MAXMSGS=Maximum number of validation messages on a project
-PREF_ERROR_INT=IWAE0001E The number of validation messages must be a positive integer.
-PREF_BUTTON_ASYNC=Run validation in a background thread
-
-PROP_BUTTON_OVERRIDE=Override validation preferences
-PROP_BUTTON_FULL=Run validation when you manually build {0}
-VBF_UI_LBL_AUTO_VALIDATE=Run validation automatically when you save changes to {0} resources.
-PROP_BUTTON_SELECTALL=Select All
-PROP_BUTTON_DESELECTALL=Deselect All
-VBF_UI_LBL_DESC=The selected validators will run when {0} is validated:
-PROP_LBL_MAXMSSGS=Maximum number of validation messages on {0}
-PROP_ERROR_INT=IWAE0002E The number of validation messages must be a positive integer.
-PROP_LBL_CANNOTOVERRIDE=To enable the "Override validation preferences" checkbox, select the "Allow projects to override these preference settings" checkbox in the workbench Preferences dialog.
-PROP_BUTTON_ASYNC=Run validation in a background thread on {0}
-
-VBF_EXC_INTERNAL=IWAE0003E An unexpected error occurred during validation. Read the log file.
-VBF_EXC_INTERNAL_PROJECT=IWAE0004E An unexpected error occurred during validation of project {0}. Read the log file.
-VBF_EXC_INTERNAL_TITLE=IWAE0005E Internal error
-VBF_EXC_INTERNAL_PAGE=IWAE0006E An unexpected error occured; click Cancel to close the wizard.
-
-VBF_EXC_INVALID_REGISTER=IWAE0007E Validators can run only on open resources.
-
-VBF_UI_NO_VALIDATORS_INSTALLED=No validators are installed.
-
-VBF_UI_LBL_NOVALIDATORS_DESC=It is not possible to run any Validators, at the project level, for this type of project.
-
-VBF_UI_NO_VALIDATORS_ENABLED=Enable at least one validator on {0}. To select the validators that you want to run, open this project''s Properties wizard, turn to the Validation section, and select one or more validators in the list.
-
-VBF_UI_CHECKBOXGROUP_TITLE=Validators
-
-VBF_UI_CLOSED_PROJECT=Validation cannot run on a closed project. Open project {0} and try again.
-VBF_UI_MSSGBOX_TITLE_NONINC=Some of the Validators Do Not Support Automatic Validation
-VBF_UI_AUTO_ON_NONINC=Although automatic validation has been selected, some of the validators will not be invoked during the automatic processing. The following validators do not support automatic validation: {0}
-
-VBF_UI_PRJNEEDINPUT=Project {0} and its children were not validated because none of the enabled validators validates that type of project.
-VBF_UI_RESNEEDINPUT=Resource {0} was not validated because none of the enabled validators validates that type of resource.
-
-VBF_UI_MAX_REPORTED=Validation was terminated on {0} because the maximum number of messages were reported.
-VBF_UI_PRJVALIDATED=Validation of project {0} is complete.
-VBF_UI_RESVALIDATED=Validation of resource {0} is complete.
-VBF_UI_CANCELLED=Validation cancelled.
-VBF_UI_COMPLETE=Validation completed.
-VBF_UI_CLOSE=Close
-VBF_UI_STATUS=Status
-VBF_UI_RESCANCELLED=Validation was cancelled on {0}.
-#
-# End Validation Builder Framework UI Strings
-#
-
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
deleted file mode 100644
index 8e2d107..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-public interface ContextIds {
- static final String PREFIX = ValidationUIPlugin.PLUGIN_ID;
-
- // context ids for the Validation Properties Page
- public static final String VALIDATION_PROPERTIES_PAGE = PREFIX + ".jvpp0000"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_OVERRIDE = PREFIX + ".jvpp0001"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_BUILD_NOVALSELECTED = PREFIX + ".jvpp0003"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_AUTOBUILD = PREFIX + ".jvpp0004"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALSELECTED = PREFIX + ".jvpp0005"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALCONFIG = PREFIX + ".jvpp0006"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_AUTO_ENABLED = PREFIX + ".jvpp0020"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED = PREFIX + ".jvpp0030"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_BOTH = PREFIX + ".jvpp0031"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_AUTO = PREFIX + ".jvpp0032"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_MANUAL = PREFIX + ".jvpp0033"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_REBUILD_ENABLED = PREFIX + ".jvpp0040"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_MAX_MESSAGES = PREFIX + ".jvpp0050"; //$NON-NLS-1$
-
- public static final String VALIDATION_PREFERENCE_PAGE = PREFIX + ".jvgp0000"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_OVERRIDE = PREFIX + ".jvgp0005"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_REBUILD_ENABLED = PREFIX + ".jvgp0010"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_REBUILD_DISABLED = PREFIX +
- // ".jvgp0011"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_AUTO_ENABLED = PREFIX + ".jvgp0020"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_AUTOBUILD = PREFIX +
- // ".jvgp0021"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALSELECTED = PREFIX
- // + ".jvgp0022"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALCONFIG = PREFIX +
- // ".jvgp0023"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_MAX_MESSAGES = PREFIX + ".jvgp0030"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ProgressAndTextDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ProgressAndTextDialog.java
deleted file mode 100644
index 63af6e3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ProgressAndTextDialog.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-
-/**
- * Display both progress status and cumulative status (text) to the user.
- */
-public class ProgressAndTextDialog extends ProgressMonitorDialog {
- protected static final String NEWLINE = System.getProperty("line.separator"); //$NON-NLS-1$
- protected Text text = null;
- protected boolean cancelPressed = false; // Has the "Cancel" button been clicked?
- protected boolean closePressed = false; // Has the "Close" button been clicked?
- protected boolean operationDone = false; // Has the operation completed?
- protected Cursor arrowCursor; // The cursor used in the cancel button.
-
-
- public ProgressAndTextDialog(Shell parent) {
- super(parent);
- setShellStyle(SWT.BORDER | SWT.TITLE | SWT.RESIZE); // do not make this dialog modal
- setBlockOnOpen(false); // do not force the user to close this dialog before using eclipse
- }
-
- public Control createDialogArea(Composite parent) {
- super.createDialogArea(parent);
-
- final int hHint = 100;
- final int wHint = 250;
-
- Composite composite = new Composite(parent, SWT.NONE);
- Label textLabel = new Label(composite, SWT.LEFT | SWT.WRAP);
- textLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_STATUS));
- GridData labelData = new GridData();
- labelData.horizontalSpan = 2;
- textLabel.setLayoutData(labelData);
-
- composite.setLayout(new GridLayout()); // use the layout's default preferences
- GridData data = new GridData(GridData.FILL_BOTH);
- data.heightHint = hHint;
- data.widthHint = wHint;
- data.horizontalSpan = 2;
- composite.setLayoutData(data);
-
- text = new Text(composite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY | SWT.BORDER);
- GridData d = new GridData(GridData.FILL_BOTH);
- text.setLayoutData(d);
-
- return composite;
- }
-
- public void addText(final String messageString) {
- if (getShell() != null) {
- getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- text.append(messageString);
- text.append(NEWLINE);
- }
- });
- }
- }
-
- /**
- * Do not dismiss the dialog until the user presses the Close button.
- */
- public boolean close() {
- if (closePressed) {
- // Cancel button converted to "Close" button, and user clicked the "Close" button
- return super.close();
- }
-
- // Turn the "cancel" button into a "Close" button and keep the window open until
- // the user clicks the "Close" button.
- progressIndicator.setVisible(false);
- if (arrowCursor == null)
- arrowCursor = new Cursor(cancel.getDisplay(), SWT.CURSOR_ARROW);
- getShell().setCursor(arrowCursor);
- if (cancelPressed) {
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_CANCELLED));
- } else {
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_COMPLETE));
- }
- cancel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_CLOSE));
- cancel.setEnabled(true);
- return false;
- }
-
- protected void internalCancelPressed() {
- // Has this method been called because "Cancel" has been clicked or
- // because "Close" has been clicked?
- if (operationDone) {
- // "Close" was clicked.
- closePressed = true;
- close();
- } else {
- // "Cancel" was clicked.
- cancelPressed = true;
- }
- }
-
- /**
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(Composite)
- */
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
-
- // Cannot override cancelPressed() because of the way that
- // ProgressMonitorDialog is coded.
- // The ProgressMonitorDialog parent, instead of overriding the
- // cancelPressed() method, added an anonymous Listener to the
- // cancel button. When the button's Listener is invoked, if
- // close() has been called by cancelPressed(), then an
- // exception is thrown (SWTException - "Widget is disposed').
- // Work around this by adding an anonymous
- // cancel listener, which will be called after the parent's
- // cancel listener, and this class' listener will call close().
- cancel.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- internalCancelPressed();
- }
- });
- }
-
- /**
- * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean,
- * IRunnableWithProgress)
- */
- public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
- try {
- super.run(fork, cancelable, runnable);
- } finally {
- operationDone = true;
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceConstants.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceConstants.java
deleted file mode 100644
index ac4b244..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceConstants.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-/**
- * This interface contains the constants used as keys into the ResourceBundle.
- */
-public interface ResourceConstants {
- // Internal error has occurred.
- public static final String VBF_EXC_INTERNAL = "VBF_EXC_INTERNAL"; //$NON-NLS-1$
-
- // Internal error occurred while constructing or running the Properties or Preference page.
- public static final String VBF_EXC_INTERNAL_PAGE = "VBF_EXC_INTERNAL_PAGE"; //$NON-NLS-1$
-
- // Internal error has occurred.
- public static final String VBF_EXC_INTERNAL_PROJECT = "VBF_EXC_INTERNAL_PROJECT"; //$NON-NLS-1$
- public static final String VBF_EXC_INTERNAL_TITLE = "VBF_EXC_INTERNAL_TITLE"; //$NON-NLS-1$
-
- // Should never happen, since plugin.xml specifies an IProject objectClass filter, but if the
- // ValidationPropertiesPage is shown on a non-IProject resource, this message will be what's
- // shown.
- public static final String VBF_EXC_INVALID_REGISTER = "VBF_EXC_INVALID_REGISTER"; //$NON-NLS-1$
-
- // On the Properties Page, this is the string which explains to the user what to do. The string
- // is
- // displayed in a label.
- public static final String VBF_UI_LBL_DESC = "VBF_UI_LBL_DESC"; //$NON-NLS-1$
-
- // On the Properties Page, this is the string which explains to the user what to do. The string
- // is
- // displayed in a label.
- public static final String VBF_UI_LBL_NOVALIDATORS_DESC = "VBF_UI_LBL_NOVALIDATORS_DESC"; //$NON-NLS-1$
-
- // Label on the checkbox button of the validator page
- public static final String VBF_UI_LBL_AUTO_VALIDATE = "VBF_UI_LBL_AUTO_VALIDATE"; //$NON-NLS-1$
-
- // If the user has selected "Validate this project" from the popupMenu, but has no validators
- // enabled, tell them that nothing will run.
- public static final String VBF_UI_NO_VALIDATORS_ENABLED = "VBF_UI_NO_VALIDATORS_ENABLED"; //$NON-NLS-1$
-
- // On the Properties Page, this is the title of the group which encloses the CheckboxTableViewer
- // (the list of configured validators).
- public static final String VBF_UI_CHECKBOXGROUP_TITLE = "VBF_UI_CHECKBOXGROUP_TITLE"; //$NON-NLS-1$
- public static final String VBF_UI_AUTO_ON_NONINC = "VBF_UI_AUTO_ON_NONINC"; //$NON-NLS-1$
- public static final String VBF_UI_MSSGBOX_TITLE_NONINC = "VBF_UI_MSSGBOX_TITLE_NONINC"; //$NON-NLS-1$
- public static final String VBF_UI_AUTO_NOTE = "VBF_UI_AUTO_NOTE"; //$NON-NLS-1$
- public static final String VBF_UI_AUTO_NOTE_TEXT = "VBF_UI_AUTO_NOTE_TEXT"; //$NON-NLS-1$
- public static final String VBF_UI_MENUITEM_TEXT = "VBF_UI_MENUITEM_TEXT"; //$NON-NLS-1$
- public static final String VBF_UI_MENUITEM_TEXT_DEFAULT = "VBF_UI_MENUITEM_TEXT_DEFAULT"; //$NON-NLS-1$
- public static final String VBF_UI_CLOSED_PROJECT = "VBF_UI_CLOSED_PROJECT"; //$NON-NLS-1$
- public static final String VBF_UI_NO_VALIDATORS_INSTALLED = "VBF_UI_NO_VALIDATORS_INSTALLED"; //$NON-NLS-1$
-
- public static final String VBF_UI_POPUP_RUNVALIDATION = "%VBF_UI_POPUP_RUNVALIDATION"; //$NON-NLS-1$
-
- /* package */static final String PREF_BUTTON_SELECTALL = "PREF_BUTTON_SELECTALL"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_DESELECTALL = "PREF_BUTTON_DESELECTALL"; //$NON-NLS-1$
- /* package */static final String PREF_VALLIST_TITLE = "PREF_VALLIST_TITLE"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_AUTO = "PREF_BUTTON_AUTO"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_OVERRIDE = "PREF_BUTTON_OVERRIDE"; //$NON-NLS-1$
- /* package */static final String PREF_BUTTON_FULL = "PREF_BUTTON_FULL"; //$NON-NLS-1$
- /* package */static final String PREF_LBL_MAXMSGS = "PREF_LBL_MAXMSGS"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_OVERRIDE = "PROP_BUTTON_OVERRIDE"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_FULL = "PROP_BUTTON_FULL"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_SELECTALL = "PROP_BUTTON_SELECTALL"; //$NON-NLS-1$
- /* package */static final String PROP_BUTTON_DESELECTALL = "PROP_BUTTON_DESELECTALL"; //$NON-NLS-1$
- /* package */static final String PROP_LBL_MAXMSSGS = "PROP_LBL_MAXMSSGS"; //$NON-NLS-1$
- /* package */static final String PREF_ERROR_INT = "PREF_ERROR_INT"; //$NON-NLS-1$
- /* package */static final String PROP_ERROR_INT = "PROP_ERROR_INT"; //$NON-NLS-1$
-
- /* package */static final String VBF_UI_PRJNEEDINPUT = "VBF_UI_PRJNEEDINPUT"; //$NON-NLS-1$
- /* package */static final String VBF_UI_RESNEEDINPUT = "VBF_UI_RESNEEDINPUT"; //$NON-NLS-1$
- /* package */static final String VBF_UI_MAX_REPORTED = "VBF_UI_MAX_REPORTED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_PRJVALIDATED = "VBF_UI_PRJVALIDATED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_RESVALIDATED = "VBF_UI_RESVALIDATED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_CANCELLED = "VBF_UI_CANCELLED"; //$NON-NLS-1$
- /* package */static final String VBF_UI_COMPLETE = "VBF_UI_COMPLETE"; //$NON-NLS-1$
- /* package */static final String VBF_UI_CLOSE = "VBF_UI_CLOSE"; //$NON-NLS-1$
- /* package */static final String VBF_UI_STATUS = "VBF_UI_STATUS"; //$NON-NLS-1$
- /* package */static final String VBF_UI_RESCANCELLED = "VBF_UI_RESCANCELLED"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceHandler.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceHandler.java
deleted file mode 100644
index d569cdb..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ResourceHandler.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.logging.Level;
-
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-import com.ibm.wtp.common.logger.LogEntry;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-
-/**
- * This class retrieves the Strings from the .properties file appropriate for the machine's Locale.
- */
-public class ResourceHandler {
- //TODO Make this class final once the public ResourceHandler has been deleted.
- private static ResourceBundle _bundle = null;
-
- protected ResourceHandler() {
- //TODO Make this method private once the public ResourceHandler has been deleted.
- super();
- }
-
- /**
- * Return the resource bundle which contains the messages, as identified by
- */
- public static ResourceBundle getBundle() {
- if (_bundle == null) {
- try {
- _bundle = ResourceBundle.getBundle(ValidationUIPlugin.getBundleName());
- } catch (MissingResourceException exc) {
- _bundle = null;
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getBundle()"); //$NON-NLS-1$
- entry.setText("Cannot find bundle " + ValidationUIPlugin.getBundleName()); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- }
- return _bundle;
- }
-
- public static String getExternalizedMessage(String key) {
- try {
- ResourceBundle bundle = getBundle();
- if (bundle == null) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText("Resource bundle is null"); //$NON-NLS-1$
- logger.write(Level.FINE, entry);
- }
- return key;
- }
-
- return bundle.getString(key);
- } catch (NullPointerException exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String)"); //$NON-NLS-1$
- entry.setText("Cannot find message id " + key); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- return key;
- }
-
- public static String getExternalizedMessage(String key, String[] parms) {
- String res = ""; //$NON-NLS-1$
- try {
- res = java.text.MessageFormat.format(getExternalizedMessage(key), parms);
- } catch (MissingResourceException exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setText("Cannot find message id " + key); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- } catch (NullPointerException exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("org.eclipse.wst.validation.internal.operations.ui.ResourceHandler.getExternalizedMessage(String, String[])"); //$NON-NLS-1$
- entry.setText("Cannot format message id " + key + " with " + parms.length + " parameters."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- entry.setTargetException(exc);
- logger.write(Level.FINE, entry);
- }
- }
- return res;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
deleted file mode 100644
index d52b12d..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-
-public class ValidateAction extends SelectionListenerAction {
- protected ValidationMenuAction delegate;
-
- public ValidateAction() {
- super(ValidationUIPlugin.getResourceString(ResourceConstants.VBF_UI_POPUP_RUNVALIDATION));
- delegate = new ValidationMenuAction();
- }
-
- /**
- * Implementation of method defined on <code>IAction</code>.
- */
- public void run() {
- delegate.run(this);
- }
-
- /**
- * Updates this action in response to the given selection.
- * <p>
- * The <code>SelectionListenerAction</code> implementation of this method returns
- * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
- * super method returns <code>false</code>, the overriding method must also return
- * <code>false</code>.
- * </p>
- *
- * @param selection
- * the new selection
- * @return <code>true</code> if the action should be enabled for this selection, and
- * <code>false</code> otherwise
- */
- protected boolean updateSelection(IStructuredSelection selection) {
- if (!super.updateSelection(selection))
- return false;
-
- delegate.selectionChanged(this, selection);
-
- return isEnabled(); // "Enabled" is set by the delegate.
- }
-
- /**
- * If a subclass of ValidateAction enables this menu action on a type that is not an IResource,
- * this method returns the IResource[] that represent that object. If null is returned, the
- * object will be ignored and the user will not be notified that the object was not validated.
- * This method will be called when updateSelection and run are called. (The result of this
- * method is used to determine which resources will be validated)
- */
- protected IResource[] getResource(Object selected) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
deleted file mode 100644
index 229f1c6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
+++ /dev/null
@@ -1,558 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.common.frameworks.internal.ValidationSelectionHandlerRegistryReader;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.operations.EnabledIncrementalValidatorsOperation;
-import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-import com.ibm.wtp.common.logger.LogEntry;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * This class implements the pop-up menu item "Run Validation" When the item is selected, this
- * action triggers a validation of the project, using all configured, enabled validators.
- */
-public class ValidationMenuAction implements IViewActionDelegate {
- private ISelection _currentSelection = null;
- protected static final String SEP = "/"; //$NON-NLS-1$
- private Display _currentDisplay = null;
- private IResourceVisitor _folderVisitor = null;
- private Map _selectedResources = null;
-
- public ValidationMenuAction() {
- super();
- _currentDisplay = Display.getCurrent(); // cache the display before
- // this action is forked. After
- // the action is forked,
- // Display.getCurrent() returns
- // null.
- _selectedResources = new HashMap();
- }
-
- private Display getDisplay() {
- return (_currentDisplay == null) ? Display.getCurrent() : _currentDisplay;
- }
-
- /**
- * Return the wizard's shell.
- */
- Shell getShell() {
- Display display = getDisplay();
- Shell shell = (display == null) ? null : display.getActiveShell();
- if (shell == null && display != null) {
- Shell[] shells = display.getShells();
- if (shells.length > 0)
- shell = shells[0];
- }
- return shell;
- }
-
- private ISelection getCurrentSelection() {
- return _currentSelection;
- }
-
- /**
- * Return a map of the selected elements. Each key of the map is an IProject, and the value is a
- * Set of the selected resources in that project. If a project is selected, and nothing else in
- * the project is selected, a full validation (null value) will be done on the project. If a
- * project is selected, and some files/folders in the project are also selected, only the
- * files/folders will be validated. If a folder is selected, all of its contents are also
- * validated.
- */
- private Map loadSelected(ValidateAction action, boolean refresh) {
- if (refresh) {
- // selectionChanged(IAction, ISelection) has been called. Flush the
- // existing cache of resources and
- // add just the currently selected ones.
- _selectedResources.clear();
- }
- ISelection selection = getCurrentSelection();
- if ((selection == null) || selection.isEmpty() || !(selection instanceof IStructuredSelection)) {
- return null;
- }
- Object[] elements = ((IStructuredSelection) selection).toArray();
- for (int i = 0; i < elements.length; i++) {
- Object element = elements[i];
- if (element == null) {
- continue;
- }
- addSelected(action, element);
- }
- return _selectedResources;
- }
-
- private void addSelected(ValidateAction action, Object selected) {
- if (selected instanceof IProject) {
- addSelected((IProject) selected);
- } else if (selected instanceof IFile) {
- addSelected((IFile) selected);
- } else if (selected instanceof IFolder) {
- addVisitor((IFolder) selected);
- } else if (isValidType(getExtendedType(selected))) {
- addSelected(action,getExtendedType(selected));
- } else {
- // Not a valid input type. Must be IProject, IJavaProject, or
- // IResource.
- // If this ValidationMenuAction is a delegate of ValidateAction, is
- // the input type recognized by the ValidateAction?
- boolean valid = false;
- if (action != null) {
- IResource[] resources = action.getResource(selected);
- if (resources != null) {
- valid = true;
- for (int i = 0; i < resources.length; i++) {
- addSelected(action, resources[i]);
- }
- }
- }
- if (!valid) {
- // Stop processing. (This allows the "Run Validation" menu item
- // to gray
- // out once at least one non-validatable element is selected.)
- _selectedResources.clear();
- }
- }
- }
-
- private Object getExtendedType(Object selected) {
- Object result = ValidationSelectionHandlerRegistryReader.getInstance().getExtendedType(selected);
- return result == null ? selected : result;
- }
-
- private boolean isValidType(Object object) {
- return object instanceof IProject || object instanceof IFile || object instanceof IFolder;
- }
-
- private void addSelected(IProject selected) {
- _selectedResources.put(selected, null); // whatever the values were
- // before, the entire project
- // needs to be revalidated now
- }
-
-// private void addSelected(IJavaProject selected) {
-// _selectedResources.put(selected.getProject(), null); // whatever the
-// // values were
-// // before, the
-// // entire project
-// // needs to be
-// // revalidated now
-// }
-
- void addSelected(IResource selected) {
- IProject project = selected.getProject();
- boolean added = _selectedResources.containsKey(project);
- List changedRes = null;
- if (added) {
- // If the value is null, the entire project needs to be validated
- // anyway.
- changedRes = (List) _selectedResources.get(project);
- if (changedRes == null) {
- return;
- }
- } else {
- changedRes = new ArrayList();
- }
- if (!changedRes.contains(selected)) {
- changedRes.add(selected);
- _selectedResources.put(project, changedRes);
- }
- }
-
- private void addVisitor(IFolder selected) {
- // add the folder and its children
- try {
- selected.accept(getFolderVisitor());
- } catch (CoreException exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction.addSelected(IFolder)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- return;
- }
- }
-
- private IResourceVisitor getFolderVisitor() {
- if (_folderVisitor == null) {
- _folderVisitor = new IResourceVisitor() {
- public boolean visit(IResource res) {
- if (res instanceof IFile) {
- addSelected(res);
- } else if (res instanceof IFolder) {
- addSelected(res);
- }
- return true; // visit the resource's children
- }
- };
- }
- return _folderVisitor;
- }
-
- /**
- * The delegating action has been performed. Implement this method to do the actual work.
- *
- * @param action
- * action proxy that handles the presentation portion of the plugin action
- * @param window
- * the desktop window passed by the action proxy
- */
- public void run(IAction action) {
- ValidateAction vaction = null;
- if (action instanceof ValidateAction) {
- vaction = (ValidateAction) action;
- }
- final Map projects = loadSelected(vaction, false);
- if ((projects == null) || (projects.size() == 0)) {
- return;
- }
- final ProgressAndTextDialog dialog = new ProgressAndTextDialog(getShell());
- try {
- IRunnableWithProgress runnable = ValidationUIPlugin.getRunnableWithProgress(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
- validate(monitor, projects, dialog);
- }
- });
- // validate all EJBs in this project
- dialog.run(true, true, runnable); // fork, cancelable.
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("ValidationMenuAction.run(IAction)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc.getTargetException());
- logger.write(Level.SEVERE, entry);
- }
- }
- String internalErrorMessage = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL);
- dialog.addText(internalErrorMessage);
- } catch (InterruptedException exc) {
- // User cancelled validation
- } catch (Throwable exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("ValidationMenuAction.run(IAction)"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- String internalErrorMessage = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL);
- dialog.addText(internalErrorMessage);
- } finally {
- _selectedResources.clear();
- }
- }
-
- void validate(final IProgressMonitor monitor, final Map projects, ProgressAndTextDialog dialog) {
- boolean cancelled = false; // Was the operation cancelled?
- Iterator iterator = projects.keySet().iterator();
- while (iterator.hasNext()) {
- IProject project = (IProject) iterator.next();
- if (project == null) {
- continue;
- }
- try {
- if (cancelled) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESCANCELLED, new String[]{project.getName()});
- dialog.addText(message);
- continue;
- }
- if (!project.isOpen()) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_CLOSED_PROJECT, new String[]{project.getName()});
- dialog.addText(message);
- continue;
- }
- performValidation(monitor, projects, dialog, project);
- } catch (OperationCanceledException exc) {
- // When loading file deltas, if the operation has been
- // cancelled, then
- // resource.accept throws an OperationCanceledException.
- cancelled = true;
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESCANCELLED, new String[]{project.getName()});
- dialog.addText(message);
- } catch (Throwable exc) {
- logException(dialog, project, exc);
- }
- }
- }
-
- /**
- * @param dialog
- * @param project
- * @param exc
- */
- private void logException(ProgressAndTextDialog dialog, IProject project, Throwable exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceID("ValidationMenuAction.validate"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- String internalErrorMessage = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PROJECT, new String[]{project.getName()});
- dialog.addText(internalErrorMessage);
- }
-
- /**
- * @param monitor
- * @param projects
- * @param dialog
- * @param project
- * @throws CoreException
- */
- private void performValidation(final IProgressMonitor monitor, final Map projects, ProgressAndTextDialog dialog, IProject project) throws CoreException {
- // Even if the "maximum number of messages" message is on
- // the task list,
- // run validation, because some messages may have been
- // fixed
- // and there may be space for more messages.
- List changedResources = (List) projects.get(project);
- IResource[] resources = null;
- if (changedResources != null) {
- resources = new IResource[changedResources.size()];
- changedResources.toArray(resources);
- }
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if (prjp.numberOfEnabledValidators() > 0) {
- checkProjectConfiguration(monitor, dialog, project, resources, prjp);
- } else {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_NO_VALIDATORS_ENABLED, new String[]{project.getName()});
- dialog.addText(message);
- }
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction::run"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
-
- /**
- * @param monitor
- * @param dialog
- * @param project
- * @param resources
- * @param prjp
- * @throws InvocationTargetException
- * @throws CoreException
- */
- private void checkProjectConfiguration(final IProgressMonitor monitor, ProgressAndTextDialog dialog, IProject project, IResource[] resources, ProjectConfiguration prjp) throws InvocationTargetException, CoreException {
- boolean successful = true; // Did the operation
- // complete
- // successfully?
- EnabledValidatorsOperation validOp = null;
- if (resources == null) {
- validOp = new EnabledValidatorsOperation(project, prjp.runAsync());
- } else {
- validOp = new EnabledIncrementalValidatorsOperation(resources, project, prjp.runAsync());
- }
- if (validOp.isNecessary(monitor)) {
- ResourcesPlugin.getWorkspace().run(validOp, monitor);
- } else {
- if (resources == null) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_PRJNEEDINPUT, new String[]{project.getName()});
- dialog.addText(message);
- } else {
- for (int i = 0; i < resources.length; i++) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESNEEDINPUT, new String[]{resources[i].getFullPath().toString()});
- dialog.addText(message);
- }
- }
- }
- if (successful) {
- performSucessful(dialog, project, resources);
- } else {
- String internalErrorMessage = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PROJECT, new String[]{project.getName()});
- dialog.addText(internalErrorMessage);
- }
- }
-
- /**
- * @param dialog
- * @param project
- * @param resources
- */
- private void performSucessful(ProgressAndTextDialog dialog, IProject project, IResource[] resources) {
- boolean limitExceeded = ValidatorManager.getManager().wasValidationTerminated(project);
- if (limitExceeded) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_MAX_REPORTED, new String[]{project.getName()});
- dialog.addText(message);
- } else if (resources == null) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_PRJVALIDATED, new String[]{project.getName()});
- dialog.addText(message);
- } else {
- for (int i = 0; i < resources.length; i++) {
- String message = ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_RESVALIDATED, new String[]{resources[i].getFullPath().toString()});
- dialog.addText(message);
- }
- }
- }
-
- /**
- * Selection in the desktop has changed. Plugin provider can use it to change the availability
- * of the action or to modify other presentation properties.
- *
- * <p>
- * Action delegate cannot be notified about selection changes before it is loaded. For that
- * reason, control of action's enable state should also be performed through simple XML rules
- * defined for the extension point. These rules allow enable state control before the delegate
- * has been loaded.
- * </p>
- *
- * @param action
- * action proxy that handles presentation portion of the plugin action
- * @param selection
- * current selection in the desktop
- */
- public void selectionChanged(IAction action, ISelection selection) {
- _currentSelection = selection;
- int count = 0;
- boolean fwkActivated = (ValidationPlugin.isActivated() && ValidationRegistryReader.isActivated());
- if (fwkActivated) {
- ValidateAction vaction = null;
- if (action instanceof ValidateAction) {
- vaction = (ValidateAction) action;
- }
- final Map projects = loadSelected(vaction, true);
- if ((projects != null) && (projects.size() > 0)) {
- Iterator iterator = projects.keySet().iterator();
- while (iterator.hasNext()) {
- // If at least one project can be validated, make "enabled"
- // true and
- // let the dialog tell the user which projects need to be
- // opened,
- // validators enabled, etc.
- IProject project = (IProject) iterator.next();
- if ((project != null) && (project.isOpen())) {
- // If the validation plugin hasn't been activated yet,
- // don't activate it just to
- // find out if there are validators. Only ask if there
- // are enabled validators if
- // the plugin has already been activated.
- try {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfigurationWithoutMigrate(project);
- count += prjp.numberOfEnabledValidators();
- } catch (InvocationTargetException exc) {
- Logger logger = ValidationPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationMenuAction::selectionChanged"); //$NON-NLS-1$
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- if (exc.getTargetException() != null) {
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- if (count > 0)
- break;
- }
- }
- }
- }
- action.setEnabled((count > 0) || (!fwkActivated)); // Don't disable the
- // action just
- // because the
- // framework hasn't
- // been activated.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorActionsExtension#init(org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorExtensionSite)
- */
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- run(action);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
- */
- public void init(IViewPart view) {
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPreferencePage.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPreferencePage.java
deleted file mode 100644
index 22223b4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPreferencePage.java
+++ /dev/null
@@ -1,941 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-import com.ibm.wtp.common.logger.LogEntry;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * This class and its inner classes are not intended to be subclassed outside of the validation
- * framework.
- */
-public class ValidationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
- private IValidationPage _pageImpl = null;
-
- /**
- * Initially, this interface was created as an abstract class, and getControl() was implemented.
- * (getProject() could also have been implemented in the abstract class.) However, at runtime, a
- * NullPointerException was thrown; the inner class had lost its pointer to its enclosing class.
- * After some experimentation, I discovered that if I changed the parent to an interface, the
- * enclosing class could be found. (Merely moving the AValidationPage into its own file was
- * insufficient.)
- */
- public interface IValidationPage {
- public Composite createPage(Composite parent) throws InvocationTargetException;
-
- public boolean performOk() throws InvocationTargetException;
-
- public boolean performDefaults() throws InvocationTargetException;
-
- public Composite getControl();
-
- public void dispose();
-
- public void loseFocus(); // Page is losing focus (event notification)
-
- public void gainFocus(); // Page is gaining focus (event notification)
- }
-
- public class InvalidPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private Label messageLabel = null;
-
- public InvalidPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is added to the Properties guide if some internal problem occurred; for
- * example, the highlighted item in the workbench is not an IProject (according to this
- * page's plugin.xml, this page is only valid when an IProject is selected).
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
- WorkbenchHelp.setHelp(composite, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_REGISTER));
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since this page occurs under invalid circumstances, there is nothing to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- // This page does not depend on the contents of any other page in the wizard, so do
- // nothing.
- }
-
- public void gainFocus() {
- // This page does not depend on the contents of any other page in the wizard, so do
- // nothing.
- }
- }
-
- private class NoValidatorsPage implements IValidationPage {
- private Composite page = null;
- private Composite composite = null;
- private GridLayout layout = null;
- private GridData data = null;
- private Label messageLabel = null;
-
- public NoValidatorsPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is created if an IProject is selected, but that project has no validators
- * configured (i.e., the page is valid, but an empty list.)
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- // top level group
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
- data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- composite.setLayoutData(data);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_NO_VALIDATORS_INSTALLED));
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
-
- /**
- * Since there are no validators, there is nothing to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- // data.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- // This page does not depend on the contents of any other page in the wizard, so do
- // nothing.
- }
-
- public void gainFocus() {
- // This page does not depend on the contents of any other page in the wizard, so do
- // nothing.
- }
- }
-
- private class ValidatorListPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- CheckboxTableViewer validatorList = null;
- private Button selectAllButton = null;
- private Button deselectAllButton = null;
- private Label emptyRowPlaceholder = null;
- Button valWhenBuildButton = null;
- Button valWhenAutoBuildButton = null;
- private Text maxValProblemsField = null;
- private Label maxValProblemsFieldLabel = null;
- Button overrideButton = null;
- private Label listLabel = null;
-
- GlobalConfiguration pagePreferences = null; // the values currently on the page, but not
- // necessarily stored yet. Package visibility
- // for the widget listeners (the compiler would
- // have to create a synthetic accessor method in
- // order to access this field)
- private boolean _isAutoBuildEnabled; // initialized in the constructor
- private ValidatorMetaData[] _oldVmd = null; // Cache the enabled validators so that, if
- // there is no change to this list, the
- // expensive task list update can be avoided
- private boolean _allow = false; // Cache the value of the prefence "allow projects to
-
- // override" so that, when OK is clicked, we can determine
- // if "allow" has changed or not.
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- /**
- * Disposes of this content provider. This is called by the viewer when it is disposed.
- */
- public void dispose() {
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given
- * element. These elements can be presented as rows in a table, items in a list, etc.
- * The result is not modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof ValidatorMetaData[]) {
- // The Collection is the Collection which is returned by ValidatorManager's
- // getConfiguredValidatorMetaData(IProject) call.
- // This Collection is set to be the input of the CheckboxTableViewer in
- // ValidationPropertiesPage$ValidatorListPage's createPage(Composite)
- // method.
- return (ValidatorMetaData[]) inputElement;
- }
- return new Object[0];
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a
- * different element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to
- * changes on the new input (using model-specific means), and deregistering the viewer
- * from the old input. In response to these change notifications, the content provider
- * propagates the changes to the viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not
- * previously have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have
- * an input
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-
-
- }
-
- /**
- * This class is provided for ValidationPropertiesPage$ValidatorListPage's
- * checkboxTableViewer element.
- */
- public class ValidationLabelProvider extends LabelProvider {
- /**
- * Override the LabelProvider's text, by customizing the text for a ValidatorMetaData
- * element.
- */
- public String getText(Object element) {
- if (element == null) {
- return ""; //$NON-NLS-1$
- } else if (element instanceof ValidatorMetaData) {
- return ((ValidatorMetaData) element).getValidatorDisplayName();
- } else {
- return super.getText(element);
- }
- }
- }
-
- /**
- * This class is used to sort the CheckboxTableViewer elements.
- */
- public class ValidationViewerSorter extends ViewerSorter {
- /**
- * Returns a negative, zero, or positive number depending on whether the first element
- * is less than, equal to, or greater than the second element.
- * <p>
- * The default implementation of this method is based on comparing the elements'
- * categories as computed by the <code>category</code> framework method. Elements
- * within the same category are further subjected to a case insensitive compare of their
- * label strings, either as computed by the content viewer's label provider, or their
- * <code>toString</code> values in other cases. Subclasses may override.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param e1
- * the first element
- * @param e2
- * the second element
- * @return a negative number if the first element is less than the second element; the
- * value <code>0</code> if the first element is equal to the second element;
- * and a positive number if the first element is greater than the second element
- */
- public int compare(Viewer viewer, Object e1, Object e2) {
- // Can't instantiate ViewerSorter because it's abstract, so use this
- // inner class to represent it.
- return super.compare(viewer, e1, e2);
- }
- }
-
- public ValidatorListPage(Composite parent) throws InvocationTargetException {
- _isAutoBuildEnabled = ValidatorManager.getManager().isGlobalAutoBuildEnabled();
- pagePreferences = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration()); // This
- // represents
- // the
- // values
- // on
- // the
- // page
- // that
- // haven't
- // been
- // persisted
- // yet.
- // Start
- // with
- // the
- // last
- // values
- // that
- // were
- // persisted
- // into
- // the
- // current
- // page's
- // starting
- // values.
- _oldVmd = pagePreferences.getEnabledValidators(); // Cache the enabled validators so
- // that, if there is no change to this
- // list, the expensive task list
- // update can be avoided
- _allow = pagePreferences.canProjectsOverride();
-
- page = createPage(parent);
- }
-
- public Composite createPage(Composite parent) throws InvocationTargetException {
- // top level group
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- composite.setLayout(new GridLayout()); // use the layout's default preferences
- WorkbenchHelp.setHelp(composite, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- Composite validatorGroup = new Composite(composite, SWT.NONE);
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
- WorkbenchHelp.setHelp(validatorGroup, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- GridData overrideData = new GridData(GridData.FILL_HORIZONTAL);
- overrideData.horizontalSpan = 2;
- overrideButton = new Button(validatorGroup, SWT.CHECK);
- overrideButton.setLayoutData(overrideData);
- overrideButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_OVERRIDE));
- overrideButton.setEnabled(true);
- overrideButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setCanProjectsOverride(overrideButton.getSelection());
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(overrideButton, ContextIds.VALIDATION_PREFERENCE_PAGE_OVERRIDE);
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- GridData valWhenBuildData = new GridData(GridData.FILL_HORIZONTAL);
- valWhenBuildData.horizontalSpan = 2;
- valWhenBuildButton = new Button(validatorGroup, SWT.CHECK);
- valWhenBuildButton.setLayoutData(valWhenBuildData);
- valWhenBuildButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_FULL));
- valWhenBuildButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setBuildValidate(valWhenBuildButton.getSelection());
- valWhenBuildButton.setFocus();
- }
- });
-
- GridData valWhenAutoBuildData = new GridData(GridData.FILL_HORIZONTAL);
- valWhenAutoBuildData.horizontalSpan = 2;
- valWhenAutoBuildButton = new Button(validatorGroup, SWT.CHECK);
- valWhenAutoBuildButton.setLayoutData(valWhenAutoBuildData);
- valWhenAutoBuildButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_AUTO));
- valWhenAutoBuildButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setAutoValidate(valWhenAutoBuildButton.getSelection());
- valWhenAutoBuildButton.setFocus();
- }
- });
-
- listLabel = new Label(validatorGroup, SWT.NONE);
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- listLabel.setLayoutData(listLabelData);
- listLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_VALLIST_TITLE));
-
- GridData validatorListData = new GridData(GridData.FILL_HORIZONTAL);
- validatorListData.horizontalSpan = 2;
- validatorList = CheckboxTableViewer.newCheckList(validatorGroup, SWT.BORDER);
- validatorList.getTable().setLayoutData(validatorListData);
- validatorList.setLabelProvider(new ValidationLabelProvider());
- validatorList.setContentProvider(new ValidationContentProvider());
- validatorList.setSorter(new ValidationViewerSorter());
- validatorList.setInput(pagePreferences.getValidators());
- validatorList.getTable().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setEnabledValidators(GlobalConfiguration.convertToArray(validatorList.getCheckedElements()));
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- try {
- performDefaults();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
-
- selectAllButton = new Button(validatorGroup, SWT.PUSH);
- selectAllButton.setLayoutData(new GridData());
- selectAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_SELECTALL));
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performSelectAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(selectAllButton, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- deselectAllButton = new Button(validatorGroup, SWT.PUSH);
- deselectAllButton.setLayoutData(new GridData());
- deselectAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_BUTTON_DESELECTALL));
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDeselectAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(deselectAllButton, ContextIds.VALIDATION_PREFERENCE_PAGE);
-
- Composite buttonGroup = new Composite(composite, SWT.NONE);
- GridLayout buttonGroupLayout = new GridLayout();
- buttonGroupLayout.numColumns = 2;
- buttonGroup.setLayout(buttonGroupLayout);
- buttonGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- maxValProblemsFieldLabel = new Label(buttonGroup, SWT.NONE);
- maxValProblemsFieldLabel.setLayoutData(new GridData());
- maxValProblemsFieldLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_LBL_MAXMSGS));
-
- maxValProblemsField = new Text(buttonGroup, SWT.SINGLE | SWT.BORDER);
- maxValProblemsField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- maxValProblemsField.addKeyListener(new KeyListener() {
- /**
- * Sent when a key is pressed on the system keyboard.
- *
- * @param e
- * an event containing information about the key press
- */
- public void keyPressed(KeyEvent e) {
- }
-
- /**
- * Sent when a key is released on the system keyboard.
- *
- * @param e
- * an event containing information about the key release
- */
- public void keyReleased(KeyEvent e) {
- try {
- pagePreferences.setMaximumNumberOfMessages(checkInteger());
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(maxValProblemsField, ContextIds.VALIDATION_PREFERENCE_PAGE_MAX_MESSAGES);
-
- // Have to set the tab order or only the first checkbox in a Composite can
- // be tab-ed to. (Seems to apply only to checkboxes. Have to use the arrow
- // key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[]{overrideButton, valWhenBuildButton, valWhenAutoBuildButton, validatorList.getTable(), selectAllButton, deselectAllButton});
-
- updateWidgets();
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- protected int checkInteger() throws InvocationTargetException {
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- String text = maxValProblemsField.getText();
- if (text == null) {
- setErrorMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_ERROR_INT));
- return gp.getMaximumNumberOfMessages();
- }
- try {
- Integer tempInt = new Integer(text.trim());
-
- // no exception? It's an int, then.
- if (tempInt.intValue() <= 0) {
- setErrorMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_ERROR_INT));
- return gp.getMaximumNumberOfMessages();
- }
- setErrorMessage(null);
- return Integer.valueOf(maxValProblemsField.getText().trim()).intValue();
- } catch (NumberFormatException exc) {
- setErrorMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.PREF_ERROR_INT));
- return gp.getMaximumNumberOfMessages();
- }
- }
-
- protected void updateWidgets() throws InvocationTargetException {
- // Need to update even the widgets that do not change based on another
- // widgets because of performDefaults(). If performDefaults() is selected,
- // then the pagePreferences values are reset, and these widgets
- // might also need to be updated.
- overrideButton.setSelection(pagePreferences.canProjectsOverride());
-
- maxValProblemsField.setText(String.valueOf(pagePreferences.getMaximumNumberOfMessages()));
-
- updateTable();
-
- boolean valEnabled = (pagePreferences.numberOfEnabledValidators() > 0);
- valWhenBuildButton.setEnabled(valEnabled);
- valWhenBuildButton.setSelection(pagePreferences.isBuildValidate() && valEnabled);
-
- boolean incValEnabled = (pagePreferences.numberOfEnabledIncrementalValidators() > 0);
- valWhenAutoBuildButton.setEnabled(_isAutoBuildEnabled && incValEnabled);
- valWhenAutoBuildButton.setSelection(pagePreferences.isAutoValidate() && incValEnabled && _isAutoBuildEnabled);
-
- updateHelp();
- }
-
- protected void updateTable() throws InvocationTargetException {
- TableItem[] items = validatorList.getTable().getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
-
- // Should the validator be enabled? Read the user's preferences from last time,
- // if they exist, and set from that. If they don't exist, use the Validator class'
- // default value.
- validatorList.setChecked(vmd, pagePreferences.isEnabled(vmd));
- }
- }
-
- public boolean performOk() throws InvocationTargetException {
- storeValues();
- updateTaskList();
- return true;
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- pagePreferences.resetToDefault();
- updateWidgets();
- checkInteger(); // clear the "max must be a positive integer" message if it exists
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performSelectAll() throws InvocationTargetException {
- validatorList.setAllChecked(true);
- pagePreferences.setEnabledValidators(GlobalConfiguration.convertToArray(validatorList.getCheckedElements()));
- updateWidgets();
- selectAllButton.setFocus();
- return true;
- }
-
- public boolean performDeselectAll() throws InvocationTargetException {
- validatorList.setAllChecked(false);
- pagePreferences.setEnabledValidators(GlobalConfiguration.convertToArray(validatorList.getCheckedElements()));
- updateWidgets();
- deselectAllButton.setFocus();
- return true;
- }
-
- protected void updateHelp() {
- // never disable this widget because users don't expect the preference page to alter
- // based on workbench contents
- WorkbenchHelp.setHelp(valWhenBuildButton, ContextIds.VALIDATION_PREFERENCE_PAGE_REBUILD_ENABLED);
-
- // never disable this widget because users don't expect the preference page to alter
- // based on workbench contents
- WorkbenchHelp.setHelp(valWhenAutoBuildButton, ContextIds.VALIDATION_PREFERENCE_PAGE_AUTO_ENABLED);
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
- private void storeValues() throws InvocationTargetException {
- pagePreferences.setCanProjectsOverride(overrideButton.getSelection());
-
- // If the manual build button is disabled because no validators are selected in the
- // task list, don't overwrite the user's preference.
- if (valWhenBuildButton.isEnabled()) {
- pagePreferences.setBuildValidate(valWhenBuildButton.getSelection());
- }
-
- // If the auto build button is disabled because no validators are selected in the
- // task list, or because auto-build is disabled, don't overwrite the user's preference.
- if (valWhenAutoBuildButton.isEnabled()) {
- pagePreferences.setAutoValidate(valWhenAutoBuildButton.getSelection());
- }
-
- pagePreferences.setMaximumNumberOfMessages(checkInteger());
- pagePreferences.setEnabledValidators(GlobalConfiguration.convertToArray(validatorList.getCheckedElements()));
-
- pagePreferences.passivate();
- pagePreferences.store();
- // If the projects aren't allowed to override, clear their settings.
- if (!pagePreferences.canProjectsOverride()) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject[] projects = workspace.getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- try {
- if (project.isOpen()) {
- if (ConfigurationManager.getManager().isMigrated(project)) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- prjp.setDoesProjectOverride(false);
- prjp.passivate();
- prjp.store();
- }
- }
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- }
-
- }
-
- private void updateTaskList() {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IProject[] projects = workspace.getRoot().getProjects();
- boolean allowChanged = (pagePreferences.canProjectsOverride() != _allow);
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- try {
- if (project.isOpen()) {
- ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
- if (!prjp.doesProjectOverride() && (prjp.hasEnabledValidatorsChanged(_oldVmd, allowChanged) || ValidatorManager.getManager().isMessageLimitExceeded(project))) {
- // If the project used to override the preferences, and the preferences
- // make that impossible now, then update the task list.
- //
- // If the preferences allow projects to override, and they don't, and if
- // the validators have changed, then update the task list.
- ValidatorManager.getManager().updateTaskList(project); // Do not remove
- // the exceeded
- // message; only
- // ValidationOperation
- // should do that
- // because it's
- // about to run
- // validation. If
- // the limit is
- // increased,
- // messages may
- // still be
- // missing, so
- // don't remove
- // the "messages
- // may be
- // missing"
- // message.
- }
- }
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- listLabel.dispose();
- overrideButton.dispose();
- maxValProblemsField.dispose();
- maxValProblemsFieldLabel.dispose();
- valWhenAutoBuildButton.dispose();
- valWhenBuildButton.dispose();
- emptyRowPlaceholder.dispose();
- deselectAllButton.dispose();
- selectAllButton.dispose();
- validatorList.getTable().dispose();
- // validatorList.dispose();
- // layout.dispose();
- // data.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- // This page does not need to cache anything before it loses focus.
- }
-
- public void gainFocus() {
- // This page depends on the Workbench Preference page, so update the value of the
- // isAutoBuild (in case the workbench page's value has changed), and then update
- // this page's widgets.
- try {
- _isAutoBuildEnabled = ValidatorManager.getManager().isGlobalAutoBuildEnabled();
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- try {
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- if (gp.numberOfValidators() == 0) {
- _pageImpl = new NoValidatorsPage(parent);
- } else {
- try {
- _pageImpl = new ValidatorListPage(parent);
- } catch (InvocationTargetException exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Throwable exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- } catch (InvocationTargetException exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Throwable exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
-
- return _pageImpl.getControl();
- }
-
- /*
- * @see IWorkbenchPreferencePage#init(IWorkbench)
- */
- public void init(IWorkbench workbench) {
- }
-
- protected void noDefaultAndApplyButton() {
- super.noDefaultAndApplyButton();
- }
-
- /**
- * Performs special processing when this page's Defaults button has been pressed.
- * <p>
- * This is a framework hook method for sublcasses to do special things when the Defaults button
- * has been pressed. Subclasses may override, but should call <code>super.performDefaults</code>.
- * </p>
- */
- protected void performDefaults() {
- super.performDefaults();
-
- try {
- _pageImpl.performDefaults();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Throwable exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- /**
- * When the user presses the "OK" or "Apply" button on the Properties Guide/Properties Page,
- * respectively, some processing is performed by this PropertyPage. If the page is found, and
- * completes successfully, true is returned. Otherwise, false is returned, and the guide doesn't
- * finish.
- */
- public boolean performOk() {
- try {
- return _pageImpl.performOk();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- } catch (Throwable exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- }
- }
-
- /**
- * Since the pages are inner classes of a child PreferencePage, not a PreferencePage itself,
- * DialogPage's automatic disposal of its children's widgets cannot be used. Instead, dispose of
- * each inner class' widgets explicitly.
- */
- public void dispose() {
- super.dispose();
- try {
- if (_pageImpl != null) {
- _pageImpl.dispose();
- }
- } catch (Throwable exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- private void logError(Throwable exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationPreferencePage.displayAndLogError"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL_PAGE);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc instanceof InvocationTargetException) {
- if (((InvocationTargetException) exc).getTargetException() != null) {
- entry.setTargetException(((InvocationTargetException) exc).getTargetException());
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
-
- /**
- * package visibility because if this method is private, then the compiler needs to create a
- * synthetic accessor method for the internal classes, and that can have performance
- * implications.
- */
- void displayAndLogError(String title, String message, Throwable exc) {
- logError(exc);
- displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
- }
-
- private void displayMessage(String title, String message, int iIconType) {
- MessageBox messageBox = new MessageBox(getShell(), org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
- messageBox.setMessage(message);
- messageBox.setText(title);
- messageBox.open();
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (_pageImpl == null)
- return;
- if (visible) {
- _pageImpl.gainFocus();
- } else {
- _pageImpl.loseFocus();
- }
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#getDefaultsButton()
- */
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
deleted file mode 100644
index 10f7e87..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
+++ /dev/null
@@ -1,1029 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-import com.ibm.wtp.common.logger.LogEntry;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-/**
- * This class and its inner classes are not intended to be subclassed outside of the validation
- * framework.
- *
- * This page implements the PropertyPage for validators; viewed when the user right-clicks on the
- * IProject, selects "Properties", and then "Validation."
- *
- * There exist three possible page layouts: if there is an eclipse internal error, and the page is
- * brought up on a non-IProject type; if there are no validators configured on that type of
- * IProject, and a page which lists all validators configured on that type of IProject. These three
- * pages are implemented as inner classes, so that it's clear which method is needed for which
- * input. When all of the methods, and behaviour, were implemented in this one class, much more
- * error-checking had to be done, to ensure that the method wasn't being called incorrectly by one
- * of the pages.
- */
-public class ValidationPropertiesPage extends PropertyPage {
- static final String NEWLINE = System.getProperty("line.separator"); //$NON-NLS-1$
- static final String TAB = "\t"; //$NON-NLS-1$
- static final String NEWLINE_AND_TAB = NEWLINE + TAB;
- private IValidationPage _pageImpl = null;
-
- /**
- * Initially, this interface was created as an abstract class, and getControl() was implemented.
- * (getProject() could also have been implemented in the abstract class.) However, at runtime, a
- * NullPointerException was thrown; the inner class had lost its pointer to its enclosing class.
- * After some experimentation, I discovered that if I changed the parent to an interface, the
- * enclosing class could be found. (Merely moving the AValidationPage into its own file was
- * insufficient.)
- */
- public interface IValidationPage {
- public abstract Composite createPage(Composite parent) throws InvocationTargetException;
-
- public abstract boolean performOk() throws InvocationTargetException;
-
- public boolean performDefaults() throws InvocationTargetException;
-
- public Composite getControl();
-
- public abstract void dispose();
- }
-
- public class InvalidPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private Label messageLabel = null;
-
- public InvalidPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is added to the Properties guide if some internal problem occurred; for
- * example, the highlighted item in the workbench is not an IProject (according to this
- * page's plugin.xml, this page is only valid when an IProject is selected).
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
- WorkbenchHelp.setHelp(composite, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INVALID_REGISTER));
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since this page occurs under invalid circumstances, there is nothing to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- composite.dispose();
- }
- }
-
- public class NoValidatorsPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private GridData data = null;
- private Label messageLabel = null;
-
- public NoValidatorsPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is created if an IProject is selected, but that project has no validators
- * configured (i.e., the page is valid, but an empty list.)
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- // top level group
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
- data = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- composite.setLayoutData(data);
- WorkbenchHelp.setHelp(composite, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- messageLabel = new Label(composite, SWT.NONE);
- String[] msgParm = {getProject().getName()};
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_LBL_NOVALIDATORS_DESC, msgParm));
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since there are no validators, there is nothing to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- // data.dispose();
- composite.dispose();
- }
- }
-
- public class ValidatorListPage implements IValidationPage {
- Composite page = null;
- GridLayout layout = null;
- GridData data = null;
- Label messageLabel = null;
- CheckboxTableViewer validatorList = null;
- Button overrideGlobalButton = null;
- Button autoButton = null;
- Button valWhenBuildButton = null;
- Button selectAllButton = null;
- Button deselectAllButton = null;
- Label emptyRowPlaceholder = null;
- Text maxValProblemsField = null;
- Label maxValProblemsFieldLabel = null;
-
- ProjectConfiguration pagePreferences = null;
-
- // default values for the widgets, initialized in the constructor
- private boolean isAutoBuildEnabled = false;
- private boolean isBuilderConfigured = false;
- private boolean canOverride = false;
-
- private ValidatorMetaData[] oldVmd = null; // Cache the enabled validators so that, if there
-
- // is no change to this list, the expensive task
- // list update can be avoided
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- /**
- * Disposes of this content provider. This is called by the viewer when it is disposed.
- */
- public void dispose() {
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given
- * element. These elements can be presented as rows in a table, items in a list, etc.
- * The result is not modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof ValidatorMetaData[]) {
- // The ValidatorMetaData[] is the array which is returned by ValidatorManager's
- // getConfiguredValidatorMetaData(IProject) call.
- // This array is set to be the input of the CheckboxTableViewer in
- // ValidationPropertiesPage$ValidatorListPage's createPage(Composite)
- // method.
- return (ValidatorMetaData[]) inputElement;
- }
- return new Object[0];
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a
- * different element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to
- * changes on the new input (using model-specific means), and deregistering the viewer
- * from the old input. In response to these change notifications, the content provider
- * propagates the changes to the viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not
- * previously have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have
- * an input
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
-
-
- }
-
- /**
- * This class is provided for ValidationPropertiesPage$ValidatorListPage's
- * checkboxTableViewer element.
- */
- public class ValidationLabelProvider extends LabelProvider {
- /**
- * Override the LabelProvider's text, by customizing the text for a ValidatorMetaData
- * element.
- */
- public String getText(Object element) {
- if (element == null) {
- return ""; //$NON-NLS-1$
- } else if (element instanceof ValidatorMetaData) {
- return ((ValidatorMetaData) element).getValidatorDisplayName();
- } else {
- return super.getText(element);
- }
- }
- }
-
- /**
- * This class is used to sort the CheckboxTableViewer elements.
- */
- public class ValidationViewerSorter extends ViewerSorter {
- /**
- * Returns a negative, zero, or positive number depending on whether the first element
- * is less than, equal to, or greater than the second element.
- * <p>
- * The default implementation of this method is based on comparing the elements'
- * categories as computed by the <code>category</code> framework method. Elements
- * within the same category are further subjected to a case insensitive compare of their
- * label strings, either as computed by the content viewer's label provider, or their
- * <code>toString</code> values in other cases. Subclasses may override.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param e1
- * the first element
- * @param e2
- * the second element
- * @return a negative number if the first element is less than the second element; the
- * value <code>0</code> if the first element is equal to the second element;
- * and a positive number if the first element is greater than the second element
- */
- public int compare(Viewer viewer, Object e1, Object e2) {
- // Can't instantiate ViewerSorter because it's abstract, so use this
- // inner class to represent it.
- return super.compare(viewer, e1, e2);
- }
- }
-
- public ValidatorListPage(Composite parent) throws InvocationTargetException {
- ConfigurationManager prefMgr = ConfigurationManager.getManager();
- ValidatorManager vMgr = ValidatorManager.getManager();
-
- pagePreferences = new ProjectConfiguration(prefMgr.getProjectConfiguration(getProject())); // This
- // represents
- // the
- // values
- // on
- // the
- // page
- // that
- // haven't
- // been
- // persisted
- // yet.
- // Start
- // with
- // the
- // last
- // values
- // that
- // were
- // persisted
- // into
- // the
- // current
- // page's
- // starting
- // values.
-
- // store the default values for the widgets
- canOverride = prefMgr.getGlobalConfiguration().canProjectsOverride();
- isAutoBuildEnabled = vMgr.isGlobalAutoBuildEnabled();
- isBuilderConfigured = ValidatorManager.doesProjectSupportBuildValidation(getProject());
- oldVmd = pagePreferences.getEnabledValidators(); // Cache the enabled validators so
- // that, if there is no change to this
- // list, the expensive task list update
- // can be avoided
-
- createPage(parent);
- }
-
- /**
- * This page is created if the current project has at least one validator configured on it.
- */
- public Composite createPage(Composite parent) throws InvocationTargetException {
- // top level group
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- page = new Composite(sc1, SWT.NONE);
- sc1.setContent(page);
- page.setLayout(new GridLayout()); // use the layout's default preferences
-
- Composite validatorGroup = new Composite(page, SWT.NONE);
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
-
- GridData overrideData = new GridData(GridData.FILL_HORIZONTAL);
- overrideData.horizontalSpan = 2;
- overrideGlobalButton = new Button(validatorGroup, SWT.CHECK);
- overrideGlobalButton.setLayoutData(overrideData);
- overrideGlobalButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_BUTTON_OVERRIDE, new String[]{getProject().getName()}));
- overrideGlobalButton.setFocus(); // must focus on something for F1 to have a topic to
- // launch
- overrideGlobalButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setDoesProjectOverride(overrideGlobalButton.getSelection());
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
-
-
- emptyRowPlaceholder = new Label(validatorGroup, SWT.NONE);
- emptyRowPlaceholder.setLayoutData(new GridData());
-
- GridData valWhenBuildData = new GridData(GridData.FILL_HORIZONTAL);
- valWhenBuildData.horizontalSpan = 2;
- valWhenBuildButton = new Button(validatorGroup, SWT.CHECK);
- valWhenBuildButton.setLayoutData(valWhenBuildData);
- valWhenBuildButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_BUTTON_FULL, new String[]{getProject().getName()}));
- valWhenBuildButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setBuildValidate(valWhenBuildButton.getSelection());
- valWhenBuildButton.setFocus();
- }
- });
-
- GridData valWhenAutoBuildData = new GridData(GridData.FILL_HORIZONTAL);
- valWhenAutoBuildData.horizontalSpan = 2;
- autoButton = new Button(validatorGroup, SWT.CHECK);
- autoButton.setLayoutData(valWhenAutoBuildData);
- autoButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_LBL_AUTO_VALIDATE, new String[]{getProject().getName()}));
- autoButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setAutoValidate(autoButton.getSelection());
- autoButton.setFocus();
- }
- });
-
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- messageLabel = new Label(validatorGroup, SWT.NONE);
- messageLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_LBL_DESC, new String[]{getProject().getName()}));
- messageLabel.setLayoutData(listLabelData);
-
- GridData validatorListData = new GridData(GridData.FILL_HORIZONTAL);
- validatorListData.horizontalSpan = 2;
- validatorList = CheckboxTableViewer.newCheckList(validatorGroup, SWT.BORDER);
- validatorList.getTable().setLayoutData(validatorListData);
- validatorList.setLabelProvider(new ValidationLabelProvider());
- validatorList.setContentProvider(new ValidationContentProvider());
- validatorList.setSorter(new ValidationViewerSorter());
- validatorList.getTable().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- pagePreferences.setEnabledValidators(ProjectConfiguration.convertToArray(validatorList.getCheckedElements()));
- try {
- updateWidgets();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- validatorList.setInput(pagePreferences.getValidators());
-
- selectAllButton = new Button(validatorGroup, SWT.PUSH);
- GridData selectData = new GridData();
- selectAllButton.setLayoutData(selectData);
- selectAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_BUTTON_SELECTALL));
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performSelectAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(selectAllButton, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
-
- GridData deselectData = new GridData();
- deselectAllButton = new Button(validatorGroup, SWT.PUSH);
- deselectAllButton.setLayoutData(deselectData);
- deselectAllButton.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_BUTTON_DESELECTALL));
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDeselectAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(deselectAllButton, ContextIds.VALIDATION_PROPERTIES_PAGE);
-
- Composite maxGroup = new Composite(page, SWT.NONE);
- GridLayout maxGroupLayout = new GridLayout();
- maxGroupLayout.numColumns = 2;
- maxGroup.setLayout(maxGroupLayout);
- GridData maxGroupData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- maxGroup.setLayoutData(maxGroupData);
-
- GridData maxLabel = new GridData();
- maxValProblemsFieldLabel = new Label(maxGroup, SWT.NONE);
- maxValProblemsFieldLabel.setLayoutData(maxLabel);
- maxValProblemsFieldLabel.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_LBL_MAXMSSGS, new String[]{getProject().getName()}));
-
- maxValProblemsField = new Text(maxGroup, SWT.SINGLE | SWT.BORDER);
- GridData maxValProblemsData = new GridData(GridData.FILL_HORIZONTAL);
- maxValProblemsField.setLayoutData(maxValProblemsData);
- maxValProblemsField.addKeyListener(new KeyListener() {
- /**
- * Sent when a key is pressed on the system keyboard.
- *
- * @param e
- * an event containing information about the key press
- */
- public void keyPressed(KeyEvent e) {
- }
-
- /**
- * Sent when a key is released on the system keyboard.
- *
- * @param e
- * an event containing information about the key release
- */
- public void keyReleased(KeyEvent e) {
- try {
- pagePreferences.setMaximumNumberOfMessages(checkInteger());
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
- });
- WorkbenchHelp.setHelp(maxValProblemsField, ContextIds.VALIDATION_PROPERTIES_PAGE_MAX_MESSAGES);
-
- // Have to set the tab order or only the first checkbox in a Composite can
- // be tab-ed to. (Seems to apply only to checkboxes. Have to use the arrow
- // key to navigate the checkboxes.)
- validatorGroup.setTabList(new Control[]{overrideGlobalButton, valWhenBuildButton, autoButton, validatorList.getTable(), selectAllButton, deselectAllButton});
-
- updateWidgets();
-
- page.setSize(page.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return page;
- }
-
- protected void updateTable() throws InvocationTargetException {
- TableItem[] items = validatorList.getTable().getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem item = items[i];
- ValidatorMetaData vmd = (ValidatorMetaData) item.getData();
-
- // Should the validator be enabled? Read the user's preferences from last time,
- // if they exist, and set from that. If they don't exist, use the Validator class'
- // default value.
- validatorList.setChecked(vmd, pagePreferences.isEnabled(vmd));
- }
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- pagePreferences.resetToDefault();
- updateWidgets();
- checkInteger(); // clear the "max must be a positive integer" message if it exists
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performSelectAll() throws InvocationTargetException {
- validatorList.setAllChecked(true);
- pagePreferences.setEnabledValidators(ProjectConfiguration.convertToArray(validatorList.getCheckedElements()));
- updateWidgets();
- selectAllButton.setFocus();
- return true;
- }
-
- public boolean performDeselectAll() throws InvocationTargetException {
- validatorList.setAllChecked(false);
- pagePreferences.setEnabledValidators(ProjectConfiguration.convertToArray(validatorList.getCheckedElements()));
- updateWidgets();
- deselectAllButton.setFocus();
- return true;
- }
-
- protected int checkInteger() throws InvocationTargetException {
- ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(getProject());
- String text = maxValProblemsField.getText();
- if (text == null) {
- setErrorMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_ERROR_INT));
- return pc.getMaximumNumberOfMessages();
- }
- try {
- Integer tempInt = new Integer(text.trim());
-
- // no exception? It's an int, then.
- if (tempInt.intValue() <= 0) {
- setErrorMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_ERROR_INT));
- return pc.getMaximumNumberOfMessages();
- }
- setErrorMessage(null);
- return Integer.valueOf(maxValProblemsField.getText().trim()).intValue();
- } catch (NumberFormatException exc) {
- setErrorMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.PROP_ERROR_INT));
- return pc.getMaximumNumberOfMessages();
- }
-
- }
-
- void updateWidgets() throws InvocationTargetException {
- // Since the setting of the "override" button enables/disables the other widgets on the
- // page,
- // update the enabled state of the other widgets from the "override" button.
- boolean overridePreferences = canOverride && pagePreferences.doesProjectOverride();
-
- overrideGlobalButton.setEnabled(canOverride);
- overrideGlobalButton.setSelection(overridePreferences);
-
- validatorList.getTable().setEnabled(overridePreferences);
- validatorList.setAllGrayed(!overridePreferences);
-
- selectAllButton.setEnabled(overridePreferences); // since help messsage isn't
- // context-sensitive, it's set in the
- // createPage method
- deselectAllButton.setEnabled(overridePreferences);
-
- maxValProblemsField.setEnabled(overridePreferences);
- maxValProblemsField.setText(String.valueOf(pagePreferences.getMaximumNumberOfMessages()));
-
- updateTable();
-
- // Never check if builder is configured because if it isn't, the user needs to be able
- // to add the builder via the instructions on the F1 infopops.
- // In the case when the builder isn't configured, show the checkbox as enabled but
- // cleared
- // The only time that these two checkboxes are disabled is when no validators are
- // enabled in the list.
- boolean valEnabled = (pagePreferences.numberOfEnabledValidators() > 0);
- valWhenBuildButton.setEnabled(overridePreferences && valEnabled);
- valWhenBuildButton.setSelection(pagePreferences.isBuildValidate() && valEnabled && isBuilderConfigured);
-
- boolean incValEnabled = (pagePreferences.numberOfEnabledIncrementalValidators() > 0);
- autoButton.setEnabled(overridePreferences && isAutoBuildEnabled && incValEnabled);
- autoButton.setSelection(pagePreferences.isAutoValidate() && incValEnabled && isAutoBuildEnabled && isBuilderConfigured);
-
- updateHelp();
- }
-
- protected void updateHelp() throws InvocationTargetException {
- // Whenever a widget is disabled, it cannot get focus.
- // Since it can't have focus, its context-sensitive F1 help can't come up.
- // From experimentation, I know that the composite parent of the widget
- // can't have focus either. So, fudge the focus by making the table the widget
- // surrogate so that the F1 help can be shown, with its instructions on how to
- // enable the disabled widget. The table never has F1 help associated with it other
- // than the page F1, so this fudge doesn't remove any context-sensitive help
- // from the table widget.
-
- if (autoButton.getEnabled()) {
- // set the table's help back to what it was
- WorkbenchHelp.setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE);
- WorkbenchHelp.setHelp(autoButton, ContextIds.VALIDATION_PROPERTIES_PAGE_AUTO_ENABLED);
- } else {
- // The order of the following if statement is important!
- // If the user cannot enable automatic validation on the project, then the user
- // should not be told, for example, to turn auto-build on. Let the user know that
- // no matter what they do they cannot run auto-validate on the project. IF the
- // project
- // supports auto-validate, THEN check for the items which the user can change.
- validatorList.getTable().setFocus();
- if (pagePreferences.numberOfIncrementalValidators() == 0) {
- WorkbenchHelp.setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALCONFIG);
- } else if (!ValidatorManager.getManager().isGlobalAutoBuildEnabled()) {
- WorkbenchHelp.setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_AUTOBUILD);
- } else {
- // Incremental validators configured but not selected
- WorkbenchHelp.setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALSELECTED);
- }
- }
-
- // if autoButton AND build button are disabled, show the build button's "to enable" text
- if (valWhenBuildButton.getEnabled()) {
- // Do NOT set the table's help back to what it was.
- // Only if auto-validate is enabled should the page go back.
- WorkbenchHelp.setHelp(valWhenBuildButton, ContextIds.VALIDATION_PROPERTIES_PAGE_REBUILD_ENABLED);
- } else {
- // page.getParent().setFocus();
- validatorList.getTable().setFocus();
- WorkbenchHelp.setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_BUILD_NOVALSELECTED);
- }
-
- // if the override button is disabled, show its "to enable" text.
- if (overrideGlobalButton.getEnabled()) {
- // Do NOT set the table's help back to what it was.
- // Only if auto-validate is enabled should the page go back.
- boolean doesProjectSupportBuildValidation = ValidatorManager.doesProjectSupportBuildValidation(getProject());
- GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
- boolean isPrefAuto = gp.isAutoValidate();
- boolean isPrefManual = gp.isBuildValidate();
- if (doesProjectSupportBuildValidation) {
- // Project supports build validation, so it doesn't matter what the preferences
- // are
- WorkbenchHelp.setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED);
- } else if (!doesProjectSupportBuildValidation && (isPrefAuto && isPrefManual)) {
- // Project doesn't support build validation, and the user prefers both auto and
- // manual build validation
- WorkbenchHelp.setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_BOTH);
- } else if (!doesProjectSupportBuildValidation && isPrefAuto) {
- // Project doesn't support build validation, and the user prefers auto build
- // validation
- WorkbenchHelp.setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_AUTO);
- } else if (!doesProjectSupportBuildValidation && isPrefManual) {
- // Project doesn't support build validation, and the user prefers manual build
- // validation
- WorkbenchHelp.setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_MANUAL);
- } else if (!doesProjectSupportBuildValidation && !isPrefAuto && !isPrefManual) {
- // Project doesn't support build validation, but that doesn't matter because the
- // user prefers no build validation.
- WorkbenchHelp.setHelp(overrideGlobalButton, ContextIds.VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED);
- }
- } else {
- validatorList.getTable().setFocus();
- // Preference page doesn't allow projects to override
- WorkbenchHelp.setHelp(validatorList.getTable(), ContextIds.VALIDATION_PROPERTIES_PAGE_DISABLED_OVERRIDE);
- }
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
- private void storeValues() throws InvocationTargetException {
- pagePreferences.setDoesProjectOverride(overrideGlobalButton.getSelection());
-
- if (pagePreferences.doesProjectOverride()) {
- // project override = user's preference + does the global preference allow the
- // project to override
-
- // If the manual build button is disabled because no validators are selected in the
- // task list, don't overwrite the user's preference.
- if (valWhenBuildButton.isEnabled()) {
- pagePreferences.setBuildValidate(valWhenBuildButton.getSelection());
- }
-
- // If the auto build button is disabled because no validators are selected in the
- // task list, or because auto-build is disabled, don't overwrite the user's
- // preference.
- if (autoButton.isEnabled()) {
- pagePreferences.setAutoValidate(autoButton.getSelection());
- }
-
- pagePreferences.setMaximumNumberOfMessages(checkInteger());
- pagePreferences.setEnabledValidators(ProjectConfiguration.convertToArray(validatorList.getCheckedElements()));
- } else {
- pagePreferences.resetToDefault(); // If the project can't or doesn't override,
- // update its values to match the global
- // preference values.
- }
-
- pagePreferences.passivate();
- }
-
- /**
- * Reads the list of validators, enables the validators which are selected, disables the
- * validators which are not selected, and if the auto-validate checkbox is chosen, performs
- * a full validation.
- */
- public boolean performOk() throws InvocationTargetException {
- // addBuilder MUST be called before storeValues
- // addBuilder adds a builder to the project, and that changes the project description.
- // Changing a project's description triggers the validation framework's "natureChange"
- // migration, and a nature change requires that the list of validators be recalculated.
- // If the builder is added after the values are stored, the stored values are
- // overwritten.
- addBuilder();
-
- // If this method is being called because an APPLY was hit instead of an OK,
- // recalculate the "can build be enabled" status because the builder may have
- // been added in the addBuilder() call above.
- // Also recalculate the values that depend on the isBuilderConfigured value.
- isBuilderConfigured = ValidatorManager.doesProjectSupportBuildValidation(getProject());
-
- // Persist the values.
- storeValues();
-
- if (autoButton.getSelection()) {
- int enabledIncrementalValidators = pagePreferences.numberOfEnabledIncrementalValidators();
- int enabledValidators = pagePreferences.numberOfEnabledValidators();
- if (enabledValidators != enabledIncrementalValidators) {
- // Then some of the enabled validators are not incremental
- int iIconType = org.eclipse.swt.SWT.ICON_INFORMATION;
- Display display = Display.getCurrent();
- Shell shell = (display == null) ? null : display.getActiveShell();
- MessageBox messageBox = new MessageBox(shell, org.eclipse.swt.SWT.OK | iIconType);
- messageBox.setText(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_MSSGBOX_TITLE_NONINC));
-
- ValidatorMetaData[] vmds = pagePreferences.getEnabledValidators();
- StringBuffer buffer = new StringBuffer(NEWLINE_AND_TAB);
- for (int i = 0; i < vmds.length; i++) {
- ValidatorMetaData vmd = vmds[i];
-
- if (!vmd.isIncremental()) {
- buffer.append(vmd.getValidatorDisplayName());
- buffer.append(NEWLINE_AND_TAB);
- }
- }
- messageBox.setMessage(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_UI_AUTO_ON_NONINC, new String[]{buffer.toString()}));
- messageBox.open();
- }
- }
-
- if (pagePreferences.hasEnabledValidatorsChanged(oldVmd, false) || ValidatorManager.getManager().isMessageLimitExceeded(getProject())) { // false
- // means
- // that
- // the
- // preference
- // "allow"
- // value
- // hasn't
- // changed
- ValidatorManager.getManager().updateTaskList(getProject()); // Do not remove the
- // exceeded message;
- // only
- // ValidationOperation
- // should do that
- // because it's about to
- // run validation. If
- // the limit is
- // increased, messages
- // may still be missing,
- // so don't remove the
- // "messages may be
- // missing" message.
- }
-
- return true;
- }
-
- /**
- * If the current project doesn't have the validation builder configured on it, add the
- * builder. Otherwise return without doing anything.
- */
- private void addBuilder() {
- if (overrideGlobalButton.getSelection()) { // do not add the builder unless the user
- // overrides the preferences
- if (autoButton.getSelection() || valWhenBuildButton.getSelection()) {
- ValidatorManager.addProjectBuildValidationSupport(getProject());
- }
- }
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- maxValProblemsField.dispose();
- maxValProblemsFieldLabel.dispose();
- selectAllButton.dispose();
- deselectAllButton.dispose();
- autoButton.dispose();
- valWhenBuildButton.dispose();
- validatorList.getTable().dispose();
- messageLabel.dispose();
- // layout.dispose();
- // data.dispose();
- emptyRowPlaceholder.dispose();
- overrideGlobalButton.dispose();
- page.dispose();
- }
- }
-
- /**
- * ValidationPreferencePage constructor comment.
- */
- public ValidationPropertiesPage() {
- // Some of the initialization is done in the "initialize" method, which is
- // called by the "getPageType" method, because the current project must
- // be known in order to initialize those fields.
- }
-
- /**
- * Given a parent (the Properties guide), create the Validators page to be added to it.
- */
- protected Control createContents(Composite parent) {
- IProject project = getProject();
-
- if ((project == null) || !project.isOpen()) {
- _pageImpl = new InvalidPage(parent);
- } else {
- try {
- if (ConfigurationManager.getManager().getProjectConfiguration(project).numberOfValidators() == 0) {
- _pageImpl = new NoValidatorsPage(parent);
- } else {
- _pageImpl = new ValidatorListPage(parent);
- }
- } catch (InvocationTargetException exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Throwable exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- return _pageImpl.getControl();
- }
-
- /**
- * Since the pages are inner classes of a child PreferencePage, not a PreferencePage itself,
- * DialogPage's automatic disposal of its children's widgets cannot be used. Instead, dispose of
- * each inner class' widgets explicitly.
- */
- public void dispose() {
- super.dispose();
- try {
- _pageImpl.dispose();
- } catch (Throwable exc) {
- logError(exc);
- }
- }
-
- /**
- * Returns the highlighted item in the workbench.
- */
- public IProject getProject() {
- Object element = getElement();
-
- if (element == null) {
- return null;
- }
-
- if (element instanceof IProject) {
- return (IProject) element;
- }
-
- return null;
- }
-
- protected void noDefaultAndApplyButton() {
- super.noDefaultAndApplyButton();
- }
-
- /**
- * Performs special processing when this page's Defaults button has been pressed.
- * <p>
- * This is a framework hook method for sublcasses to do special things when the Defaults button
- * has been pressed. Subclasses may override, but should call <code>super.performDefaults</code>.
- * </p>
- */
- protected void performDefaults() {
- super.performDefaults();
- try {
- _pageImpl.performDefaults();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- } catch (Throwable exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- }
- }
-
- /**
- * When the user presses the "OK" or "Apply" button on the Properties Guide/Properties Page,
- * respectively, some processing is performed by this PropertyPage. If the page is found, and
- * completes successfully, true is returned. Otherwise, false is returned, and the guide doesn't
- * finish.
- */
- public boolean performOk() {
- try {
- return _pageImpl.performOk();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- } catch (Throwable exc) {
- displayAndLogError(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_TITLE), ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_EXC_INTERNAL_PAGE), exc);
- return false;
- }
- }
-
- void logError(Throwable exc) {
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.SEVERE)) {
- LogEntry entry = ValidationUIPlugin.getLogEntry();
- entry.setSourceIdentifier("ValidationPropertiesPage.displayAndLogError"); //$NON-NLS-1$
- entry.setMessageTypeIdentifier(ResourceConstants.VBF_EXC_INTERNAL_PAGE);
- entry.setTargetException(exc);
- logger.write(Level.SEVERE, entry);
-
- if (exc instanceof InvocationTargetException) {
- if (((InvocationTargetException) exc).getTargetException() != null) {
- entry.setTargetException(((InvocationTargetException) exc).getTargetException());
- logger.write(Level.SEVERE, entry);
- }
- }
- }
- }
-
- void displayAndLogError(String title, String message, Throwable exc) {
- logError(exc);
- displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
- }
-
- private void displayMessage(String title, String message, int iIconType) {
- MessageBox messageBox = new MessageBox(getShell(), org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
- messageBox.setMessage(message);
- messageBox.setText(title);
- messageBox.open();
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#getDefaultsButton()
- */
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIConstants.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIConstants.java
deleted file mode 100644
index 7adea37..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIConstants.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-/**
- * @deprecated For use by the validation framework only.
- */
-public interface ValidationUIConstants extends org.eclipse.wst.validation.internal.ui.ResourceConstants {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
deleted file mode 100644
index 0370071..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui.plugin;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.validation.internal.operations.ValidationOperation;
-
-
-/**
- * This is a wrapper for an IWorkspaceRunnable to the IRunnableWithProgress. This class needs to be
- * used when running the operation from a IRunnableContext.
- *
- * @see IRunnableContext
- * @see ValidationUIPlugin#getRunnableWithProgress Creation date: (5/8/2001 1:28:45 PM)
- * @author: Administrator
- */
-public class RunnableWithProgressWrapper implements IRunnableWithProgress {
- private IHeadlessRunnableWithProgress headlessRunnable = null;
- private IWorkspaceRunnable workspaceRunnable = null;
- private ValidationOperation validationOperation = null;
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * RunnableWithProgressWrapper(IWorkspaceRunnable)
- */
- public RunnableWithProgressWrapper(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- setHeadlessRunnable(aHeadlessRunnableWithProgress);
- }
-
- public RunnableWithProgressWrapper(IWorkspaceRunnable aHeadlessRunnableWithProgress) {
- setWorkspaceRunnable(aHeadlessRunnableWithProgress);
- }
-
- public RunnableWithProgressWrapper(ValidationOperation op) {
- setValidationOperation(op);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use getWorkspaceRunnable()
- */
- protected IHeadlessRunnableWithProgress getHeadlessRunnable() {
- return headlessRunnable;
- }
-
- protected IWorkspaceRunnable getWorkspaceRunnable() {
- return workspaceRunnable;
- }
-
- /**
- * @see IRunnableWithProgress
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- if (getHeadlessRunnable() != null) {
- getHeadlessRunnable().run(monitor);
- } else {
- IWorkspaceRunnable runnable = (getWorkspaceRunnable() == null) ? validationOperation : getWorkspaceRunnable();
- if (runnable == null) {
- return;
- }
- ResourcesPlugin.getWorkspace().run(runnable, monitor);
- }
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc);
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use setWorkspaceRunnable(IWorkspaceRunnable)
- */
- protected void setHeadlessRunnable(IHeadlessRunnableWithProgress newHeadlessRunnable) {
- headlessRunnable = newHeadlessRunnable;
- }
-
- protected void setWorkspaceRunnable(IWorkspaceRunnable newWorkspaceRunnable) {
- workspaceRunnable = newWorkspaceRunnable;
- }
-
- protected void setValidationOperation(ValidationOperation op) {
- validationOperation = op;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
deleted file mode 100644
index 1069a81..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.validation.internal.ui.plugin;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.validation.internal.operations.ValidationOperation;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-
-import com.ibm.wtp.common.logger.LogEntry;
-import com.ibm.wtp.common.logger.proxy.Logger;
-
-
-
-public class ValidationUIPlugin extends WTPUIPlugin {
- private static ValidationUIPlugin _plugin = null;
-
- public final static String VALIDATION_PROP_FILE_NAME = "validate_ui"; //$NON-NLS-1$
- public static final String PLUGIN_ID = "org.eclipse.wst.validation.ui"; //$NON-NLS-1$
-
- public ValidationUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- if (_plugin == null) {
- _plugin = this;
- }
- }
-
- public static String getBundleName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static LogEntry getLogEntry() {
- return ValidationPlugin.getLogEntry();
- }
-
-
- public static ValidationUIPlugin getPlugin() {
- return _plugin;
- }
-
- /**
- * Returns the translated String found with the given key.
- *
- * @param key
- * java.lang.String
- * @return java.lang.String
- */
- public static String getResourceString(String key) {
- try {
- return getPlugin().getDescriptor().getResourceString(key);
- } catch (Exception e) {
- e.printStackTrace();
- Logger logger = ValidationUIPlugin.getLogger();
- if (logger.isLoggingLevel(Level.FINE)) {
- LogEntry entry = getLogEntry();
- entry.setSourceID("ValidationUIPlugin.getResourceString(String)"); //$NON-NLS-1$
- entry.setText("Missing resource for key" + key); //$NON-NLS-1$
- logger.write(Level.FINE, entry);
- }
-
- return key;
- }
- }
-
- /**
- * This method should be called whenever you need to run one of our headless operations in the
- * UI.
- */
- public static IRunnableWithProgress getRunnableWithProgress(IWorkspaceRunnable aWorkspaceRunnable) {
- return new RunnableWithProgressWrapper(aWorkspaceRunnable);
- }
-
- public static IRunnableWithProgress getRunnableWithProgress(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- return new RunnableWithProgressWrapper(aHeadlessRunnableWithProgress);
- }
-
- // Need a third, ValidationOperation version of this method, because ValidationOperation
- // is both an IWorkspaceRunnable and an IHeadlessRunnableWithProgress. This method will
- // exist only while IHeadlessRunnableWithProgress exists.
- public static IRunnableWithProgress getRunnableWithProgress(ValidationOperation op) {
- return new RunnableWithProgressWrapper(op);
- }
-
- public void startup() throws CoreException {
- super.startup();
- // org.eclipse.wst.validation.internal.operations.ValidatorManager.setResourceUtilClass(org.eclipse.wst.validation.internal.operations.ui.UIResourceUtil.class);
- }
-}
\ No newline at end of file
