[388804] regenerated with Luna M6
Change-Id: Ib6ac3ee322d3f620b52ca549e6ed0b8d91182534
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml
index dc08b22..7ef535d 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml
@@ -52,13 +52,13 @@
<extension point="org.eclipse.ui.newWizards" id="creation-wizard">
<?gmfgen generated="true"?>
- <wizard
- name="%newWizardName"
- icon="icons/obj16/TaiPanDiagramFile.gif"
- category="org.eclipse.ui.Examples"
- class="org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanCreationWizard"
- id="org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanCreationWizardID">
- <description>%newWizardDesc</description>
+ <wizard
+ name="%newWizardName"
+ icon="icons/obj16/TaiPanDiagramFile.gif"
+ category="org.eclipse.ui.Examples"
+ class="org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanCreationWizard"
+ id="org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanCreationWizardID">
+ <description>%newWizardDesc</description>
</wizard>
</extension>
@@ -148,9 +148,9 @@
<extension id="metrics-view" point="org.eclipse.ui.views">
<?gmfgen generated="true"?>
- <view class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanMetricProvider$ResultView"
- id="org.eclipse.gmf.examples.taipan.gmf.editor.metricView"
- name="TaiPan Diagram Metrics"/>
+ <view class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanMetricProvider$ResultView"
+ id="org.eclipse.gmf.examples.taipan.gmf.editor.metricView"
+ name="TaiPan Diagram Metrics"/>
</extension>
<extension point="org.eclipse.core.runtime.preferences" id="prefs">
@@ -291,44 +291,43 @@
</extension>
<extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">
- <?gmfgen generated="true"?>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfAquatoryEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.AquatoryEditPart" id="Aquatory_1000"/>
- <context elements="Aquatory_1000"/>
- </modelingAssistantProvider>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfPortEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart" id="Port_2001"/>
- <context elements="Port_2001"/>
- </modelingAssistantProvider>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfShipEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ShipEditPart" id="Ship_2002"/>
- <context elements="Ship_2002"/>
- </modelingAssistantProvider>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfWarshipEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.WarshipEditPart" id="Warship_2003"/>
- <context elements="Warship_2003"/>
- </modelingAssistantProvider>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfSmallItemsEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.SmallItemsEditPart" id="SmallItems_3001"/>
- <context elements="SmallItems_3001"/>
- </modelingAssistantProvider>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfLargeItemEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.LargeItemEditPart" id="LargeItem_3002"/>
- <context elements="LargeItem_3002"/>
- </modelingAssistantProvider>
- <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfEmptyBoxEditPart">
- <Priority name="Lowest"/>
- <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.EmptyBoxEditPart" id="EmptyBox_3003"/>
- <context elements="EmptyBox_3003"/>
- </modelingAssistantProvider>
-
- </extension>
+ <?gmfgen generated="true"?>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfAquatoryEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.AquatoryEditPart" id="Aquatory_1000"/>
+ <context elements="Aquatory_1000"/>
+ </modelingAssistantProvider>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfPortEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart" id="Port_2001"/>
+ <context elements="Port_2001"/>
+ </modelingAssistantProvider>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfShipEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ShipEditPart" id="Ship_2002"/>
+ <context elements="Ship_2002"/>
+ </modelingAssistantProvider>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfWarshipEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.WarshipEditPart" id="Warship_2003"/>
+ <context elements="Warship_2003"/>
+ </modelingAssistantProvider>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfSmallItemsEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.SmallItemsEditPart" id="SmallItems_3001"/>
+ <context elements="SmallItems_3001"/>
+ </modelingAssistantProvider>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfLargeItemEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.LargeItemEditPart" id="LargeItem_3002"/>
+ <context elements="LargeItem_3002"/>
+ </modelingAssistantProvider>
+ <modelingAssistantProvider class="org.eclipse.gmf.examples.taipan.gmf.editor.providers.assistants.TaiPanModelingAssistantProviderOfEmptyBoxEditPart">
+ <Priority name="Lowest"/>
+ <object class="org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.EmptyBoxEditPart" id="EmptyBox_3003"/>
+ <context elements="EmptyBox_3003"/>
+ </modelingAssistantProvider>
+</extension>
<extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
<?gmfgen generated="true"?>
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemArticleEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemArticleEditPart.java
index 1f759f7..82d2b6e 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemArticleEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemArticleEditPart.java
@@ -312,7 +312,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -335,8 +335,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -347,8 +347,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemWeightEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemWeightEditPart.java
index 42054bd..cdcaef9 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemWeightEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/LargeItemWeightEditPart.java
@@ -308,7 +308,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -331,8 +331,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -343,8 +343,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortLocationEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortLocationEditPart.java
index 49b8b96..117e7be 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortLocationEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortLocationEditPart.java
@@ -339,7 +339,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -362,8 +362,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -374,8 +374,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteDescEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteDescEditPart.java
index fe5756f..2ddeb80 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteDescEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteDescEditPart.java
@@ -327,7 +327,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -350,8 +350,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -362,8 +362,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteRelbEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteRelbEditPart.java
index 65f791b..f07a5a0 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteRelbEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ReliableRouteRelbEditPart.java
@@ -323,7 +323,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -346,8 +346,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -358,8 +358,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipDestinationMarkerEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipDestinationMarkerEditPart.java
index d2c914d..45490a2 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipDestinationMarkerEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipDestinationMarkerEditPart.java
@@ -323,7 +323,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -346,8 +346,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -358,8 +358,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipNameEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipNameEditPart.java
index 6efcb1b..6f8f886 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipNameEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipNameEditPart.java
@@ -308,7 +308,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -331,8 +331,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -343,8 +343,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/SmallItemsEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/SmallItemsEditPart.java
index 99f5a21..f348619 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/SmallItemsEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/SmallItemsEditPart.java
@@ -324,7 +324,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -347,8 +347,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -359,8 +359,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteDescEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteDescEditPart.java
index 8928d54..3caed0e 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteDescEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteDescEditPart.java
@@ -327,7 +327,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -350,8 +350,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -362,8 +362,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteRelbEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteRelbEditPart.java
index 80b67bc..32fd665 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteRelbEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/UnreliableRouteRelbEditPart.java
@@ -323,7 +323,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -346,8 +346,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -358,8 +358,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/WarshipNameEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/WarshipNameEditPart.java
index 23df6dd..8ff359e 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/WarshipNameEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/WarshipNameEditPart.java
@@ -308,7 +308,7 @@
*/
protected DirectEditManager getManager() {
if (manager == null) {
- setManager(new TextDirectEditManager2(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
+ setManager(new TextDirectEditManager(this, null, TaiPanEditPartFactory.getTextCellEditorLocator(this)));
}
return manager;
}
@@ -331,8 +331,8 @@
* @generated
*/
protected void performDirectEdit(Point eventLocation) {
- if (getManager().getClass() == TextDirectEditManager2.class) {
- ((TextDirectEditManager2) getManager()).show(eventLocation.getSWTPoint());
+ if (getManager().getClass() == TextDirectEditManager.class) {
+ ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
}
}
@@ -343,8 +343,8 @@
if (getManager() instanceof TextDirectEditManager) {
((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
- if (getManager() instanceof TextDirectEditManager2) {
- ((TextDirectEditManager2) getManager()).show(initialCharacter);
+ if (getManager() instanceof TextDirectEditManager) {
+ ((TextDirectEditManager) getManager()).show(initialCharacter);
} else //
{
performDirectEdit();
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditor.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditor.java
index c3b2f04..024c2f0 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditor.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditor.java
@@ -81,11 +81,6 @@
public static final String CONTEXT_ID = "org.eclipse.gmf.examples.taipan.gmf.editor.ui.diagramContext"; //$NON-NLS-1$
/**
- * @generated
- */
- private LastClickPositionProvider myLastClickPositionProvider;
-
- /**
* @generated
*/
public TaiPanDiagramEditor() {
@@ -279,37 +274,6 @@
}
});
- startupLastClickPositionProvider();
- }
-
- /**
- * @generated
- */
- protected void startupLastClickPositionProvider() {
- if (myLastClickPositionProvider == null) {
- myLastClickPositionProvider = new LastClickPositionProvider(this);
- myLastClickPositionProvider.attachToService();
- }
- }
-
- /**
- * @generated
- */
- protected void shutDownLastClickPositionProvider() {
- if (myLastClickPositionProvider != null) {
- myLastClickPositionProvider.detachFromService();
- myLastClickPositionProvider.dispose();
- myLastClickPositionProvider = null;
- }
- }
-
- /**
- * @generated
- */
- @Override
- public void dispose() {
- shutDownLastClickPositionProvider();
- super.dispose();
}
/**
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorPlugin.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorPlugin.java
index de2c188..4784de2 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorPlugin.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorPlugin.java
@@ -47,11 +47,6 @@
public static final String ID = "org.eclipse.gmf.examples.taipan.gmf.editor"; //$NON-NLS-1$
/**
- * @generated
- */
- private LogHelper myLogHelper;
-
- /**
* @generated
*/
public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(ID);
@@ -98,7 +93,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
instance = this;
- myLogHelper = new LogHelper(this);
PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
adapterFactory = createAdapterFactory();
}
@@ -271,34 +265,50 @@
* @generated
*/
public void logError(String error) {
- getLogHelper().logError(error, null);
+ logError(error, null);
}
/**
* @generated
*/
public void logError(String error, Throwable throwable) {
- getLogHelper().logError(error, throwable);
+ if (error == null && throwable != null) {
+ error = throwable.getMessage();
+ }
+ getLog().log(new Status(IStatus.ERROR, TaiPanDiagramEditorPlugin.ID, IStatus.OK, error, throwable));
+ debug(error, throwable);
}
/**
* @generated
*/
public void logInfo(String message) {
- getLogHelper().logInfo(message, null);
+ logInfo(message, null);
}
/**
* @generated
*/
public void logInfo(String message, Throwable throwable) {
- getLogHelper().logInfo(message, throwable);
+ if (message == null && throwable != null) {
+ message = throwable.getMessage();
+ }
+ getLog().log(new Status(IStatus.INFO, TaiPanDiagramEditorPlugin.ID, IStatus.OK, message, throwable));
+ debug(message, throwable);
}
/**
* @generated
*/
- public LogHelper getLogHelper() {
- return myLogHelper;
+ private void debug(String message, Throwable throwable) {
+ if (!isDebugging()) {
+ return;
+ }
+ if (message != null) {
+ System.err.println(message);
+ }
+ if (throwable != null) {
+ throwable.printStackTrace();
+ }
}
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramUpdater.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramUpdater.java
index e3e9bdb..cf330ce 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramUpdater.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramUpdater.java
@@ -922,32 +922,32 @@
public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {
/**
- * @generated
- */
+ * @generated
+ */
public List<TaiPanNodeDescriptor> getSemanticChildren(View view) {
return TaiPanDiagramUpdater.getSemanticChildren(view);
}
/**
- * @generated
- */
+ * @generated
+ */
public List<TaiPanLinkDescriptor> getContainedLinks(View view) {
return TaiPanDiagramUpdater.getContainedLinks(view);
}
/**
- * @generated
- */
+ * @generated
+ */
public List<TaiPanLinkDescriptor> getIncomingLinks(View view) {
return TaiPanDiagramUpdater.getIncomingLinks(view);
}
/**
- * @generated
- */
+ * @generated
+ */
public List<TaiPanLinkDescriptor> getOutgoingLinks(View view) {
return TaiPanDiagramUpdater.getOutgoingLinks(view);
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java
index cd9c01f..52d9279 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java
@@ -413,48 +413,48 @@
public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {
/**
- * @generated
- */
+ * @generated
+ */
public int getVisualID(View view) {
return org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry.getVisualID(view);
}
/**
- * @generated
- */
+ * @generated
+ */
public String getModelID(View view) {
return org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry.getModelID(view);
}
/**
- * @generated
- */
+ * @generated
+ */
public int getNodeVisualID(View containerView, EObject domainElement) {
return org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry.getNodeVisualID(containerView, domainElement);
}
/**
- * @generated
- */
+ * @generated
+ */
public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {
return org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);
}
/**
- * @generated
- */
+ * @generated
+ */
public boolean isCompartmentVisualID(int visualID) {
return org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry.isCompartmentVisualID(visualID);
}
/**
- * @generated
- */
+ * @generated
+ */
public boolean isSemanticLeafVisualID(int visualID) {
return org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry.isSemanticLeafVisualID(visualID);
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanElementTypes.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanElementTypes.java
index 1cac934..e367cf4 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanElementTypes.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanElementTypes.java
@@ -280,24 +280,24 @@
public static final DiagramElementTypes TYPED_INSTANCE = new DiagramElementTypes(elementTypeImages) {
/**
- * @generated
- */
+ * @generated
+ */
@Override
public boolean isKnownElementType(IElementType elementType) {
return org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes.isKnownElementType(elementType);
}
/**
- * @generated
- */
+ * @generated
+ */
@Override
public IElementType getElementTypeForVisualId(int visualID) {
return org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes.getElementType(visualID);
}
/**
- * @generated
- */
+ * @generated
+ */
@Override
public ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter) {
return org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes.getElement(elementTypeAdapter);
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java
index 573cb7d..af8ab23 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java
@@ -112,10 +112,10 @@
*/
protected boolean provides(CreateViewForKindOperation op) {
/*
- if (op.getViewKind() == Node.class)
- return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
- if (op.getViewKind() == Edge.class)
- return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
+ if (op.getViewKind() == Node.class)
+ return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
+ if (op.getViewKind() == Edge.class)
+ return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
*/
return true;
}
