Google GitGoogle Git
Sign in
eclipse/gerrit/gmf-tooling/org.eclipse.gmf-tooling.uml2tools/refs/heads/master^!/.
commit
45bca9ed026e87ac6b3fe332f7bde910a6966de9
[log]
author
cwaniek <cwaniek>
Tue Jul 19 15:32:55 2011 +0000
committer
cwaniek <cwaniek>
Tue Jul 19 15:32:55 2011 +0000
tree
4583986b2b7c29fc08adc206f1a8d492432ab9da
parent
595b5ab0a4d7fb872b36fb9775dbca3acf2c7eb1 [diff]
fixed problem with shortcuts

diff --git a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/MultiplicityViewOptionConverter.java b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/MultiplicityViewOptionConverter.java
index 2535e71..32bad31 100644
--- a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/MultiplicityViewOptionConverter.java
+++ b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/MultiplicityViewOptionConverter.java

@@ -3,7 +3,6 @@
 import org.eclipse.uml2.diagram.common.preferences.UMLPreferencesConstants;
 import org.eclipse.uml2.diagram.parser.MultiplicityViewOption;
 
-
 public final class MultiplicityViewOptionConverter {
 
 	public static MultiplicityViewOption parsePreferenceValue(String preferenceValue) {

diff --git a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/stereotype/AppliedStereotypeParser.java b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/stereotype/AppliedStereotypeParser.java
index 536f35e..c568a39 100644
--- a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/stereotype/AppliedStereotypeParser.java
+++ b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/parser/stereotype/AppliedStereotypeParser.java

@@ -64,7 +64,7 @@
 	public IContentAssistProcessor getCompletionProcessor(IAdaptable subject) {
 		return null;
 	}
-	
+
 	public ICommand getParseCommand(IAdaptable element, String newString, int flags) {
 		Element subject = doAdapt(element);
 		List<String> toApply = getStereotypesToApply(newString);
@@ -86,7 +86,7 @@
 		}
 		return result.toString();
 	}
-	
+
 	public String getPrintString(IAdaptable element, int flags) {
 		String classifier = getElementLabel(doAdapt(element));
 		String labelString = this.getLabelString(element, flags);
@@ -99,7 +99,7 @@
 		}
 		return labelString == null || labelString.length() == 0 ? labelString : NLS.bind(APPLIED_PROFILE, new Object[] { labelString });
 	}
