Author: DartPeng
Date: 2010-02-01 04:24:15 -0500 (Mon, 01 Feb 2010)
New Revision: 20042
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
Log:
JBIDE-5754
done
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2010-02-01
07:50:20 UTC (rev 20041)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2010-02-01
09:24:15 UTC (rev 20042)
@@ -22,7 +22,9 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
@@ -107,12 +109,14 @@
addValidateListener(processPage);
addSmooksEditorInitListener(processPage);
try {
- int index = this.addPage(processPage);
+ int index = this.addPage(processPage );
setPageText(index, Messages.SmooksMultiFormEditor_processtabel_label);
} catch (PartInitException e) {
e.printStackTrace();
}
}
+
+
// private void addSmooksGraphicalEditor() {
// graphicalPage = new SmooksGraphicalEditorPart(this);
@@ -125,6 +129,36 @@
// }
// }
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.editor.FormEditor#getActiveEditor()
+ */
+ @Override
+ public IEditorPart getActiveEditor() {
+ int index = getActivePage();
+ if (index != -1) {
+ IEditorPart part = getEditor(index);
+ if(part == null){
+// if(index == 0){
+// part = processPage;
+// }
+// if(index == 1){
+// part = configurationPage;
+// }
+ }
+ return part;
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.jboss.tools.smooks.editor.AbstractSmooksFormEditor#init(org.eclipse.ui.IEditorSite,
org.eclipse.ui.IEditorInput)
+ */
+ @Override
+ public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+ super.init(site, input);
+// site.setSelectionProvider(this);
+ }
+
public Object getAdapter(Class adapter) {
if (adapter == IPropertySheetPage.class) {
tabbedPropertySheetPage = new TabbedPropertySheetPage(this);
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-02-01
07:50:20 UTC (rev 20041)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-02-01
09:24:15 UTC (rev 20042)
@@ -714,7 +714,7 @@
validator = new SmooksModelValidator();
addValidateListener(this);
}
-
+
RuntimeMetadata runtimeMetadata = new RuntimeMetadata();
String filePath = null;
IFile file = null;
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-02-01
07:50:20 UTC (rev 20041)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-02-01
09:24:15 UTC (rev 20042)
@@ -60,6 +60,7 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
@@ -802,7 +803,7 @@
@Override
protected void hookGraphicalViewer() {
- super.hookGraphicalViewer();
+ getSelectionSynchronizer().addViewer(getGraphicalViewer());
getGraphicalViewer().addSelectionChangedListener(getSelectionSynchronizer());
getGraphicalViewer().addSelectionChangedListener(this);
}
@@ -1340,6 +1341,10 @@
public void selectionChanged(SelectionChangedEvent event) {
updateActions(getSelectionActions());
+ ISelectionProvider provider =
((SmooksTaskDetailsEditorSite)getSite()).getMultiPageEditor().getSite().getSelectionProvider();
+ if(provider != null){
+ provider.setSelection(event.getSelection());
+ }
}
public void sourceChange(Object model) {
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-02-01
07:50:20 UTC (rev 20041)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-02-01
09:24:15 UTC (rev 20042)
@@ -40,6 +40,7 @@
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
@@ -258,6 +259,7 @@
highlightGraphNode(item);
}
showTaskControl(firstElement);
+ SmooksProcessGraphicalEditor.this.selectionChanged(event);
}
});
}
@@ -790,6 +792,10 @@
}
public void selectionChanged(SelectionChangedEvent event) {
+ ISelectionProvider provider = getEditor().getSite().getSelectionProvider();
+ if(provider != null){
+ provider.setSelection(event.getSelection());
+ }
}
protected Control createTaskPanel(Composite parent, FormToolkit toolkit, String taskID)
{
Show replies by date