*** empty log message ***
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
index ad39e96..cff7c6d 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.5 2004/05/21 17:37:12 khussey Exp $
+ * $Id: plugin.xml,v 1.6 2004/05/21 20:20:18 khussey Exp $
*/
-->
@@ -24,11 +24,11 @@
class="org.eclipse.uml2.examples.ui.ExamplesUIPlugin">
<requires>
+ <import plugin="org.eclipse.uml2.examples" export="true"/>
+ <import plugin="org.eclipse.uml2.editor" export="true"/>
+ <import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.uml2.editor" export="true"/>
- <import plugin="org.eclipse.uml2.examples" export="true"/>
</requires>
<runtime>
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ecore2uml2/Ecore2UML2ImportWizard.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ecore2uml2/Ecore2UML2ImportWizard.java
index cc2f72f..84c52c8 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ecore2uml2/Ecore2UML2ImportWizard.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ecore2uml2/Ecore2UML2ImportWizard.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: Ecore2UML2ImportWizard.java,v 1.1 2004/04/29 15:31:14 khussey Exp $
+ * $Id: Ecore2UML2ImportWizard.java,v 1.2 2004/05/21 20:20:18 khussey Exp $
*/
package org.eclipse.uml2.examples.ui.wizards.ecore2uml2;
@@ -25,6 +25,7 @@
import org.eclipse.ui.dialogs.FileSystemElement;
import org.eclipse.uml2.examples.ecore2uml2.Ecore2UML2;
import org.eclipse.uml2.examples.ui.wizards.ExampleImportWizard;
+import org.eclipse.uml2.util.UML2Resource;
/**
*
@@ -72,7 +73,8 @@
progressMonitor.subTask("Converting to UML2..."); //$NON-NLS-1$
new Ecore2UML2().convert(resourceSet, mainPage
- .getSpecifiedContainer(), "uml2"); //$NON-NLS-1$
+ .getSpecifiedContainer(),
+ UML2Resource.FILE_EXTENSION);
mainPage.getSpecifiedContainer().refreshLocal(
IResource.DEPTH_INFINITE,
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/uml22ecore/UML22EcoreWizardResourceImportPage.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/uml22ecore/UML22EcoreWizardResourceImportPage.java
index f0590af..e58888e 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/uml22ecore/UML22EcoreWizardResourceImportPage.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/uml22ecore/UML22EcoreWizardResourceImportPage.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML22EcoreWizardResourceImportPage.java,v 1.1 2004/04/29 15:31:14 khussey Exp $
+ * $Id: UML22EcoreWizardResourceImportPage.java,v 1.2 2004/05/21 20:20:18 khussey Exp $
*/
package org.eclipse.uml2.examples.ui.wizards.uml22ecore;
@@ -17,6 +17,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.uml2.examples.ui.wizards.ExampleWizardResourceImportPage;
+import org.eclipse.uml2.util.UML2Resource;
/**
*
@@ -38,7 +39,7 @@
createFileSelectionGroup(parent);
selectionGroup.setRoot(createFileSystemElement(null, ResourcesPlugin
- .getWorkspace().getRoot(), "uml2")); //$NON-NLS-1$
+ .getWorkspace().getRoot(), UML2Resource.FILE_EXTENSION));
}
}
\ No newline at end of file
diff --git a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
index 3da88ec..2743e02 100644
--- a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.3 2004/05/21 17:37:01 khussey Exp $
+ * $Id: plugin.xml,v 1.4 2004/05/21 20:20:00 khussey Exp $
*/
-->
@@ -24,9 +24,9 @@
class="org.eclipse.uml2.examples.ExamplesPlugin">
<requires>
+ <import plugin="org.eclipse.uml2" export="true"/>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.uml2" export="true"/>
</requires>
<runtime>
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml b/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
index 89986ae..e4bf1c7 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.4 2004/05/21 17:37:08 khussey Exp $
+ * $Id: plugin.xml,v 1.5 2004/05/21 20:20:15 khussey Exp $
*/
-->
@@ -29,11 +29,12 @@
<packages prefixes="org.eclipse.uml2.edit.internal.command,org.eclipse.uml2.edit.util,org.eclipse.uml2.provider"/>
</library>
</runtime>
+
<requires>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.emf.ecore.change.edit"/>
- <import plugin="org.eclipse.emf.edit" export="true"/>
<import plugin="org.eclipse.uml2" export="true"/>
+ <import plugin="org.eclipse.emf.edit" export="true"/>
+ <import plugin="org.eclipse.emf.ecore.change.edit" optional="true"/>
+ <import plugin="org.eclipse.core.runtime.compatibility"/>
</requires>
</plugin>
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
index e804677..b8cfc96 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.5 2004/05/21 17:37:04 khussey Exp $
+ * $Id: plugin.xml,v 1.6 2004/05/21 20:20:11 khussey Exp $
*/
-->
@@ -24,11 +24,12 @@
class = "org.eclipse.uml2.presentation.UML2EditorPlugin$Implementation">
<requires>
+ <import plugin="org.eclipse.uml2.edit" export="true"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.emf.edit.ui" export="true"/>
+ <import plugin="org.eclipse.emf.ecore.edit"/>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.emf.edit.ui" export="true"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.uml2.edit" export="true"/>
</requires>
<runtime>
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2AdapterFactoryContentProvider.java b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2AdapterFactoryContentProvider.java
similarity index 88%
rename from deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2AdapterFactoryContentProvider.java
rename to deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2AdapterFactoryContentProvider.java
index bd1ced3..06826ac 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2AdapterFactoryContentProvider.java
+++ b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2AdapterFactoryContentProvider.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2AdapterFactoryContentProvider.java,v 1.2 2004/04/10 03:56:09 khussey Exp $
+ * $Id: UML2AdapterFactoryContentProvider.java,v 1.1 2004/05/21 20:20:11 khussey Exp $
*/
-package org.eclipse.uml2.presentation;
+package org.eclipse.uml2.editor.internal.presentation;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertySource;
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2PropertyDescriptor.java b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2PropertyDescriptor.java
similarity index 97%
rename from deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2PropertyDescriptor.java
rename to deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2PropertyDescriptor.java
index 850ec5f..e119019 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2PropertyDescriptor.java
+++ b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2PropertyDescriptor.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2PropertyDescriptor.java,v 1.4 2004/04/11 02:53:38 khussey Exp $
+ * $Id: UML2PropertyDescriptor.java,v 1.1 2004/05/21 20:20:11 khussey Exp $
*/
-package org.eclipse.uml2.presentation;
+package org.eclipse.uml2.editor.internal.presentation;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2PropertySource.java b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2PropertySource.java
similarity index 90%
rename from deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2PropertySource.java
rename to deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2PropertySource.java
index 1501017..1791993 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2PropertySource.java
+++ b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/editor/internal/presentation/UML2PropertySource.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2PropertySource.java,v 1.2 2004/04/10 03:56:09 khussey Exp $
+ * $Id: UML2PropertySource.java,v 1.1 2004/05/21 20:20:11 khussey Exp $
*/
-package org.eclipse.uml2.presentation;
+package org.eclipse.uml2.editor.internal.presentation;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2Editor.java b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2Editor.java
index 0646d08..31da1d4 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2Editor.java
+++ b/deprecated/plugins/org.eclipse.uml2.editor/src/org/eclipse/uml2/presentation/UML2Editor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2Editor.java,v 1.4 2004/05/14 14:12:09 khussey Exp $
+ * $Id: UML2Editor.java,v 1.5 2004/05/21 20:20:11 khussey Exp $
*/
package org.eclipse.uml2.presentation;
@@ -149,6 +149,7 @@
import org.eclipse.ui.views.properties.PropertySheet;
import org.eclipse.ui.views.properties.PropertySheetPage;
+import org.eclipse.uml2.editor.internal.presentation.*;
import org.eclipse.uml2.provider.UML2ItemProviderAdapterFactory;
import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
@@ -628,7 +629,7 @@
}
}
- public class UML2ReverseAdapterFactoryContentProvider extends UML2AdapterFactoryContentProvider {
+ protected class UML2ReverseAdapterFactoryContentProvider extends UML2AdapterFactoryContentProvider {
public UML2ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel b/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel
index f351f4c..458bad4 100644
--- a/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel
+++ b/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel
@@ -10,7 +10,7 @@
<foreignModel>UML2.mdl</foreignModel>
<foreignModel>VABASE_PLUGINS_PATH</foreignModel>
<foreignModel>../..</foreignModel>
- <genPackages prefix="UML2" basePackage="org.eclipse" resource="XMI" ecorePackage="UML2.ecore#/">
+ <genPackages prefix="UML2" basePackage="org.eclipse" ecorePackage="UML2.ecore#/">
<genEnums ecoreEnum="UML2.ecore#//VisibilityKind">
<genEnumLiterals ecoreEnumLiteral="UML2.ecore#//VisibilityKind/public"/>
<genEnumLiterals ecoreEnumLiteral="UML2.ecore#//VisibilityKind/private"/>
diff --git a/deprecated/plugins/org.eclipse.uml2/plugin.xml b/deprecated/plugins/org.eclipse.uml2/plugin.xml
index 1342e66..8279fc1 100644
--- a/deprecated/plugins/org.eclipse.uml2/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.6 2004/05/21 17:37:15 khussey Exp $
+ * $Id: plugin.xml,v 1.7 2004/05/21 20:20:27 khussey Exp $
*/
-->
@@ -31,9 +31,9 @@
</runtime>
<requires>
+ <import plugin="org.eclipse.emf.ecore.xmi" export="true"/>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.emf.ecore.xmi" export="true"/>
</requires>
<extension
@@ -48,7 +48,7 @@
point="org.eclipse.emf.ecore.extension_parser">
<parser
type="uml2"
- class="org.eclipse.uml2.util.UML2ResourceFactoryImpl">
+ class="org.eclipse.uml2.internal.util.UML2ResourceFactoryImpl">
</parser>
</extension>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Plugin.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Plugin.java
index dcecb15..e2ea343 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Plugin.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Plugin.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2Plugin.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: UML2Plugin.java,v 1.3 2004/05/21 20:20:27 khussey Exp $
*/
package org.eclipse.uml2;
@@ -87,6 +87,7 @@
* @generated
*/
public static class Implementation extends EclipsePlugin {
+
/**
* Creates an instance.
* <!-- begin-user-doc -->
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/UML2Operations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/UML2Operations.java
index 7de5c01..d0e68cd 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/UML2Operations.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/UML2Operations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2Operations.java,v 1.5 2004/05/18 21:00:48 khussey Exp $
+ * $Id: UML2Operations.java,v 1.6 2004/05/21 20:20:27 khussey Exp $
*/
package org.eclipse.uml2.internal.operation;
@@ -136,11 +136,14 @@
}
}
- EValidator.SubstitutionLabelProvider substitutionLabelProvider = (EValidator.SubstitutionLabelProvider) context
- .get(EValidator.SubstitutionLabelProvider.class);
+ if (null != context) {
- if (null != substitutionLabelProvider) {
- return substitutionLabelProvider.getObjectLabel(eObject);
+ EValidator.SubstitutionLabelProvider substitutionLabelProvider = (EValidator.SubstitutionLabelProvider) context
+ .get(EValidator.SubstitutionLabelProvider.class);
+
+ if (null != substitutionLabelProvider) {
+ return substitutionLabelProvider.getObjectLabel(eObject);
+ }
}
Resource resource = eObject.eResource();
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2ResourceFactoryImpl.java
similarity index 87%
rename from deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java
rename to deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2ResourceFactoryImpl.java
index dabbeeb..3617147 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2ResourceFactoryImpl.java
@@ -8,24 +8,25 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2ResourceFactoryImpl.java,v 1.7 2004/05/20 03:20:08 khussey Exp $
+ * $Id: UML2ResourceFactoryImpl.java,v 1.1 2004/05/21 20:20:27 khussey Exp $
*/
-package org.eclipse.uml2.util;
+package org.eclipse.uml2.internal.util;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.uml2.util.UML2Resource;
/**
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.uml2.util.UML2ResourceImpl
+ * @see org.eclipse.uml2.internal.util.UML2ResourceImpl
* @generated
*/
-public class UML2ResourceFactoryImpl extends ResourceFactoryImpl {
+public class UML2ResourceFactoryImpl extends ResourceFactoryImpl implements UML2Resource.Factory {
/**
* <!-- begin-user-doc -->
@@ -54,6 +55,7 @@
Resource result = new UML2ResourceImpl(uri);
return result;
}
+
public Resource createResource(URI uri) {
XMIResource resource = (XMIResource) createResourceGen(uri);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2ResourceImpl.java
similarity index 89%
rename from deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java
rename to deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2ResourceImpl.java
index 8a8f87f..2ecd506 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2ResourceImpl.java
@@ -8,21 +8,21 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2ResourceImpl.java,v 1.4 2004/05/11 15:24:01 khussey Exp $
+ * $Id: UML2ResourceImpl.java,v 1.1 2004/05/21 20:20:27 khussey Exp $
*/
-package org.eclipse.uml2.util;
+package org.eclipse.uml2.internal.util;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.xmi.XMLLoad;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.uml2.internal.util.*;
+import org.eclipse.uml2.util.UML2Resource;
/**
* <!-- begin-user-doc -->
* The <b>Resource</b> associated with the package.
* <!-- end-user-doc -->
- * @see org.eclipse.uml2.util.UML2ResourceFactoryImpl
+ * @see org.eclipse.uml2.internal.util.UML2ResourceFactoryImpl
* @generated
*/
public class UML2ResourceImpl extends XMIResourceImpl implements UML2Resource {
@@ -44,6 +44,7 @@
public UML2ResourceImpl(URI uri) {
super(uri);
}
+
/* (non-Javadoc)
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#useIDAttributes()
*/
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java
index 2a5e206..893432c 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java
@@ -8,17 +8,25 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2Resource.java,v 1.1 2004/05/04 19:17:48 khussey Exp $
+ * $Id: UML2Resource.java,v 1.2 2004/05/21 20:20:27 khussey Exp $
*/
package org.eclipse.uml2.util;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.XMIResource;
+import org.eclipse.uml2.internal.util.UML2ResourceFactoryImpl;
/**
*
*/
public interface UML2Resource
extends XMIResource {
+
+ public interface Factory extends Resource.Factory {
+
+ public static final Factory INSTANCE = new UML2ResourceFactoryImpl();
+
+ }
public static final String UML2_NS_URI = "http://www.eclipse.org/uml2/1.0.0/UML"; //$NON-NLS-1$
diff --git a/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml
index c65f261..be69fd5 100644
--- a/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.edit.tests/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.2 2004/05/21 17:36:57 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/21 20:19:56 khussey Exp $
*/
-->
@@ -27,8 +27,8 @@
</runtime>
<requires>
- <import plugin="org.eclipse.uml2.edit"/>
<import plugin="org.junit"/>
+ <import plugin="org.eclipse.uml2.edit"/>
</requires>
</plugin>
diff --git a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
index 4f99f38..8ac0e79 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.4 2004/05/21 17:36:53 khussey Exp $
+ * $Id: plugin.xml,v 1.5 2004/05/21 20:19:52 khussey Exp $
*/
-->
@@ -27,8 +27,8 @@
</runtime>
<requires>
- <import plugin="org.eclipse.uml2"/>
<import plugin="org.junit"/>
+ <import plugin="org.eclipse.uml2"/>
</requires>
</plugin>
diff --git a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ElementOperationsTest.java b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ElementOperationsTest.java
index e6011ac..447ece7 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ElementOperationsTest.java
+++ b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ElementOperationsTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ElementOperationsTest.java,v 1.1 2004/04/29 14:56:55 khussey Exp $
+ * $Id: ElementOperationsTest.java,v 1.2 2004/05/21 20:19:52 khussey Exp $
*/
package org.eclipse.uml2.internal.operation.tests;
@@ -29,7 +29,7 @@
import org.eclipse.uml2.UML2Factory;
import org.eclipse.uml2.UML2Package;
import org.eclipse.uml2.internal.operation.ElementOperations;
-import org.eclipse.uml2.util.UML2ResourceFactoryImpl;
+import org.eclipse.uml2.util.UML2Resource;
import org.eclipse.uml2.util.UML2Switch;
/**
@@ -60,7 +60,7 @@
super.setUp();
Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
- "uml2", new UML2ResourceFactoryImpl()); //$NON-NLS-1$
+ UML2Resource.FILE_EXTENSION, UML2Resource.Factory.INSTANCE);
}
/**
@@ -187,19 +187,22 @@
final Comment comment1 = UML2Factory.eINSTANCE.createComment();
new ResourceSetImpl().createResource(
- URI.createFileURI(new Date().getTime() + ".uml2")) //$NON-NLS-1$
+ URI.createFileURI(String.valueOf(new Date().getTime()))
+ .appendFileExtension(UML2Resource.FILE_EXTENSION))
.getContents().add(comment1);
ResourceSet resourceSet = new ResourceSetImpl();
final Comment comment2 = UML2Factory.eINSTANCE.createComment();
resourceSet.createResource(
- URI.createFileURI(new Date().getTime() + ".uml2")) //$NON-NLS-1$
+ URI.createFileURI(String.valueOf(new Date().getTime()))
+ .appendFileExtension(UML2Resource.FILE_EXTENSION))
.getContents().add(comment2);
final Model model = UML2Factory.eINSTANCE.createModel();
resourceSet.createResource(
- URI.createFileURI(new Date().getTime() + ".uml2")) //$NON-NLS-1$
+ URI.createFileURI(String.valueOf(new Date().getTime()))
+ .appendFileExtension(UML2Resource.FILE_EXTENSION))
.getContents().add(model);
for (Iterator eAllSubClasses = getEAllSubClasses(
