Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordstadnik2007-04-20 04:54:22 -0400
committerdstadnik2007-04-20 04:54:22 -0400
commite18fb5e103433ad1d0c2a0cd1428a1d34af41f43 (patch)
tree7901e3f9c150fc533be62ea9f9f48537f5826829
parent11f8de94151ee84cd8057b21b53324273430874b (diff)
downloadorg.eclipse.gmf-tooling-e18fb5e103433ad1d0c2a0cd1428a1d34af41f43.tar.gz
org.eclipse.gmf-tooling-e18fb5e103433ad1d0c2a0cd1428a1d34af41f43.tar.xz
org.eclipse.gmf-tooling-e18fb5e103433ad1d0c2a0cd1428a1d34af41f43.zip
regenerated
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/navigator/TaiPanNavigatorContentProvider.java16
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java16
2 files changed, 12 insertions, 20 deletions
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/navigator/TaiPanNavigatorContentProvider.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/navigator/TaiPanNavigatorContentProvider.java
index af8b85a5a..3f894ffa1 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/navigator/TaiPanNavigatorContentProvider.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/navigator/TaiPanNavigatorContentProvider.java
@@ -293,8 +293,8 @@ public class TaiPanNavigatorContentProvider implements ICommonContentProvider {
case ShipEditPart.VISUAL_ID: {
Collection result = new ArrayList();
- TaiPanNavigatorGroup incominglinks = new TaiPanNavigatorGroup(Messages.NavigatorGroupName_Ship_2002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
TaiPanNavigatorGroup outgoinglinks = new TaiPanNavigatorGroup(Messages.NavigatorGroupName_Ship_2002_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ TaiPanNavigatorGroup incominglinks = new TaiPanNavigatorGroup(Messages.NavigatorGroupName_Ship_2002_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection connectedViews = getChildrenByType(Collections.singleton(view), ShipSmallCargoEditPart.VISUAL_ID);
connectedViews = getChildrenByType(connectedViews, SmallItemsEditPart.VISUAL_ID);
result.addAll(createNavigatorItems(connectedViews, parentElement, false));
@@ -310,19 +310,19 @@ public class TaiPanNavigatorContentProvider implements ICommonContentProvider {
incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
connectedViews = getIncomingLinksByType(Collections.singleton(view), PortRegisterEditPart.VISUAL_ID);
incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
- }
if (!outgoinglinks.isEmpty()) {
result.add(outgoinglinks);
}
+ if (!incominglinks.isEmpty()) {
+ result.add(incominglinks);
+ }
return result.toArray();
}
case WarshipEditPart.VISUAL_ID: {
Collection result = new ArrayList();
- TaiPanNavigatorGroup incominglinks = new TaiPanNavigatorGroup(Messages.NavigatorGroupName_Warship_2003_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
TaiPanNavigatorGroup outgoinglinks = new TaiPanNavigatorGroup(Messages.NavigatorGroupName_Warship_2003_outgoinglinks, "icons/outgoingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
+ TaiPanNavigatorGroup incominglinks = new TaiPanNavigatorGroup(Messages.NavigatorGroupName_Warship_2003_incominglinks, "icons/incomingLinksNavigatorGroup.gif", parentElement); //$NON-NLS-1$
Collection connectedViews = getOutgoingLinksByType(Collections.singleton(view), ShipDestinationEditPart.VISUAL_ID);
outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
connectedViews = getIncomingLinksByType(Collections.singleton(view), EscortShipsOrderEditPart.VISUAL_ID);
@@ -333,12 +333,12 @@ public class TaiPanNavigatorContentProvider implements ICommonContentProvider {
outgoinglinks.addChildren(createNavigatorItems(connectedViews, outgoinglinks, true));
connectedViews = getIncomingLinksByType(Collections.singleton(view), PortRegisterEditPart.VISUAL_ID);
incominglinks.addChildren(createNavigatorItems(connectedViews, incominglinks, true));
- if (!incominglinks.isEmpty()) {
- result.add(incominglinks);
- }
if (!outgoinglinks.isEmpty()) {
result.add(outgoinglinks);
}
+ if (!incominglinks.isEmpty()) {
+ result.add(incominglinks);
+ }
return result.toArray();
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java
index 7bc05721c..72133493f 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanDiagramEditorUtil.java
@@ -69,19 +69,11 @@ public class TaiPanDiagramEditorUtil {
/**
* @generated
*/
- private static Map ourSaveOptions = null;
-
- /**
- * @generated
- */
public static Map getSaveOptions() {
- if (ourSaveOptions == null) {
- ourSaveOptions = new HashMap();
- ourSaveOptions.put(XMIResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
- ourSaveOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
- ourSaveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
- }
- return ourSaveOptions;
+ Map saveOptions = new HashMap();
+ saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
+ saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+ return saveOptions;
}
/**

Back to the top