Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-12-30 15:35:38 +0000
committerEike Stepper2012-12-30 15:35:38 +0000
commit33bf6d84ffba09da257cae1d2cda90b2fd72aea6 (patch)
tree28edc2d99080fc8e48de684dcce87cacd7163311 /plugins/org.eclipse.emf.cdo.ui
parent36245d5e4c10f1f80a28d84431224320ef2d1061 (diff)
downloadcdo-33bf6d84ffba09da257cae1d2cda90b2fd72aea6.tar.gz
cdo-33bf6d84ffba09da257cae1d2cda90b2fd72aea6.tar.xz
cdo-33bf6d84ffba09da257cae1d2cda90b2fd72aea6.zip
Regenerate editor
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.properties2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java9
3 files changed, 11 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
index e0fd147027..193912be37 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
@@ -86,4 +86,4 @@ _UI_Menu_Help_label = &Help
_UI_Menu_About_label = Editor &About...
_UI_About_title = Editor Application
_UI_About_text = Editor Application about box goes here.
- \ No newline at end of file
+
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 3801e3fe3b..a6f6952ee1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -173,6 +173,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+//import org.eclipse.emf.cdo.internal.ui.editor.provider.CDOItemProviderAdapterFactory;
+//import org.eclipse.core.runtime.NullProgressMonitor;
/**
* @author Eike Stepper
@@ -1895,7 +1897,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
/**
* This returns whether something has been persisted to the URI of the specified resource.
- * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
* @generated
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
index fd545fe518..6e0d4323a8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java
@@ -2,6 +2,8 @@
*/
package org.eclipse.emf.cdo.internal.ui.editor;
+//import org.eclipse.emf.cdo.internal.ui.editor.PluginDelegator;
+
import org.eclipse.emf.common.ui.URIEditorInput;
import org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate;
import org.eclipse.emf.common.util.URI;
@@ -94,7 +96,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
* @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
public Object start(IApplicationContext context) throws Exception
{
@@ -107,6 +109,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
{
return IApplication.EXIT_RESTART;
}
+
return IApplication.EXIT_OK;
}
finally
@@ -540,7 +543,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
public static boolean openEditor(IWorkbench workbench, URI uri)
{
@@ -554,6 +557,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
getString("_WARN_No_Editor", uri.lastSegment()));
return false;
}
+
try
{
page.openEditor(new URIEditorInput(uri), editorDescriptor.getId());
@@ -564,6 +568,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor
exception.getMessage());
return false;
}
+
return true;
}

Back to the top