-	
+
 	private String getLabelString(IAdaptable element, int flags) {
 		Element subject = doAdapt(element);
 		List<Stereotype> stereos = subject.getAppliedStereotypes();

diff --git a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/MainPreferencePage.java b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/MainPreferencePage.java
index cb98479..c4ef05a 100644
--- a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/MainPreferencePage.java
+++ b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/MainPreferencePage.java

@@ -21,7 +21,7 @@
 	@Override
 	protected void addFields(Composite parent) {
 		myShowMultiplicityOptions = new RadioGroupFieldEditor(UMLPreferencesConstants.SHOW_MULTIPLICITY_OPTIONS, Messages.MainPreferencePage_group_display_settings, 1, new String[][] {
-				{ Messages.MainPreferencePage_show_no_multiplicity, UMLPreferencesConstants.SHOW_NO_MULTIPLICITY }, 
+				{ Messages.MainPreferencePage_show_no_multiplicity, UMLPreferencesConstants.SHOW_NO_MULTIPLICITY },
 				{ Messages.MainPreferencePage_show_no_default_multiplicity, UMLPreferencesConstants.SHOW_NO_DEFAULT_MULTIPLICITY },
 				{ Messages.MainPreferencePage_show_all_multiplicity, UMLPreferencesConstants.SHOW_ALL_MULTIPLICITY } }, parent, true);
 		addField(myShowMultiplicityOptions);

diff --git a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/UMLPreferencesConstants.java b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/UMLPreferencesConstants.java
index 2bbf075..0ac8188 100644
--- a/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/UMLPreferencesConstants.java
+++ b/plugins/org.eclipse.uml2.diagram.common/src/org/eclipse/uml2/diagram/common/preferences/UMLPreferencesConstants.java

@@ -35,7 +35,7 @@
 
 	// -----------------------
 	String SHOW_MULTIPLICITY_OPTIONS = "org.eclipse.uml2.diagram.preferences.show_multiplicity_options"; //$NON-NLS-1$
-	
+
 	String SHOW_NO_MULTIPLICITY = "org.eclipse.uml2.diagram.preferences.show_no_multiplicity"; //$NON-NLS-1$
 
 	String SHOW_NO_DEFAULT_MULTIPLICITY = "org.eclipse.uml2.diagram.preferences.show_no_default_multiplicity"; //$NON-NLS-1$

diff --git a/plugins/org.eclipse.uml2.diagram.csd/plugin.xml b/plugins/org.eclipse.uml2.diagram.csd/plugin.xml
index fddf332..f387d4a 100644
--- a/plugins/org.eclipse.uml2.diagram.csd/plugin.xml
+++ b/plugins/org.eclipse.uml2.diagram.csd/plugin.xml
Binary files differ

diff --git a/plugins/org.eclipse.uml2.diagram.csd/src/org/eclipse/uml2/diagram/csd/part/UMLVisualIDRegistry.java b/plugins/org.eclipse.uml2.diagram.csd/src/org/eclipse/uml2/diagram/csd/part/UMLVisualIDRegistry.java
index c98d531..bf5ff3f 100644
--- a/plugins/org.eclipse.uml2.diagram.csd/src/org/eclipse/uml2/diagram/csd/part/UMLVisualIDRegistry.java
+++ b/plugins/org.eclipse.uml2.diagram.csd/src/org/eclipse/uml2/diagram/csd/part/UMLVisualIDRegistry.java

@@ -190,7 +190,7 @@
 			return -1;
 		}
 		String containerModelID = org.eclipse.uml2.diagram.csd.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
+		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"UMLCompositeStructures".equals(containerModelID)) { //$NON-NLS-1$
 			return -1;
 		}
 		int containerVisualID;
@@ -316,7 +316,7 @@
 	 */
 	public static boolean canCreateNode(View containerView, int nodeVisualID) {
 		String containerModelID = org.eclipse.uml2.diagram.csd.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
+		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"UMLCompositeStructures".equals(containerModelID)) { //$NON-NLS-1$
 			return false;
 		}
 		int containerVisualID;

diff --git a/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/providers/extensions.xpt b/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/providers/extensions.xpt
index 1a2f5a8..38ff643 100644
--- a/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/providers/extensions.xpt
+++ b/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/providers/extensions.xpt

@@ -1,8 +1,6 @@
 «IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»   
-«IMPORT 'http://www.eclipse.org/modeling/mdt/uml2tools/gmf/GenModel'»
 
 «EXTENSION u2t::graphicalnodeep::Guard»
-«EXTENSION xpt::diagram::Utils»
 
 «AROUND extensions FOR gmfgen::GenDiagram-»
 	«targetDef.proceed()»

diff --git a/plugins/org.eclipse.uml2.diagram.def/structures/compositeStructuresDiagram.gmfgen b/plugins/org.eclipse.uml2.diagram.def/structures/compositeStructuresDiagram.gmfgen
index d21eb73..424ea95 100644
--- a/plugins/org.eclipse.uml2.diagram.def/structures/compositeStructuresDiagram.gmfgen
+++ b/plugins/org.eclipse.uml2.diagram.def/structures/compositeStructuresDiagram.gmfgen

@@ -30,7 +30,7 @@
           elementUniqueIdentifier="Dependency_4017"/>
     </viewmap>
     <containsShortcutsTo>uml</containsShortcutsTo>
-    <shortcutsProvidedFor>uml</shortcutsProvidedFor>
+    <shortcutsProvidedFor>UMLCompositeStructures</shortcutsProvidedFor>
     <domainDiagramElement
         href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
     <childNodes

diff --git a/plugins/org.eclipse.uml2.diagram.def/structures/deploymentDiagram.gmfgen b/plugins/org.eclipse.uml2.diagram.def/structures/deploymentDiagram.gmfgen
index 08f1759..95af608 100644
--- a/plugins/org.eclipse.uml2.diagram.def/structures/deploymentDiagram.gmfgen
+++ b/plugins/org.eclipse.uml2.diagram.def/structures/deploymentDiagram.gmfgen

