JBoss Tools SVN: r12810 - in trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common: model and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-12-22 22:28:50 -0500 (Mon, 22 Dec 2008)
New Revision: 12810
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
Log:
attempts to introduce movable labels
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-12-22 18:32:50 UTC (rev 12809)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -36,8 +36,10 @@
import org.jboss.tools.flow.common.registry.ElementRegistry;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
/**
* Implementation of a connection EditPart.
@@ -50,6 +52,13 @@
return (ConnectionWrapper) getModel();
}
+ public List<Wrapper> getModelChildren() {
+ List<Wrapper> result = new ArrayList<Wrapper>();
+ LabelWrapper label = getElementConnection().getLabel();
+ if (label != null) result.add(label);
+ return result;
+ }
+
protected void createEditPolicies() {
ConnectionEditPolicy connectionEditPolicy = new ConnectionEditPolicy();
connectionEditPolicy.setElementConnectionFactory(getElementConnectionFactory());
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -0,0 +1,27 @@
+package org.jboss.tools.flow.common.model;
+
+import java.util.HashMap;
+
+public class DefaultLabel implements Label {
+
+ private String text;
+
+ private HashMap<String, Object> metaData = new HashMap<String, Object>();
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public void setMetaData(String key, Object value) {
+ metaData.put(key, value);
+ }
+
+ public Object getMetaData(String key) {
+ return metaData.get(key);
+ }
+
+}
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -0,0 +1,8 @@
+package org.jboss.tools.flow.common.model;
+
+public interface Label extends Element {
+
+ String getText();
+ void setText(String text);
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-12-22 18:32:50 UTC (rev 12809)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -32,6 +32,7 @@
private NodeWrapper source;
private NodeWrapper target;
+ private LabelWrapper label;
private transient List<Point> bendpoints = new ArrayList<Point>();
private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
@@ -117,6 +118,14 @@
}
protected abstract List<Point> internalGetBendpoints();
+
+ public void setLabel(LabelWrapper label) {
+ this.label = label;
+ }
+
+ public LabelWrapper getLabel() {
+ return label;
+ }
public void addListener(ModelListener listener) {
listeners.add(listener);
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -0,0 +1,43 @@
+package org.jboss.tools.flow.common.wrapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+
+public abstract class AbstractLabelWrapper extends AbstractWrapper implements
+ LabelWrapper {
+
+ private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
+ private Point location = null;
+ private Wrapper owner = null;
+
+ public Point getLocation() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getText() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setLocation(Point location) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setText(String text) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addListener(ModelListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(ModelListener listener) {
+ listeners.remove(listener);
+ }
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-12-22 18:32:50 UTC (rev 12809)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -41,6 +41,7 @@
}
private ContainerWrapper parent;
+ private LabelWrapper label;
private transient Rectangle constraint;
private List<ConnectionWrapper> incomingConnections = new ArrayList<ConnectionWrapper>();
private List<ConnectionWrapper> outgoingConnections = new ArrayList<ConnectionWrapper>();
@@ -70,6 +71,14 @@
public ContainerWrapper getParent() {
return parent;
}
+
+ public void setLabel(LabelWrapper label) {
+ this.label = label;
+ }
+
+ public LabelWrapper getLabel() {
+ return label;
+ }
public List<ConnectionWrapper> getOutgoingConnections() {
return Collections.unmodifiableList(outgoingConnections);
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-12-22 18:32:50 UTC (rev 12809)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -19,4 +19,7 @@
void removeBendpoint(int index);
List<Point> getBendpoints();
+ void setLabel(LabelWrapper label);
+ LabelWrapper getLabel();
+
}
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -0,0 +1,5 @@
+package org.jboss.tools.flow.common.wrapper;
+
+public class DefaultLabelWrapper extends AbstractLabelWrapper {
+
+}
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/LabelWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -0,0 +1,13 @@
+package org.jboss.tools.flow.common.wrapper;
+
+import org.eclipse.draw2d.geometry.Point;
+
+public interface LabelWrapper extends Wrapper {
+
+ void setText(String text);
+ String getText();
+
+ void setLocation(Point location);
+ Point getLocation();
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-12-22 18:32:50 UTC (rev 12809)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-12-23 03:28:50 UTC (rev 12810)
@@ -41,6 +41,9 @@
void setParent(ContainerWrapper parent);
ContainerWrapper getParent();
+ void setLabel(LabelWrapper label);
+ LabelWrapper getLabel();
+
List<ConnectionWrapper> getOutgoingConnections();
List<ConnectionWrapper> getIncomingConnections();
void addIncomingConnection(ConnectionWrapper connection);
15 years, 4 months
JBoss Tools SVN: r12809 - trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-12-22 13:32:50 -0500 (Mon, 22 Dec 2008)
New Revision: 12809
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JsfHtmlBasic1_2.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3446 Fixed
Modified: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JsfHtmlBasic1_2.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JsfHtmlBasic1_2.xml 2008-12-22 18:22:39 UTC (rev 12808)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JsfHtmlBasic1_2.xml 2008-12-22 18:32:50 UTC (rev 12809)
@@ -5302,8 +5302,8 @@
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
<proposal type="enumeration">
- <param value="horizontal"/>
- <param value="vertical"/>
+ <param value="pageDirection"/>
+ <param value="lineDirection"/>
</proposal>
</attribute-type>
<attribute type="layout"/>
15 years, 4 months
JBoss Tools SVN: r12808 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-12-22 13:22:39 -0500 (Mon, 22 Dec 2008)
New Revision: 12808
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3423 Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2008-12-22 18:18:54 UTC (rev 12807)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2008-12-22 18:22:39 UTC (rev 12808)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2008-12-22 18:18:54 UTC (rev 12807)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2008-12-22 18:22:39 UTC (rev 12808)
@@ -529,7 +529,12 @@
name.doFillIntoGrid(root);
name.addPropertyChangeListener(this);
version.doFillIntoGrid(root);
- version.setValue(validSeamVersions.get(0));
+ SeamVersion sv = SeamVersion.findByString(version.getValueAsString());
+ if(!validSeamVersions.contains(sv)) {
+ version.setValue(validSeamVersions.get(0));
+ } else {
+ version.setValue(version.getValue()); // Fire change listeners;
+ }
version.addPropertyChangeListener(this);
setPageComplete(false);
setControl(root);
@@ -604,6 +609,7 @@
&& current.getHomeDir().equals(homeDir.getValueAsString())) {
setErrorMessage(null);
setPageComplete(false);
+ setMessage(null);
return;
}
@@ -637,6 +643,8 @@
setPageComplete(false);
return;
}
+ } else {
+ setMessage(null);
}
Map<String, IStatus> errors = ValidatorFactory.JBOSS_SEAM_HOME_FOLDER_VALIDATOR
15 years, 4 months
JBoss Tools SVN: r12807 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-22 13:18:54 -0500 (Mon, 22 Dec 2008)
New Revision: 12807
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-468
Modified: trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml 2008-12-22 18:18:38 UTC (rev 12806)
+++ trunk/esb/docs/esb_ref_guide/en/modules/introduction.xml 2008-12-22 18:18:54 UTC (rev 12807)
@@ -24,10 +24,10 @@
enterprise messaging system that provides the features Service Oriented
Architectures may be implemented with.</para>
<para>If you want to develop applications using ESB technology JBoss ESB also meets your
- needs. The JBoss Tools provide ESB editor and all necessary wizards for creating an ESB
+ needs. The JBoss Tools provide an ESB editor and all necessary wizards for creating an ESB
file.</para>
- <para>In this guide we provide you with the information on ESB Editor which allows you to
- develop ESB file much faster and with far fewer errors so sparing your time.</para>
+ <para>In this guide we provide you with the information on JBoss ESB support (installation, configuration and deployment) and usage of ESB Editor which allows you to
+ develop an ESB file much faster and with far fewer errors so sparing your time.</para>
</section>
15 years, 4 months
JBoss Tools SVN: r12806 - trunk/esb/docs/esb_ref_guide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-12-22 13:18:38 -0500 (Mon, 22 Dec 2008)
New Revision: 12806
Modified:
trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml
Log:
Modified: trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml
===================================================================
--- trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml 2008-12-22 17:00:31 UTC (rev 12805)
+++ trunk/esb/docs/esb_ref_guide/en/modules/esb_editor.xml 2008-12-22 18:18:38 UTC (rev 12806)
@@ -169,7 +169,8 @@
<title>ESB Editors Features</title>
<para>JBoss ESB tooling has powerful editor features that help you easily make use of
- content and code assist.</para>
+ content and code assist.</para>
+ <para>This last chapter covers capabilities on how you can use ESB editor.</para>
<section id="ESBsyntaxvalidation84">
@@ -275,8 +276,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>The last chapter covers capabilities on how you can use ESB editor.</para>
-
+
<para>In summary, this reference supplies you with all necessary information on the
functionality that JBoss ESB Editor provides for work with JBoss ESB.</para>
</section>
15 years, 4 months
JBoss Tools SVN: r12805 - in trunk/vpe/plugins: org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-12-22 12:00:31 -0500 (Mon, 22 Dec 2008)
New Revision: 12805
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3443, https://jira.jboss.org/jira/browse/JBIDE-3053, there were made tabs on the resources dialog, size of the dialog was changed to fit the screen resolution.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-12-22 16:13:40 UTC (rev 12804)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-12-22 17:00:31 UTC (rev 12805)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.resref;
import java.util.Properties;
@@ -21,73 +21,101 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView;
import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceComposite;
import org.jboss.tools.vpe.resref.core.CssReferencesComposite;
import org.jboss.tools.vpe.resref.core.ElVariablesComposite;
+import org.jboss.tools.vpe.resref.core.Messages;
import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceComposite;
import org.jboss.tools.vpe.resref.core.TaglibReferencesComposite;
public class VpeResourcesDialogView extends AbstractQueryWizardView {
- IFile file;
- IPath path;
- CssReferencesComposite css = new CssReferencesComposite();
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- ElVariablesComposite el = new ElVariablesComposite();
- TaglibReferencesComposite tld = new TaglibReferencesComposite();
- AbsoluteFolderReferenceComposite absFolder = new AbsoluteFolderReferenceComposite();
- RelativeFolderReferenceComposite relFolder = new RelativeFolderReferenceComposite();
+ IFile file;
+ IPath path;
+ CssReferencesComposite css = new CssReferencesComposite();
+ // changed by estherbin
+ // http://jira.jboss.com/jira/browse/JBIDE-2010
+ ElVariablesComposite el = new ElVariablesComposite();
+ TaglibReferencesComposite tld = new TaglibReferencesComposite();
+ AbsoluteFolderReferenceComposite absFolder = new AbsoluteFolderReferenceComposite();
+ RelativeFolderReferenceComposite relFolder = new RelativeFolderReferenceComposite();
- public void setObject(Object object) {
- super.setObject(object);
- Properties p = findProperties(object);
- file = (IFile)p.get("file");
- path = (IPath)p.get("path");
+ public void setObject(Object object) {
+ super.setObject(object);
+ Properties p = findProperties(object);
+ file = (IFile) p.get("file"); //$NON-NLS-1$
+ path = (IPath) p.get("path"); //$NON-NLS-1$
- css.setObject(object);
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- el.setObject(object);
- tld.setObject(object);
- absFolder.setObject(p);
- relFolder.setObject(p);
- }
+ css.setObject(object);
+ // changed by estherbin
+ // http://jira.jboss.com/jira/browse/JBIDE-2010
+ el.setObject(object);
+ tld.setObject(object);
+ absFolder.setObject(p);
+ relFolder.setObject(p);
+ }
- public Control createControl(Composite parent) {
- GridData data;
- Composite c = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout(1, false);
- layout.marginWidth = 5;
- layout.marginHeight = 0;
- c.setLayout(layout);
- Control absControl = absFolder.createControl(c);
- Control relControl = relFolder.createControl(c);
- Control cssControl = css.createControl(c);
- Control tldControl = tld.createControl(c);
- Control elControl = el.createControl(c);
- return c;
- }
+ public Control createControl(Composite parent) {
- public void action(String command) {
- if(OK.equals(command)) {
- absFolder.commit();
- relFolder.commit();
- el.commit();
- css.commit();
- tld.commit();
- }
- super.action(command);
+ TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
+ tabFolder.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+ TabItem foldersTab = new TabItem(tabFolder, SWT.NONE);
+ TabItem cssTab = new TabItem(tabFolder, SWT.NONE);
+ TabItem tldTab = new TabItem(tabFolder, SWT.NONE);
+ TabItem elTab = new TabItem(tabFolder, SWT.NONE);
+
+ Group groupControl = new Group(tabFolder, SWT.NONE);
+ groupControl.setLayout(new GridLayout(1, false));
+ groupControl.setText(Messages.ACTUAL_RUN_TIME_FOLDERS);
+ Control absControl = absFolder.createControl(groupControl);
+ Control relControl = relFolder.createControl(groupControl);
+ Control cssControl = css.createControl(tabFolder);
+ Control tldControl = tld.createControl(tabFolder);
+ Control elControl = el.createControl(tabFolder);
+
+ foldersTab.setText(Messages.ACTUAL_RUN_TIME_FOLDERS);
+ foldersTab.setToolTipText(Messages.ACTUAL_RUN_TIME_FOLDERS);
+ foldersTab.setControl(groupControl);
+
+ cssTab.setText(Messages.INCLUDED_CSS_FILES);
+ cssTab.setToolTipText(Messages.INCLUDED_CSS_FILES);
+ cssTab.setControl(cssControl);
+
+ tldTab.setText(Messages.INCLUDED_TAG_LIBS);
+ tldTab.setToolTipText(Messages.INCLUDED_TAG_LIBS);
+ tldTab.setControl(tldControl);
+
+ elTab.setText(Messages.SUBSTITUTED_EL_EXPRESSIONS);
+ elTab.setToolTipText(Messages.SUBSTITUTED_EL_EXPRESSIONS);
+ elTab.setControl(elControl);
+
+ return tabFolder;
+ }
+
+ public void action(String command) {
+ if (OK.equals(command)) {
+ absFolder.commit();
+ relFolder.commit();
+ el.commit();
+ css.commit();
+ tld.commit();
}
+ super.action(command);
+ }
- public Point getPreferredSize() {
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- String os_name = System.getProperty("os.name");
- if(os_name != null && os_name.indexOf("Windows") >= 0) return new Point(800, 600);
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
- return new Point(600, 700);
+ public Point getPreferredSize() {
+ // changed by estherbin
+ // http://jira.jboss.com/jira/browse/JBIDE-2010
+ String os_name = System.getProperty("os.name"); //$NON-NLS-1$
+ if (os_name != null && os_name.indexOf("Windows") >= 0) { //$NON-NLS-1$
+ return new Point(800, 300);
}
+ // changed by estherbin
+ // http://jira.jboss.com/jira/browse/JBIDE-2010
+ return new Point(600, 350);
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2008-12-22 16:13:40 UTC (rev 12804)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2008-12-22 17:00:31 UTC (rev 12805)
@@ -41,6 +41,8 @@
public static String INCLUDED_CSS_FILES;
public static String INCLUDED_TAG_LIBS;
public static String SUBSTITUTED_EL_EXPRESSIONS;
+ public static String ACTUAL_RUN_TIME_FOLDERS;
public static String ACTUAL_RUN_TIME_ABSOLUTE_FOLDER;
+ public static String ACTUAL_RUN_TIME_RELATIVE_FOLDER;
public static String INVALID_EL_EXPRESSION;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java 2008-12-22 16:13:40 UTC (rev 12804)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java 2008-12-22 17:00:31 UTC (rev 12805)
@@ -20,7 +20,7 @@
}
protected String getTitle() {
- return "Actual Run-Time Relative Folder";
+ return Messages.ACTUAL_RUN_TIME_RELATIVE_FOLDER;
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2008-12-22 16:13:40 UTC (rev 12804)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2008-12-22 17:00:31 UTC (rev 12805)
@@ -1,5 +1,7 @@
INCLUDED_CSS_FILES=Included css files
INCLUDED_TAG_LIBS=Included tag libs
SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions
-ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder
+ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Absolute Folder
+ACTUAL_RUN_TIME_RELATIVE_FOLDER=Relative Folder
+ACTUAL_RUN_TIME_FOLDERS=Actual Run-Time Folders
INVALID_EL_EXPRESSION=Invalid El Expression
15 years, 4 months
JBoss Tools SVN: r12804 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu: action and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-12-22 11:13:40 -0500 (Mon, 22 Dec 2008)
New Revision: 12804
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ReplaceAction.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ITextNodeSplitter.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3428, replace action has been created for context menu
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2008-12-22 15:07:13 UTC (rev 12803)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2008-12-22 16:13:40 UTC (rev 12804)
@@ -54,6 +54,9 @@
public static final String INSERT_BEFORE_MENU = "Insert Before";
public static final String INSERT_AFTER_MENU = "Insert After";
public static final String INSERT_TAG_MENU = "Insert Tag";
+ public static final String REPLACE_TAG_MENU = XMLCommonResources
+ .getInstance().getString("_UI_MENU_REPLACE_WITH"); //$NON-NLS-1$
+
private ActionHelper actionHelper;
@@ -374,15 +377,11 @@
// 'Replace With...' actions
//
//Fix for JBIDE-3428
-// IMenuManager replaceWithMenu = new MyMenuManager(XMLCommonResources
-// .getInstance().getString("_UI_MENU_REPLACE_WITH")); //$NON-NLS-1$
-// menu.add(replaceWithMenu);
+ IMenuManager replaceWithMenu = new MyMenuManager(BaseActionManager.REPLACE_TAG_MENU);
+ menu.add(replaceWithMenu);
if (modelQuery.getEditMode() == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT
&& selectedNodeList.size() > 0) {
- IMenuManager replaceWithMenu = new MyMenuManager(XMLCommonResources
- .getInstance().getString("_UI_MENU_REPLACE_WITH")); //$NON-NLS-1$
- menu.add(replaceWithMenu);
Node node = (Node) selectedNodeList.get(0);
Node parentNode = node.getParentNode();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ITextNodeSplitter.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ITextNodeSplitter.java 2008-12-22 15:07:13 UTC (rev 12803)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/ITextNodeSplitter.java 2008-12-22 16:13:40 UTC (rev 12804)
@@ -31,6 +31,10 @@
*
*/
public static final int INSERT_AFTER = 3;
+ /**
+ * Replace action identifier
+ */
+ public static final int REPLACE_TAG = 4;
/**
*
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2008-12-22 15:07:13 UTC (rev 12803)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2008-12-22 16:13:40 UTC (rev 12804)
@@ -41,6 +41,7 @@
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.menu.BaseActionManager.MyMenuManager;
import org.jboss.tools.vpe.editor.menu.action.InsertAction;
+import org.jboss.tools.vpe.editor.menu.action.ReplaceAction;
import org.jboss.tools.vpe.editor.menu.action.VpeMenuListener;
import org.jboss.tools.vpe.editor.menu.action.VpeTextOperationAction;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
@@ -182,6 +183,11 @@
} else if (NodeActionManager.INSERT_AFTER_MENU.equals(mm.getMenuText())) {
type = ITextNodeSplitter.INSERT_AFTER;
region = new Point(NodesManagingUtil.getEndOffsetNode(node), 0);
+ } else if (NodeActionManager.REPLACE_TAG_MENU.equals(mm.getMenuText())){
+ //added by Max Areshkau, fix for JBIDE-3428
+ type = ITextNodeSplitter.REPLACE_TAG;
+ //post start and end offset of node
+ region = new Point(NodesManagingUtil.getStartOffsetNode(node),NodesManagingUtil.getNodeLength(node));
}
listenContextMenu(mm, region, type);
}
@@ -483,12 +489,36 @@
if (type == ITextNodeSplitter.INSERT_AROUND &&
(endText == null || Constants.EMPTY.equals(endText))) {
continue;
+ } if(type ==ITextNodeSplitter.REPLACE_TAG){
+ //mareshkau, fix for JBIDE-3428, here we create replace action
+ createReplaceAction(menu, region,items[i]);
+ continue;
}
+
createInsertAction(menu, region, items[i]);
}
}
+ /**
+ * @author mareshkau
+ * Creates replace Actions for VPE context menu
+ *
+ */
+ private void createReplaceAction(MenuManager menu, Point region, XModelObject item){
+ String tagName = getTagName(menu, region, item);
+ menu.add(new ReplaceAction(tagName, region, item, pageContext, sourceEditor));
+ }
+
private void createInsertAction(MenuManager menu, Point region, XModelObject item) {
+ String tagName = getTagName(menu, region, item);
+ menu.add(new InsertAction(tagName, region, item, pageContext, sourceEditor));
+ }
+ /**
+ * @author mareshkau
+ * Returns tag name for insert and replace actions
+ * @return tag name
+ */
+ private String getTagName(MenuManager menu, Point region, XModelObject item) {
XModelObject parent = item.getParent();
String uri = (parent == null) ? Constants.EMPTY : parent.getAttributeValue(URIConstants.LIBRARY_URI);
String defaultPrefix = (parent == null) ? Constants.EMPTY : parent.getAttributeValue(URIConstants.DEFAULT_PREFIX);
@@ -498,10 +528,9 @@
PaletteInsertHelper.applyPrefix(texts, sourceEditor, tagName, uri, defaultPrefix);
}
tagName = texts[0];
-
- menu.add(new InsertAction(tagName, region, item, pageContext, sourceEditor));
+
+ return tagName;
}
-
/**
* For inner usage only. Was create just for simplicity.
*/
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java 2008-12-22 15:07:13 UTC (rev 12803)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/InsertAction.java 2008-12-22 16:13:40 UTC (rev 12804)
@@ -102,4 +102,26 @@
p.put("selectionProvider", selProvider); //$NON-NLS-1$
PaletteInsertHelper.insertIntoEditor(sourceEditor.getTextViewer(), p);
}
-}
\ No newline at end of file
+
+ /**
+ * @return the region
+ */
+ protected Point getRegion() {
+ return region;
+ }
+
+ /**
+ * @return the pageContext
+ */
+ protected VpePageContext getPageContext() {
+ return pageContext;
+ }
+
+ /**
+ * @return the sourceEditor
+ */
+ protected StructuredTextEditor getSourceEditor() {
+ return sourceEditor;
+ }
+
+}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ReplaceAction.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ReplaceAction.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/ReplaceAction.java 2008-12-22 16:13:40 UTC (rev 12804)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.editor.menu.action;
+
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+
+/**
+ * Replace Action for visual editor from content menu
+ * @author mareshkau
+ *
+ */
+public class ReplaceAction extends InsertAction{
+
+ /**
+ *
+ * @param title
+ * @param region
+ * @param item
+ * @param pageContext
+ * @param sourceEditor
+ */
+ public ReplaceAction(String title, Point region, XModelObject item,
+ VpePageContext pageContext, StructuredTextEditor sourceEditor) {
+ super(title, region, item, pageContext, sourceEditor);
+ }
+
+ @Override
+ public void run() {
+ getSourceEditor().getTextViewer().getTextWidget().replaceTextRange(getRegion().x, getRegion().y, ""); //$NON-NLS-1$
+ getRegion().y=0;
+ super.run();
+ }
+
+
+}
15 years, 4 months
JBoss Tools SVN: r12803 - trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-12-22 10:07:13 -0500 (Mon, 22 Dec 2008)
New Revision: 12803
Modified:
trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css
Log:
https://jira.jboss.org/jira/browse/JBDS-344 - the gradient is restored;
Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css
===================================================================
--- trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-12-22 09:17:16 UTC (rev 12802)
+++ trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-12-22 15:07:13 UTC (rev 12803)
@@ -22,7 +22,7 @@
width:100%;
height:100%;
position:absolute;
-top:0px;
+top:-8px;
left:0px;
z-index:-1;
}
15 years, 4 months
JBoss Tools SVN: r12802 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-12-22 04:17:16 -0500 (Mon, 22 Dec 2008)
New Revision: 12802
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3439
do not log error if project not exists
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2008-12-22 08:58:38 UTC (rev 12801)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2008-12-22 09:17:16 UTC (rev 12802)
@@ -27,6 +27,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -37,6 +38,9 @@
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.jdt.core.IJavaModel;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
@@ -103,8 +107,19 @@
}
private static boolean isClassPathAffected(ILaunchConfiguration config, IPath oldPath) throws CoreException{
+ boolean useDefault = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, true);
+ if (useDefault){
+ try {
+ if (JavaRuntime.getJavaProject(config) == null) return false;
+ } catch (CoreException e){
+ //do not log "project not found" error
+ return false;
+ }
+ }
+
IRuntimeClasspathEntry[] entries;
try {
+
entries = JavaRuntime.computeUnresolvedRuntimeClasspath(config);
return isRuntimeClassPathEntriesAffected(entries, oldPath);
}
15 years, 4 months
JBoss Tools SVN: r12801 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui/editors and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-12-22 03:58:38 -0500 (Mon, 22 Dec 2008)
New Revision: 12801
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java
Log:
Connect the parent link automatically
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-12-22 07:19:22 UTC (rev 12800)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-12-22 08:58:38 UTC (rev 12801)
@@ -10,12 +10,18 @@
******************************************************************************/
package org.jboss.tools.smooks.javabean.commandprocessor;
+import java.util.List;
+
import org.eclipse.emf.common.command.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.jface.viewers.ITreeContentProvider;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
import org.jboss.tools.smooks.ui.gef.commandprocessor.ICommandProcessor;
import org.jboss.tools.smooks.ui.gef.commands.CreateConnectionCommand;
import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel;
+import org.jboss.tools.smooks.ui.gef.model.IConnectableModel;
import org.jboss.tools.smooks.ui.gef.model.PropertyModel;
+import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
import org.jboss.tools.smooks.utils.UIUtils;
/**
@@ -25,21 +31,29 @@
*/
public class JavaBeanModelCommandProcessor implements ICommandProcessor {
- public void processEMFCommand(Command emfCommand) {
+ public void processEMFCommand(Command emfCommand,
+ SmooksConfigurationFileGenerateContext context) {
}
- public void processGEFCommand(org.eclipse.gef.commands.Command gefCommand) {
+ public void processGEFCommand(org.eclipse.gef.commands.Command gefCommand,
+ SmooksConfigurationFileGenerateContext context) {
+ Object source = null;
+ JavaBeanModel target = null;
if (CreateConnectionCommand.class.isAssignableFrom(gefCommand
.getClass())) {
CreateConnectionCommand command = (CreateConnectionCommand) gefCommand;
if (command.getSource() != null && command.getTarget() != null) {
Object m = command.getTarget();
Object s = command.getSource();
- if (m instanceof AbstractStructuredDataModel && s instanceof AbstractStructuredDataModel) {
- Object source = ((AbstractStructuredDataModel)s).getReferenceEntityModel();
- Object t = ((AbstractStructuredDataModel)m).getReferenceEntityModel();
- if (!UIUtils.isInstanceCreatingConnection(source,t)) {
+ if (m instanceof AbstractStructuredDataModel
+ && s instanceof AbstractStructuredDataModel) {
+ source = ((AbstractStructuredDataModel) s)
+ .getReferenceEntityModel();
+ Object t = ((AbstractStructuredDataModel) m)
+ .getReferenceEntityModel();
+ if (!UIUtils.isInstanceCreatingConnection(source, t)) {
if (t instanceof JavaBeanModel) {
+ target = (JavaBeanModel) t;
Class clazz = ((JavaBeanModel) t).getBeanClass();
if (clazz != null && clazz != String.class) {
PropertyModel property = new PropertyModel();
@@ -51,24 +65,84 @@
}
}
}
+
+ CompoundCommand compoundCommand = new CompoundCommand();
+ fillCreateParentLinkCommand(compoundCommand, source, target,
+ context);
+ if (!compoundCommand.isEmpty()) {
+ compoundCommand.execute();
+ }
}
}
+ private void fillCreateParentLinkCommand(CompoundCommand compoundCommand,
+ Object source, JavaBeanModel target,
+ SmooksConfigurationFileGenerateContext context) {
+ CreateConnectionCommand c = createParentLinkCommand(source, target,
+ context);
+ while (c != null) {
+ compoundCommand.add(c);
+ Object m = c.getTarget();
+ Object s = c.getSource();
+ Object source1 = null;
+ JavaBeanModel target1 = null;
+ if (m instanceof AbstractStructuredDataModel
+ && s instanceof AbstractStructuredDataModel) {
+ source1 = ((AbstractStructuredDataModel) s)
+ .getReferenceEntityModel();
+ target1 = (JavaBeanModel) ((AbstractStructuredDataModel) m)
+ .getReferenceEntityModel();
+ }
+ c = createParentLinkCommand(source1, target1, context);
+ }
+ }
+
+ private CreateConnectionCommand createParentLinkCommand(Object source,
+ JavaBeanModel target, SmooksConfigurationFileGenerateContext context) {
+ ITreeContentProvider sourceProvider = context.getSourceViewerProvider();
+ JavaBeanModel targetParent = target.getParent();
+ AbstractStructuredDataModel targetParentGraphModel = UIUtils
+ .findGraphModel(context.getGraphicalRootModel(), targetParent);
+ if (targetParentGraphModel != null
+ && targetParentGraphModel instanceof IConnectableModel) {
+ List list = ((IConnectableModel) targetParentGraphModel)
+ .getModelTargetConnections();
+ if (list.isEmpty()) {
+ Object sourceParent = sourceProvider.getParent(source);
+ IConnectableModel sourceParentGraphModel = (IConnectableModel) UIUtils
+ .findGraphModel(context.getGraphicalRootModel(),
+ sourceParent);
+ if (sourceParentGraphModel != null) {
+ CreateConnectionCommand connectionCommand = new CreateConnectionCommand();
+ connectionCommand.setSource(sourceParentGraphModel);
+ connectionCommand.setTarget(targetParentGraphModel);
+ return connectionCommand;
+ }
+ }
+ }
+ return null;
+ }
+
public static String getTypeString(Class clazz) {
- if(clazz.isPrimitive()){
+ if (clazz.isPrimitive()) {
return getPrimitiveTypeString(clazz);
}
String name = clazz.getSimpleName();
return name;
}
-
- public static String getPrimitiveTypeString(Class clazz){
+
+ public static String getPrimitiveTypeString(Class clazz) {
String name = clazz.getName();
- if("int".equalsIgnoreCase(name)) return "Integer";
- if("double".equalsIgnoreCase(name)) return "Double";
- if("float".equalsIgnoreCase(name)) return "Float";
- if("long".equalsIgnoreCase(name)) return "Long";
- if("boolean".equalsIgnoreCase(name)) return "Boolean";
+ if ("int".equalsIgnoreCase(name))
+ return "Integer";
+ if ("double".equalsIgnoreCase(name))
+ return "Double";
+ if ("float".equalsIgnoreCase(name))
+ return "Float";
+ if ("long".equalsIgnoreCase(name))
+ return "Long";
+ if ("boolean".equalsIgnoreCase(name))
+ return "Boolean";
return "";
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-22 07:19:22 UTC (rev 12800)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-12-22 08:58:38 UTC (rev 12801)
@@ -478,10 +478,8 @@
protected void createErrorMessageLinkGUI(FormToolkit toolkit,
Composite parent) {
- problemSection = this
- .createPageSectionHeader(parent, Section.TITLE_BAR
- | Section.EXPANDED, "Problems",
- "No problems");
+ problemSection = this.createPageSectionHeader(parent, Section.TITLE_BAR
+ | Section.EXPANDED, "Problems", "No problems");
designTimeAnalyzeResultRegion = toolkit.createComposite(problemSection);
GridLayout ngl = new GridLayout();
ngl.numColumns = 2;
@@ -821,18 +819,20 @@
context.setDataMappingRootModel(this.rootModel);
context.setSmooksConfigFile(((IFileEditorInput) getEditorInput())
.getFile());
-
- context.setSourceViewerLabelProvider((LabelProvider) sourceViewer
- .getLabelProvider());
- context
- .setSourceViewerContentProvider((ITreeContentProvider) sourceViewer
- .getContentProvider());
-
+ if (sourceViewer != null) {
+ context.setSourceViewerLabelProvider((LabelProvider) sourceViewer
+ .getLabelProvider());
+ context
+ .setSourceViewerContentProvider((ITreeContentProvider) sourceViewer
+ .getContentProvider());
+ }
+ if (targetViewer != null) {
context.setTargetViewerLabelProvider((LabelProvider) targetViewer
.getLabelProvider());
context
.setTargetViewerContentProvider((ITreeContentProvider) targetViewer
.getContentProvider());
+ }
context.setShell(getSite().getShell());
}
@@ -1465,6 +1465,7 @@
public SmooksConfigurationFileGenerateContext getSmooksConfigurationFileGenerateContext() {
if (smooksConfigurationFileGenerateContext == null) {
smooksConfigurationFileGenerateContext = createContext();
+ initSmooksConfigurationFileGenerateContext(smooksConfigurationFileGenerateContext);
}
return smooksConfigurationFileGenerateContext;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java 2008-12-22 07:19:22 UTC (rev 12800)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/CommandProcessorFactory.java 2008-12-22 08:58:38 UTC (rev 12801)
@@ -18,6 +18,7 @@
import org.eclipse.ui.IEditorPart;
import org.jboss.tools.smooks.ui.editors.SmooksFormEditor;
import org.jboss.tools.smooks.ui.editors.SmooksGraphicalFormPage;
+import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
import org.jboss.tools.smooks.utils.SmooksExtensionPointConstants;
/**
@@ -76,18 +77,17 @@
if(page != null){
String sourceId = page.getSourceDataTypeID();
String targetId = page.getTargetDataTypeID();
- processGEFCommand(command, sourceId,targetId);
+ processGEFCommand(command, sourceId,targetId,page.getSmooksConfigurationFileGenerateContext());
}
}
}
-
}
public void processGEFCommand(Command command, String sourceId,
- String targetId) throws CoreException {
+ String targetId , SmooksConfigurationFileGenerateContext context) throws CoreException {
ICommandProcessor pro = getCommandProcessor(sourceId, targetId);
if (pro != null) {
- pro.processGEFCommand(command);
+ pro.processGEFCommand(command , context);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java 2008-12-22 07:19:22 UTC (rev 12800)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commandprocessor/ICommandProcessor.java 2008-12-22 08:58:38 UTC (rev 12801)
@@ -1,6 +1,7 @@
package org.jboss.tools.smooks.ui.gef.commandprocessor;
import org.eclipse.gef.commands.Command;
+import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
/**
*
@@ -9,8 +10,7 @@
* @CreateTime Jul 22, 2008
*/
public interface ICommandProcessor {
- public void processGEFCommand(Command gefCommand);
+ public void processGEFCommand(Command gefCommand , SmooksConfigurationFileGenerateContext context);
- public void processEMFCommand(
- org.eclipse.emf.common.command.Command emfCommand);
+ public void processEMFCommand(org.eclipse.emf.common.command.Command emfCommand, SmooksConfigurationFileGenerateContext context);
}
15 years, 4 months