JBoss Tools SVN: r17383 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4816 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-08-31 12:07:52 -0400 (Mon, 31 Aug 2009)
New Revision: 17383
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4816/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4816/testVisualContentBeforeRefreshAndAfter.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4816
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4816/testVisualContentBeforeRefreshAndAfter.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4816/testVisualContentBeforeRefreshAndAfter.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4816/testVisualContentBeforeRefreshAndAfter.html 2009-08-31 16:07:52 UTC (rev 17383)
@@ -0,0 +1,2 @@
+<html>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2009-08-31 15:25:12 UTC (rev 17382)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/Jsf20ComponentContentTest.java 2009-08-31 16:07:52 UTC (rev 17383)
@@ -49,6 +49,7 @@
performInvisibleTagTest("components/outputStylesheet.xhtml", "outputStylesheetBlue"); //$NON-NLS-1$ //$NON-NLS-2$
}
+ @Override
protected String getTestProjectName() {
return JsfAllTests.IMPORT_JSF_20_PROJECT_NAME;
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-08-31 15:25:12 UTC (rev 17382)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-08-31 16:07:52 UTC (rev 17383)
@@ -76,6 +76,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest;
import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
@@ -161,6 +162,7 @@
suite.addTestSuite(JBIDE3247Test.class);
suite.addTestSuite(JBIDE2550Test.class);
suite.addTestSuite(OpenOnCssClassTest_JBIDE4775.class);
+ suite.addTestSuite(VPERefreshTest.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/VPERefreshTest.java 2009-08-31 16:07:52 UTC (rev 17383)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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.jsf.vpe.jsf.test.jbide;
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ ******************************************************************************/
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMElement;
+
+/**
+ *
+ * Test case for https://jira.jboss.org/jira/browse/JBIDE-4816
+ *
+ * @author mareshkau
+ */
+public class VPERefreshTest extends VpeTest{
+
+ public VPERefreshTest(String name) {
+ super(name);
+ }
+
+ public void testVisualContentInVpeVeforeRefreshAndAfter() throws Throwable {
+ VpeController vpeController =
+ openInVpe(JsfAllTests.IMPORT_PROJECT_NAME, "JBIDE/4816/testVisualContentBeforeRefreshAndAfter.html");//$NON-NLS-1$
+ vpeController.getSourceEditor().getTextViewer().setSelectedRange(0, 0);
+ nsIDOMElement bodyBeforeRefresh = vpeController.getVisualBuilder().getContentArea();
+ long beforeRefreshChields = bodyBeforeRefresh.getChildNodes().getLength();
+ vpeController.visualRefresh();
+ TestUtil.waitForIdle();
+ nsIDOMElement bodyAfterRefresh = vpeController.getVisualBuilder().getContentArea();
+ assertEquals("Number of child nodes before and after refresh should be the same",beforeRefreshChields, bodyAfterRefresh.getChildNodes().getLength()); //$NON-NLS-1$
+ }
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-08-31 15:25:12 UTC (rev 17382)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-08-31 16:07:52 UTC (rev 17383)
@@ -249,7 +249,11 @@
nsIDOMNodeList children = getContentArea().getChildNodes();
long len = children.getLength();
for (long i = len - 1; i >= 0; i--) {
- getContentArea().removeChild(children.item(i));
+ //added by Maksim Areshkau as fix for https://jira.jboss.org/jira/browse/JBIDE-4816
+ //for XR-1.8 addes <BR _MOZ_EDITOR_BOGUS_NODE="TRUE" _MOZ_DIRTY=""/> node in document and it's should be deleted
+ if(PSEUDO_ELEMENT.equalsIgnoreCase(children.item(i).getNodeName())) {
+ getContentArea().removeChild(children.item(i));
+ }
}
if (sourceDocument != null) {
14 years, 7 months
JBoss Tools SVN: r17382 - trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-08-31 11:25:12 -0400 (Mon, 31 Aug 2009)
New Revision: 17382
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_8a.png
trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_8b.png
Log:
JBDS-799 Search in property file using regular expressions is implemented
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_8a.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/rad_jsf_application/rad_jsf_application_8b.png
===================================================================
(Binary files differ)
14 years, 7 months
JBoss Tools SVN: r17381 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-08-31 10:11:35 -0400 (Mon, 31 Aug 2009)
New Revision: 17381
Modified:
trunk/as/docs/reference/en/modules/perspective.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-824 - updating the 'Filesets' section;
Modified: trunk/as/docs/reference/en/modules/perspective.xml
===================================================================
--- trunk/as/docs/reference/en/modules/perspective.xml 2009-08-31 14:10:36 UTC (rev 17380)
+++ trunk/as/docs/reference/en/modules/perspective.xml 2009-08-31 14:11:35 UTC (rev 17381)
@@ -336,17 +336,32 @@
<para>The wizard asks you to enter the filter name and add includes and excludes
patterns. The preview box underneath gives a list of files matched to the
- defined patterns.</para>
-
- <figure>
- <title>New File Filter Wizard</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/perspective/filesets2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
+ defined patterns (see the figures bellow).</para>
+ <para>In order to set up a default fileset relative to the concrete configuration of the server runtime, use the following variable:
+ <literal>${jboss_config}</literal>, i. e. you should type in the <emphasis>
+ <property>Root Directory</property></emphasis> something like <literal>server/${jboss_config}/</literal>.
+ This is implemented in order you can modify the runtime's configuration and not have to manually update paths.</para>
+ <figure>
+ <title>New File Filter Wizard</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/filesets2_a.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
+ <para>Notice, that the <emphasis>
+ <property>Browse</property></emphasis> button still returns an absolute path:</para>
+
+ <figure>
+ <title>New File Filter Wizard</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/perspective/filesets2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>After the filter is created, you can observe it by expanding the <emphasis>
<property>Filesets</property>
</emphasis> category in the <property>JBoss Server View</property>.</para>
14 years, 7 months
JBoss Tools SVN: r17379 - trunk/as/docs/reference/en/images/perspective.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-08-31 10:10:06 -0400 (Mon, 31 Aug 2009)
New Revision: 17379
Added:
trunk/as/docs/reference/en/images/perspective/filesets2_a.png
Log:
https://jira.jboss.org/jira/browse/JBDS-824 - adding a new image;
Added: trunk/as/docs/reference/en/images/perspective/filesets2_a.png
===================================================================
(Binary files differ)
Property changes on: trunk/as/docs/reference/en/images/perspective/filesets2_a.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months
JBoss Tools SVN: r17378 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/configuration and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-08-31 06:08:46 -0400 (Mon, 31 Aug 2009)
New Revision: 17378
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/input_data_header.gif
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.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/editparts/InputDataContainerEditPart.java
Log:
JBIDE-4648
Change input data figure
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/input_data_header.gif
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/input_data_header.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-08-31 09:59:47 UTC (rev 17377)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-08-31 10:08:46 UTC (rev 17378)
@@ -69,6 +69,9 @@
reg.put(GraphicsConstants.IMAGE_UNKNOWN_OBJ, imageDescriptorFromPlugin(PLUGIN_ID,
GraphicsConstants.IMAGE_UNKNOWN_OBJ));
+ reg.put(GraphicsConstants.IMAGE_INPUT_DATA_HEADER, imageDescriptorFromPlugin(PLUGIN_ID,
+ GraphicsConstants.IMAGE_INPUT_DATA_HEADER));
+
// regist ovr images
reg.put(GraphicsConstants.IMAGE_OVR_ERROR, getImageDescriptor(GraphicsConstants.IMAGE_OVR_ERROR));
reg.put(GraphicsConstants.IMAGE_OVR_WARING, getImageDescriptor(GraphicsConstants.IMAGE_OVR_WARING));
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-08-31 09:59:47 UTC (rev 17377)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-08-31 10:08:46 UTC (rev 17378)
@@ -22,6 +22,8 @@
public static final String IMAGE_JAVA_BEAN = "icons/full/obj16/java_bean.png";
+ public static final String IMAGE_INPUT_DATA_HEADER = "icons/full/obj16/input_data_header.gif";
+
public static final String IMAGE_JAVA_ARRAY = "icons/full/obj16/javaarraymodel.gif";
public static final String IMAGE_CHECKBOX_CHECK = "icons/full/obj16/checkbox_checked.gif";
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java 2009-08-31 09:59:47 UTC (rev 17377)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java 2009-08-31 10:08:46 UTC (rev 17378)
@@ -34,25 +34,23 @@
public TreeContainerFigure(TreeContainerModel model) {
super();
this.model = model;
+ this.addChildrenFigures();
+ }
+
+ protected void addChildrenFigures(){
headerFigure = new Figure() {
@Override
protected void paintFigure(Graphics graphics) {
super.paintFigure(graphics);
- graphics.pushState();
- graphics.setForegroundColor(headerColor);
- graphics.setBackgroundColor(ColorConstants.white);
- graphics.fillGradient(getBounds(), true);
- graphics.setForegroundColor(headerColor);
- graphics.drawLine(getBounds().getBottomLeft().translate(0, -1), getBounds().getBottomRight().translate(
- 0, -1));
- graphics.popState();
+ drawHeaderFigure(graphics);
}
@Override
public Dimension getPreferredSize(int hint, int hint2) {
Dimension size = super.getPreferredSize(hint, hint2);
- return new Dimension(size.width, 25);
+ int width = Math.max(size.width, 100);
+ return new Dimension(width, 25);
}
};
label = new Label();
@@ -61,10 +59,8 @@
layout.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
headerFigure.setLayoutManager(layout);
headerFigure.setOpaque(true);
- headerFigure.setBackgroundColor(ColorConstants.blue);
contentFigure = new Figure();
- contentFigure.setBackgroundColor(ColorConstants.red);
contentFigure.setLayoutManager(new ToolbarLayout());
this.add(headerFigure);
this.add(contentFigure);
@@ -72,6 +68,17 @@
tl.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
this.setLayoutManager(tl);
}
+
+ protected void drawHeaderFigure(Graphics graphics) {
+ graphics.pushState();
+ graphics.setForegroundColor(headerColor);
+ graphics.setBackgroundColor(ColorConstants.white);
+ graphics.fillGradient(getBounds(), true);
+ graphics.setForegroundColor(headerColor);
+ graphics.drawLine(getBounds().getBottomLeft().translate(0, -1), getBounds().getBottomRight().translate(0, -1));
+ graphics.popState();
+ }
+
/**
* @return the label
*/
@@ -139,8 +146,9 @@
graphics.fillRectangle(getBounds());
graphics.popState();
}
+
public void setIcon(Image i) {
- if(label != null){
+ if (label != null) {
label.setIcon(i);
}
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-08-31 10:08:46 UTC (rev 17378)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors;
+
+import org.eclipse.gef.palette.ConnectionCreationToolEntry;
+import org.eclipse.gef.palette.MarqueeToolEntry;
+import org.eclipse.gef.palette.PaletteDrawer;
+import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.palette.SelectionToolEntry;
+import org.eclipse.gef.requests.CreationFactory;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
+
+/**
+ * @author Dart dpeng(a)redhat.com
+ *
+ */
+public class SmooksGraphicalEditorPaletteRootCreator {
+ public PaletteRoot createPaletteRoot(){
+ PaletteRoot root= new PaletteRoot();
+ PaletteDrawer drawer = new PaletteDrawer("Tools");
+ drawer.add(new SelectionToolEntry());
+ drawer.add(new MarqueeToolEntry());
+ CreationFactory factory = new CreationFactory() {
+
+ public Object getObjectType() {
+ return TreeNodeConnection.class;
+ }
+
+ public Object getNewObject() {
+ return null;
+ }
+ };
+ drawer.add(new ConnectionCreationToolEntry("Link", "Link", factory, null, null));
+ root.add(drawer);
+ return root;
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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 2009-08-31 09:59:47 UTC (rev 17377)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-08-31 10:08:46 UTC (rev 17378)
@@ -32,8 +32,9 @@
import org.eclipse.gef.commands.CommandStackEvent;
import org.eclipse.gef.commands.CommandStackEventListener;
import org.eclipse.gef.editparts.FreeformGraphicalRootEditPart;
+import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.gef.ui.parts.GraphicalEditor;
+import org.eclipse.gef.ui.parts.GraphicalEditorWithPalette;
import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
@@ -81,7 +82,7 @@
* @author Dart
*
*/
-public class SmooksGraphicalEditorPart extends GraphicalEditor implements ISelectionChangedListener,
+public class SmooksGraphicalEditorPart extends GraphicalEditorWithPalette implements ISelectionChangedListener,
ISourceSynchronizeListener {
public static final int EXECUTE_COMMAND = 0;
@@ -781,4 +782,10 @@
public void sourceChange(Object model) {
initGraphicalModel();
}
+
+ @Override
+ protected PaletteRoot getPaletteRoot() {
+ SmooksGraphicalEditorPaletteRootCreator creator = new SmooksGraphicalEditorPaletteRootCreator();
+ return creator.createPaletteRoot();
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-08-31 09:59:47 UTC (rev 17377)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-08-31 10:08:46 UTC (rev 17378)
@@ -12,12 +12,23 @@
import java.beans.PropertyChangeEvent;
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart;
+import org.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure;
+import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
/**
* @author Dart
- *
+ *
*/
public class InputDataContainerEditPart extends TreeContainerEditPart {
@@ -28,7 +39,134 @@
@Override
protected String generateFigureID() {
- return SmooksGraphUtil.generateFigureID((TreeNodeModel)getModel());
+ return SmooksGraphUtil.generateFigureID((TreeNodeModel) getModel());
}
-
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart#createFigure
+ * ()
+ */
+ @Override
+ protected IFigure createFigure() {
+
+ final int zwidth = 20;
+
+ IFigure figure = new TreeContainerFigure((TreeContainerModel) getModel()) {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure#
+ * addChildrenFigures()
+ */
+ @Override
+ protected void addChildrenFigures() {
+ IFigure headerFigure1 = new Figure() {
+
+ @Override
+ protected void paintFigure(Graphics graphics) {
+ super.paintFigure(graphics);
+ }
+
+ @Override
+ public Dimension getPreferredSize(int hint, int hint2) {
+ Dimension size = super.getPreferredSize(hint, hint2);
+ int width = Math.max(size.width, 100);
+ return new Dimension(width, 25);
+ }
+ };
+ this.add(headerFigure1);
+ super.addChildrenFigures();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure#
+ * drawHeaderFigure(org.eclipse.draw2d.Graphics)
+ */
+ @Override
+ protected void drawHeaderFigure(Graphics graphics) {
+ // TODO Auto-generated method stub
+ // super.drawHeaderFigure(graphics);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure#
+ * paintBorder(org.eclipse.draw2d.Graphics)
+ */
+ @Override
+ protected void paintBorder(Graphics graphics) {
+ // super.paintBorder(graphics);
+ graphics.setForegroundColor(ColorConstants.black);
+
+ Point p2 = new Point();
+ p2.setLocation(getBounds().getTopLeft().x, getBounds().getTopLeft().y);
+
+ Point p1 = new Point();
+ p1.setLocation(getBounds().getTopRight().x - zwidth, getBounds().getTopRight().y);
+
+ graphics.drawLine(p1, p2);
+
+ Point p3 = new Point();
+ p3.setLocation(getBounds().getBottomLeft().x, getBounds().getBottomLeft().y - 1);
+ graphics.drawLine(p2, p3);
+
+ Point p4 = new Point();
+ p4.setLocation(getBounds().getBottomRight().x - 1, getBounds().getBottomRight().y - 1);
+ graphics.drawLine(p4, p3);
+
+ Point p5 = new Point();
+ p5.setLocation(getBounds().getTopRight().x - 1, getBounds().getTopRight().y + zwidth);
+ graphics.drawLine(p4, p5);
+
+ graphics.drawLine(p1, p5);
+
+ Point p6 = new Point();
+ p6.setLocation(p1.x, p5.y);
+ graphics.drawLine(p5, p6);
+ graphics.drawLine(p1, p6);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure#
+ * paintFigure(org.eclipse.draw2d.Graphics)
+ */
+ @Override
+ protected void paintFigure(Graphics graphics) {
+
+ super.paintFigure(graphics);
+
+ }
+
+ };
+ return figure;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart#
+ * refreshVisuals()
+ */
+ @Override
+ protected void refreshVisuals() {
+ TreeContainerFigure figure = (TreeContainerFigure) getFigure();
+ // if(i != null){
+ // figure.setIcon(i);
+ // }
+ figure.getLabel().setTextAlignment(Label.LEFT);
+ figure.setText("Input Data");
+ figure.setIcon(SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_INPUT_DATA_HEADER));
+ super.refreshVisuals();
+ }
+
}
14 years, 7 months
JBoss Tools SVN: r17377 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-08-31 05:59:47 -0400 (Mon, 31 Aug 2009)
New Revision: 17377
Modified:
workspace/examples/projectExamples.xml
Log:
modify the projectExamples.xml file to add two examples for bpel
Modified: workspace/examples/projectExamples.xml
===================================================================
--- workspace/examples/projectExamples.xml 2009-08-31 09:58:42 UTC (rev 17376)
+++ workspace/examples/projectExamples.xml 2009-08-31 09:59:47 UTC (rev 17377)
@@ -416,4 +416,26 @@
http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/resteasy-examp...
</url>
</project>
+
+ <project>
+ <category>BPEL</category>
+ <name>HelloWorld</name>
+ <shortDescription>A simple BPEL example</shortDescription>
+ <description>This sample is to show a simple BPEL2.0 example.</description>
+ <size>10000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/Hell...
+ </url>
+ </project>
+
+ <project>
+ <category>BPEL</category>
+ <name>Simple_Correlation</name>
+ <shortDescription>A correlation BPEL example</shortDescription>
+ <description>This sample is to show how to use the correlation in the BPEL2.0 example.</description>
+ <size>11000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/Simp...
+ </url>
+ </project>
</projects>
14 years, 7 months
JBoss Tools SVN: r17376 - workspace/grid/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-08-31 05:58:42 -0400 (Mon, 31 Aug 2009)
New Revision: 17376
Added:
workspace/grid/esb-example/HelloWorld.zip
workspace/grid/esb-example/Simple_Correlation.zip
Log:
add two examples for bpel
Added: workspace/grid/esb-example/HelloWorld.zip
===================================================================
(Binary files differ)
Property changes on: workspace/grid/esb-example/HelloWorld.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/grid/esb-example/Simple_Correlation.zip
===================================================================
(Binary files differ)
Property changes on: workspace/grid/esb-example/Simple_Correlation.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months
JBoss Tools SVN: r17375 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: configuration/editors/uitls and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-08-31 03:58:01 -0400 (Mon, 31 Aug 2009)
New Revision: 17375
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/uitls/SmooksUIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
Log:
JBIDE-4837
Synchroniz the M3 fix bug codes to M4
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 2009-08-31 07:17:53 UTC (rev 17374)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-08-31 07:58:01 UTC (rev 17375)
@@ -82,14 +82,14 @@
e.printStackTrace();
}
-// graphicalPage = new SmooksGraphicalEditorPart(this);
-// addSourceSynchronizeListener(graphicalPage);
-// try {
-// int index = this.addPage(graphicalPage, getEditorInput());
-// setPageText(index, "Graph");
-// } catch (PartInitException e) {
-// e.printStackTrace();
-// }
+ graphicalPage = new SmooksGraphicalEditorPart(this);
+ addSourceSynchronizeListener(graphicalPage);
+ try {
+ int index = this.addPage(graphicalPage, getEditorInput());
+ setPageText(index, "Graph");
+ } catch (PartInitException e) {
+ e.printStackTrace();
+ }
super.addPages();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-31 07:17:53 UTC (rev 17374)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-31 07:58:01 UTC (rev 17375)
@@ -2137,10 +2137,13 @@
// Content assist command
String command = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$
// Set auto activation character to be a '.'
- char[] autoActivationChars = new char[] { '.' };
+ char[] chars = new char[allEnglishCharas.length + 1];
+ System.arraycopy(allEnglishCharas, 0, chars, 0, allEnglishCharas.length);
+ chars[chars.length - 1] = '.';
+// char[] autoActivationChars = new char[] { '.' };
// Create the adapter
ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter,
- proposalProvider, command, autoActivationChars);
+ proposalProvider, command, chars);
// Configure the adapter
// Add label provider
ILabelProvider labelProvider = new TypeProposalLabelProvider();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-08-31 07:17:53 UTC (rev 17374)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-08-31 07:58:01 UTC (rev 17375)
@@ -104,7 +104,7 @@
IXMLStructuredObject model = null;
model = SmooksUIUtils.localXMLNodeWithPath(selector, root, "/", false);
if (model == null) {
- SmooksUIUtils.localXMLNodeWithPath(selector, root, " ", false);
+ model = SmooksUIUtils.localXMLNodeWithPath(selector, root, " ", false);
}
if(model == null) return null;
IXMLStructuredObject p = model;
14 years, 7 months
JBoss Tools SVN: r17374 - branches/jbosstools-3.1.0.M3/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-08-31 03:17:53 -0400 (Mon, 31 Aug 2009)
New Revision: 17374
Modified:
branches/jbosstools-3.1.0.M3/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
Log:
JBIDE-4837
Change the content assist auto activation chars
Modified: branches/jbosstools-3.1.0.M3/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
--- branches/jbosstools-3.1.0.M3/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-31 05:22:43 UTC (rev 17373)
+++ branches/jbosstools-3.1.0.M3/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-31 07:17:53 UTC (rev 17374)
@@ -2137,10 +2137,13 @@
// Content assist command
String command = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$
// Set auto activation character to be a '.'
- char[] autoActivationChars = new char[] { '.' };
+ char[] chars = new char[allEnglishCharas.length + 1];
+ System.arraycopy(allEnglishCharas, 0, chars, 0, allEnglishCharas.length);
+ chars[chars.length - 1] = '.';
+// char[] autoActivationChars = new char[] { '.' };
// Create the adapter
ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter,
- proposalProvider, command, autoActivationChars);
+ proposalProvider, command, chars);
// Configure the adapter
// Add label provider
ILabelProvider labelProvider = new TypeProposalLabelProvider();
14 years, 7 months