@@ -30,7 +30,7 @@
           elementUniqueIdentifier="Dependency_4005"/>
     </viewmap>
     <containsShortcutsTo>uml</containsShortcutsTo>
-    <shortcutsProvidedFor>uml</shortcutsProvidedFor>
+    <shortcutsProvidedFor>UMLDeployment</shortcutsProvidedFor>
     <domainDiagramElement
         href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
     <childNodes

diff --git a/plugins/org.eclipse.uml2.diagram.def/structures/usecaseDiagram.gmfgen b/plugins/org.eclipse.uml2.diagram.def/structures/usecaseDiagram.gmfgen
index 2da9b8b..f1cf5fc 100644
--- a/plugins/org.eclipse.uml2.diagram.def/structures/usecaseDiagram.gmfgen
+++ b/plugins/org.eclipse.uml2.diagram.def/structures/usecaseDiagram.gmfgen

@@ -25,7 +25,7 @@
         xsi:type="gmfgen:FigureViewmap"
         figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
     <containsShortcutsTo>uml</containsShortcutsTo>
-    <shortcutsProvidedFor>uml</shortcutsProvidedFor>
+    <shortcutsProvidedFor>UMLUseCase</shortcutsProvidedFor>
     <domainDiagramElement
         href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Package"/>
     <childNodes

diff --git a/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml b/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml
index 5035f0d..017da09 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml
+++ b/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml
Binary files differ

diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java
index ddf27a8..1fa6d9e 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java

@@ -162,7 +162,7 @@
 			return -1;
 		}
 		String containerModelID = org.eclipse.uml2.diagram.deploy.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
+		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"UMLDeployment".equals(containerModelID)) { //$NON-NLS-1$
 			return -1;
 		}
 		int containerVisualID;
@@ -291,7 +291,7 @@
 	 */
 	public static boolean canCreateNode(View containerView, int nodeVisualID) {
 		String containerModelID = org.eclipse.uml2.diagram.deploy.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
+		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"UMLDeployment".equals(containerModelID)) { //$NON-NLS-1$
 			return false;
 		}
 		int containerVisualID;

diff --git a/plugins/org.eclipse.uml2.diagram.usecase/plugin.xml b/plugins/org.eclipse.uml2.diagram.usecase/plugin.xml
index db7192a..8dcb0da 100644
--- a/plugins/org.eclipse.uml2.diagram.usecase/plugin.xml
+++ b/plugins/org.eclipse.uml2.diagram.usecase/plugin.xml
Binary files differ

diff --git a/plugins/org.eclipse.uml2.diagram.usecase/src/org/eclipse/uml2/diagram/usecase/part/UMLVisualIDRegistry.java b/plugins/org.eclipse.uml2.diagram.usecase/src/org/eclipse/uml2/diagram/usecase/part/UMLVisualIDRegistry.java
index 0dfc279..425760d 100644
--- a/plugins/org.eclipse.uml2.diagram.usecase/src/org/eclipse/uml2/diagram/usecase/part/UMLVisualIDRegistry.java
+++ b/plugins/org.eclipse.uml2.diagram.usecase/src/org/eclipse/uml2/diagram/usecase/part/UMLVisualIDRegistry.java

@@ -150,7 +150,7 @@
 			return -1;
 		}
 		String containerModelID = org.eclipse.uml2.diagram.usecase.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
+		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"UMLUseCase".equals(containerModelID)) { //$NON-NLS-1$
 			return -1;
 		}
 		int containerVisualID;
@@ -246,7 +246,7 @@
 	 */
 	public static boolean canCreateNode(View containerView, int nodeVisualID) {
 		String containerModelID = org.eclipse.uml2.diagram.usecase.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"uml".equals(containerModelID)) { //$NON-NLS-1$
+		if (!PackageEditPart.MODEL_ID.equals(containerModelID) && !"UMLUseCase".equals(containerModelID)) { //$NON-NLS-1$
 			return false;
 		}
 		int containerVisualID;