Author: scabanovich
Date: 2008-06-03 10:20:05 -0400 (Tue, 03 Jun 2008)
New Revision: 8504
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties
Log:
JBIDE-1189
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java 2008-06-03
13:22:39 UTC (rev 8503)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java 2008-06-03
14:20:05 UTC (rev 8504)
@@ -22,6 +22,10 @@
public static String PAGES_DIAGRAM_VIEW_TEMPLATE;
public static String PAGES_DIAGRAM_EXCEPTION_TEMPLATE;
+
+ public static String SEAM_PAGES_EDITOR_TITLE;
+ public static String SEAM_PAGES_EDITOR_SOURCE_TAB;
+ public static String SEAM_PAGES_EDITOR_DIAGRAM_TAB;
public static ResourceBundle getResourceBundle() {
try {
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-03
13:22:39 UTC (rev 8503)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-03
14:20:05 UTC (rev 8504)
@@ -36,6 +36,7 @@
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.ContextMenuProvider;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.EditPart;
@@ -104,6 +105,7 @@
import org.jboss.tools.common.gef.outline.xpl.DiagramContentOutlinePage;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper;
import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages;
import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin;
@@ -590,7 +592,13 @@
}
protected void setSelectedModelObject(XModelObject object) {
- PagesElement element = getPagesModel().findElement(object);
+ if(object == null) return;
+ EObject element = getPagesModel().findElement(object);
+
+ if(element == null) {
+ element = getPagesModel().findLink(object);
+ }
+
if (element == null)
return;
EditPart part = (EditPart) viewer.getEditPartRegistry()
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java 2008-06-03
13:22:39 UTC (rev 8503)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java 2008-06-03
14:20:05 UTC (rev 8504)
@@ -11,6 +11,7 @@
import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages;
import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin;
public class SeamPagesEditor extends ObjectMultiPageEditor {
@@ -35,11 +36,9 @@
protected void doCreatePages() {
if (isAppropriateNature() || true /* JBIDE-541 */) {
- //TODO restore
createGuiPage();
treeFormPage = createTreeFormPage();
- //TODO use constant
- treeFormPage.setTitle("Seam Pages Editor");
+ treeFormPage.setTitle(SeamUIPagesMessages.SEAM_PAGES_EDITOR_TITLE);
// treeFormPage.addFilter(constraint);
treeFormPage.initialize(getModelObject());
addFormPage(treeFormPage);
@@ -61,7 +60,7 @@
guiEditor = new SeamPagesGuiEditor();
guiEditor.init(getEditorSite(), getEditorInput());
int index = addPage(guiEditor, input);
- setPageText(index, "Diagram");
+ setPageText(index, SeamUIPagesMessages.SEAM_PAGES_EDITOR_DIAGRAM_TAB);
guiEditor.setInput(input);
selectionProvider.setHost(guiEditor.getSelectionProvider());
guiEditor.addErrorSelectionListener(createErrorSelectionListener());
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties 2008-06-03
13:22:39 UTC (rev 8503)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties 2008-06-03
14:20:05 UTC (rev 8504)
@@ -1,3 +1,9 @@
+SEAM_UI_PAGES_PLUGIN_NO_MESSAGES=
+PAGESDIAGRAM_SELECT=Select
+PAGESDIAGRAM_MARQUEE=Marquee
+PAGESDIAGRAM_CREATE_NEW_CONNECTION=Create New Connection
+
+SEAM_PAGES_EDITOR_TITLE=Seam Pages Editor
SEAM_PAGES_EDITOR_SOURCE_TAB=Source
SEAM_PAGES_EDITOR_DIAGRAM_TAB=Graphical
PAGES_DIAGRAM_VIEW_TEMPLATE=Add Page
Show replies by date