JBoss Tools SVN: r19687 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-01-11 02:48:17 -0500 (Mon, 11 Jan 2010)
New Revision: 19687
Modified:
workspace/examples/project-examples-3.1M4.xml
Log:
Modified: workspace/examples/project-examples-3.1M4.xml
===================================================================
--- workspace/examples/project-examples-3.1M4.xml 2010-01-11 07:46:32 UTC (rev 19686)
+++ workspace/examples/project-examples-3.1M4.xml 2010-01-11 07:48:17 UTC (rev 19687)
@@ -13,7 +13,7 @@
<project>
<category>BPEL</category>
- <name>Simple_Correlation</name>
+ <name>simple_correlation</name>
<shortDescription>A correlation BPEL example</shortDescription>
<description>This example is to show how to use the correlation in the BPEL2.0 example.</description>
<size>11000</size>
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19686 - workspace/examples.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-01-11 02:46:32 -0500 (Mon, 11 Jan 2010)
New Revision: 19686
Modified:
workspace/examples/project-examples-3.1M4.xml
Log:
Modified: workspace/examples/project-examples-3.1M4.xml
===================================================================
--- workspace/examples/project-examples-3.1M4.xml 2010-01-11 07:33:59 UTC (rev 19685)
+++ workspace/examples/project-examples-3.1M4.xml 2010-01-11 07:46:32 UTC (rev 19686)
@@ -2,7 +2,7 @@
<project>
<category>BPEL</category>
- <name>HelloWorld</name>
+ <name>hello_world</name>
<shortDescription>A simple BPEL example</shortDescription>
<description>This example is to show a simple BPEL2.0 example.</description>
<size>10000</size>
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19685 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: graphical/editors/editparts/freemarker and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-01-11 02:33:59 -0500 (Mon, 11 Jan 2010)
New Revision: 19685
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java
Removed:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java
Log:
JBIDE-5291
done
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java 2010-01-11 07:10:54 UTC (rev 19684)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/CreateConnectionCommand.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -10,7 +10,7 @@
import org.jboss.tools.smooks.gef.tree.model.TriggerConnection;
import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection;
import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel;
-import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerXMLNodeGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaBeanChildGraphModel;
import org.jboss.tools.smooks.graphical.editors.model.javamapping.JavaBeanGraphModel;
@@ -45,7 +45,7 @@
}
if(target instanceof FreemarkerXMLNodeGraphicalModel){
- connection = new CSVLinkConnection();
+ connection = new FreemarkerTemplateConnection();
connection.setSourceNode(source);
connection.setTargetNode(target);
}
Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java 2010-01-11 07:10:54 UTC (rev 19684)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * 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.editparts.freemarker;
-
-import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
-import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
-import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
-import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
-import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart;
-import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
-import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerModelAnalyzer;
-
-/**
- * @author Dart
- *
- */
-public class CSVLinkConnectionEditPart extends TreeNodeConnectionEditPart {
-
- public CSVLinkConnectionEditPart() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
- */
- @Override
- protected void refreshVisuals() {
- TreeNodeConnection connection = (TreeNodeConnection) this.getModel();
- AbstractSmooksGraphicalModel target = connection.getTargetNode();
- Object data = target.getData();
- if (data instanceof TagObject) {
- if (FreemarkerModelAnalyzer.isChoiceElement(((TagObject) data).getReferenceElement())) {
- this.setMarkerImage(SmooksConfigurationActivator.getDefault().getImageRegistry().get(
- GraphicsConstants.IMAGE_XSL_CHOICE));
- }
- }
- super.refreshVisuals();
- }
-}
Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java (from rev 19679, trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/CSVLinkConnectionEditPart.java)
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * 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.editparts.freemarker;
+
+import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
+import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
+import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
+import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
+import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerModelAnalyzer;
+
+/**
+ * @author Dart
+ *
+ */
+public class FreemarkerTemplateConnectionEditPart extends TreeNodeConnectionEditPart {
+
+ public FreemarkerTemplateConnectionEditPart() {
+ super();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
+ */
+ @Override
+ protected void refreshVisuals() {
+ TreeNodeConnection connection = (TreeNodeConnection) this.getModel();
+ AbstractSmooksGraphicalModel target = connection.getTargetNode();
+ Object data = target.getData();
+ if (data instanceof TagObject) {
+ if (FreemarkerModelAnalyzer.isChoiceElement(((TagObject) data).getReferenceElement())) {
+ this.setMarkerImage(SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_XSL_CHOICE));
+ }
+ }
+ super.refreshVisuals();
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerTemplateConnectionEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java 2010-01-11 07:10:54 UTC (rev 19684)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * 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.model.freemarker;
-
-import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
-
-/**
- * @author Dart
- *
- */
-public class CSVLinkConnection extends TreeNodeConnection {
-
-}
Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java (from rev 19679, trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/CSVLinkConnection.java)
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * 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.model.freemarker;
+
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
+
+/**
+ * @author Dart
+ *
+ */
+public class FreemarkerTemplateConnection extends TreeNodeConnection {
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateConnection.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-01-11 07:10:54 UTC (rev 19684)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -27,7 +27,7 @@
import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
import org.jboss.tools.smooks.graphical.editors.IGraphicalEditorPart;
import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigChildNodeGraphModel;
-import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateNodeGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateXMLModel;
@@ -70,7 +70,7 @@
}
}
if (data instanceof org.jboss.tools.smooks.model.javabean12.ValueType
- || connectionType == CSVLinkConnection.class) {
+ || connectionType == FreemarkerTemplateConnection.class) {
return true;
}
// if (connectionType == ValueBindingConnection.class) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java 2010-01-11 07:10:54 UTC (rev 19684)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateConnectionModelFactory.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -29,7 +29,7 @@
import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
import org.jboss.tools.smooks.graphical.editors.ConnectionModelFactoryImpl;
import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil;
-import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateNodeGraphicalModel;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
@@ -151,7 +151,7 @@
}
if (sourceNode != null && targetNode != null) {
- TreeNodeConnection connection = new CSVLinkConnection();
+ TreeNodeConnection connection = new FreemarkerTemplateConnection();
connection.setSourceNode(sourceNode);
connection.setTargetNode(targetNode);
connection.connectSource();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java 2010-01-11 07:10:54 UTC (rev 19684)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateEditFactory.java 2010-01-11 07:33:59 UTC (rev 19685)
@@ -12,10 +12,10 @@
import org.eclipse.gef.EditPart;
import org.jboss.tools.smooks.graphical.editors.SmooksEditFactory;
-import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.CSVLinkConnectionEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerTemplateConnectionEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerCSVNodeEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.freemarker.FreemarkerXMLNodeEditPart;
-import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateConnection;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerCSVNodeGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerXMLNodeGraphicalModel;
@@ -33,8 +33,8 @@
editPart = new FreemarkerXMLNodeEditPart();
}
- if (model instanceof CSVLinkConnection) {
- editPart = new CSVLinkConnectionEditPart();
+ if (model instanceof FreemarkerTemplateConnection) {
+ editPart = new FreemarkerTemplateConnectionEditPart();
}
if (editPart == null) {
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19684 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/configuration/editors and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-01-11 02:10:54 -0500 (Mon, 11 Jan 2010)
New Revision: 19684
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizardPage.java
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/edi/EDIDataWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDListLabelProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java
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/editparts/freemarker/FreemarkerXMLNodeEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/IFreemarkerTemplateModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java
Log:
JBIDE-5617
Fixed
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-01-11 07:10:54 UTC (rev 19684)
@@ -54,6 +54,12 @@
org.jboss.tools.smooks.configuration.editors.xml,
org.jboss.tools.smooks.edimap.editor,
org.jboss.tools.smooks.editor,
+ org.jboss.tools.smooks.gef.common,
+ org.jboss.tools.smooks.gef.model,
+ org.jboss.tools.smooks.gef.tree.editparts,
+ org.jboss.tools.smooks.gef.tree.figures,
+ org.jboss.tools.smooks.gef.tree.model,
org.jboss.tools.smooks.graphical.editors,
+ org.jboss.tools.smooks.graphical.editors.process,
org.jboss.tools.smooks.launch,
org.jboss.tools.smooks.launch.serialize
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizard.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -39,8 +39,16 @@
private String[] extensionNames = null;
private boolean processFilePath = true;
+
+ public FileSelectionWizard() {
+ super();
+ this.setWindowTitle("File Selection");
+ }
+
+
+
@Override
public void addPages() {
fileSelectionWizardPage = new FileSelectionWizardPage(Messages.FileSelectionWizard_WizardPageName ,null,isProcessFilePath());
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizardPage.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/FileSelectionWizardPage.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -29,6 +29,7 @@
setTitle(Messages.FileSelectionWizardPage_PageTitle);
setDescription(Messages.FileSelectionWizardPage_PageDescription);
this.processFilePath = processFilePath;
+// this.getShell().setText("Select Files");
}
/*
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-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -16,10 +16,13 @@
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.ui.parts.GraphicalEditor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
@@ -127,6 +130,17 @@
tabbedPropertySheetPage = new TabbedPropertySheetPage(this);
return tabbedPropertySheetPage;
}
+
+ if(adapter == GraphicalViewer.class){
+ if(this.processPage != null){
+ Object activeEditorPart = processPage.getActiveEditorPage();
+ if(activeEditorPart != null && activeEditorPart instanceof IEditorPart){
+ if(activeEditorPart instanceof GraphicalEditor){
+ return ((IEditorPart)activeEditorPart).getAdapter(adapter);
+ }
+ }
+ }
+ }
return super.getAdapter(adapter);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -43,7 +43,14 @@
private EditingDomain editingDomain;
private IContainer folder = null;
+
+
+ public EDIDataWizard() {
+ super();
+ this.setWindowTitle("EDI File Selection");
+ }
+
@Override
public void addPages() {
ediFilePage = new EDIDataPathWizardPage(Messages.EDIDataWizard_0, new String[] { "edi" }); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -156,7 +156,6 @@
* .Composite)
*/
public void createControl(Composite parent) {
-
Composite mainComposite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 1;
@@ -195,6 +194,7 @@
changeWizardPageStatus();
// don't show the error message when first open the dialog
this.setErrorMessage(null);
+ parent.getShell().setText("Select File");
}
protected void hookFileTextModifyListener() {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDListLabelProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDListLabelProvider.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDListLabelProvider.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -29,6 +29,7 @@
if (element instanceof XSDElementDeclaration) {
return ((XSDElementDeclaration) element).getAliasName();
}
+ if(element instanceof String) return (String)element;
return super.getText(element);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizardPage.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XSDStructuredDataWizardPage.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -12,11 +12,15 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
@@ -33,6 +37,9 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.xsd.XSDElementDeclaration;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.templating.model.ModelBuilderException;
+import org.jboss.tools.smooks.templating.model.xml.XSDModelBuilder;
import org.xml.sax.SAXException;
/**
@@ -41,6 +48,8 @@
*/
public class XSDStructuredDataWizardPage extends AbstractFileSelectionWizardPage {
+ private Throwable parsingError = null;
+
protected CheckboxTableViewer tableViewer = null;
private boolean fireEvent = true;
@@ -85,13 +94,17 @@
super.changeWizardPageStatus();
String errorMessage = this.getErrorMessage();
if (errorMessage == null) {
+
if (reasourceLoaded) {
- if(tableViewer.getCheckedElements() == null || tableViewer.getCheckedElements().length == 0){
+ if (tableViewer.getCheckedElements() == null || tableViewer.getCheckedElements().length == 0) {
errorMessage = Messages.XSDStructuredDataWizardPage_Error_Must_Select_Root;
}
} else {
errorMessage = Messages.XSDStructuredDataWizardPage_Error_Must_Click_Load;
}
+ if(parsingError != null){
+ errorMessage = parsingError.getLocalizedMessage();
+ }
setErrorMessage(errorMessage);
setPageComplete(errorMessage == null);
}
@@ -134,18 +147,22 @@
final Text fileText = new Text(fileTextComposite, SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
fileText.setLayoutData(gd);
- fileText.addModifyListener(new ModifyListener(){
+ fileText.addModifyListener(new ModifyListener() {
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.
+ * swt.events.ModifyEvent)
*/
public void modifyText(ModifyEvent e) {
reasourceLoaded = false;
- if(tableViewer != null){
+ if (tableViewer != null) {
tableViewer.setInput(Collections.emptyList());
}
}
-
+
});
gd.grabExcessHorizontalSpace = true;
@@ -156,17 +173,31 @@
@Override
public void widgetSelected(SelectionEvent e) {
super.widgetSelected(e);
- if(fileText.getText() == null || fileText.getText().length() == 0){
+ parsingError = null;
+ reasourceLoaded = false;
+ if (fileText.getText() == null || fileText.getText().length() == 0) {
changeWizardPageStatus();
return;
}
- reasourceLoaded = false;
+
+ List<String> list;
try {
- List<?> list = loadElement(fileText.getText());
- tableViewer.setInput(list);
- reasourceLoaded = true;
- } catch (Throwable e2) {
- e2.printStackTrace();
+ list = loadElement(fileText.getText());
+ if (list == null || list.isEmpty()) {
+ setErrorMessage("Can't get the elements in the XSD file.");
+ } else {
+ tableViewer.setInput(list);
+ reasourceLoaded = true;
+ }
+ } catch (InvocationTargetException e1) {
+ parsingError = e1.getTargetException();
+ while(parsingError instanceof InvocationTargetException){
+ parsingError = ((InvocationTargetException)parsingError).getTargetException();
+ }
+ } catch (IOException e1) {
+ parsingError = e1;
+ } catch (ModelBuilderException e1) {
+ parsingError = e1;
}
changeWizardPageStatus();
}
@@ -175,20 +206,34 @@
return fileText;
}
- private List<XSDElementDeclaration> loadElement(String path) throws InvocationTargetException, IOException {
+ private List<String> loadElement(String path) throws InvocationTargetException, IOException, ModelBuilderException {
+ List<String> elements = new ArrayList<String>();
if (path == null)
return null;
String pp = path.toLowerCase();
if (pp.endsWith(".wsdl")) { //$NON-NLS-1$
try {
- return WSDLObjectAnalyzer.loadAllElement(path);
+ List<XSDElementDeclaration> xsdDec = WSDLObjectAnalyzer.loadAllElement(path);
+ for (Iterator<?> iterator = xsdDec.iterator(); iterator.hasNext();) {
+ XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) iterator.next();
+ elements.add(xsdElementDeclaration.getAliasName());
+ }
} catch (ParserConfigurationException e) {
throw new InvocationTargetException(e);
} catch (SAXException e) {
throw new InvocationTargetException(e);
}
}
- return XSDObjectAnalyzer.loadAllElement(path);
+ String file = null;
+ file = SmooksUIUtils.parseFilePath(path);
+ XSDModelBuilder xsdModelBuilder = new XSDModelBuilder(URI.createFileURI(file));
+ Set<String> elementNames = xsdModelBuilder.getRootElementNames();
+ Iterator<String> it = elementNames.iterator();
+ while (it.hasNext()) {
+ String name = it.next();
+ elements.add(name);
+ }
+ return elements;
}
public void createControl(Composite parent) {
@@ -222,7 +267,10 @@
tableViewer.setAllChecked(false);
if (event.getChecked()) {
tableViewer.setChecked(event.getElement(), true);
- rootElementName = ((XSDElementDeclaration) event.getElement()).getAliasName();
+ Object checkElement = event.getElement();
+ if (checkElement instanceof String) {
+ rootElementName = (String) checkElement;
+ }
}
fireEvent = true;
changeWizardPageStatus();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -204,7 +204,16 @@
// return super.getPreferredSize(hint, hint2);
}
}
+
+
+ /**
+ * @return the clickNode
+ */
+ public Figure getClickNode() {
+ return clickNode;
+ }
+
protected void createLabelContainer() {
labelContainer = new Figure() {
/*
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-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -849,6 +849,14 @@
}
return null;
}
+
+ public Object getActiveEditorPage(){
+ if(pageBook != null){
+ Control control = pageBook.getCurrentPage();
+ return control.getData();
+ }
+ return null;
+ }
protected void showTaskControl(Object model) {
if (pageBook == null)
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerXMLNodeEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerXMLNodeEditPart.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/freemarker/FreemarkerXMLNodeEditPart.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -10,17 +10,23 @@
******************************************************************************/
package org.jboss.tools.smooks.graphical.editors.editparts.freemarker;
+import java.beans.PropertyChangeEvent;
+import java.util.Iterator;
+import java.util.List;
+
import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.IFigure;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
-import org.jboss.tools.smooks.gef.common.RootModel;
import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart;
import org.jboss.tools.smooks.gef.tree.figures.TreeNodeFigure;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
/**
* @author Dart
@@ -100,29 +106,63 @@
AbstractSmooksGraphicalModel model = (AbstractSmooksGraphicalModel) getModel();
TreeNodeFigure figure = (TreeNodeFigure) getFigure();
Object data = model.getData();
- AbstractSmooksGraphicalModel parent = model;
- while (parent != null && !(parent instanceof RootModel)) {
- parent = parent.getParent();
- }
if (oldFont != null && oldColor != null) {
figure.getLabel().setFont(oldFont);
figure.setNodeLabelForegroundColor(oldColor);
}
- Object rmodel = parent;
super.refreshVisuals();
- if (data instanceof IFreemarkerTemplateModel && rmodel instanceof RootModel) {
- if (((IFreemarkerTemplateModel) data).isHidden((RootModel) rmodel)) {
+ if (data instanceof IFreemarkerTemplateModel ) {
+ AbstractSmooksGraphicalModel pm = (AbstractSmooksGraphicalModel) model;
+ while (pm != null && !(pm instanceof FreemarkerTemplateGraphicalModel)) {
+ pm = pm.getParent();
+ }
+ TemplateBuilder builder = ((FreemarkerTemplateGraphicalModel) pm).getTemplateBuilder();
+ if (((IFreemarkerTemplateModel) data).isHidden(builder)) {
if (oldFont == null) {
oldFont = figure.getLabel().getFont();
}
if (oldColor == null) {
oldColor = figure.getLabel().getForegroundColor();
}
- figure.getLabel().setFont(getHiddenLabelFont());
+// figure.getLabel().setFont(getHiddenLabelFont());
figure.setNodeLabelForegroundColor(ColorConstants.lightGray);
figure.getLabel().repaint();
}
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#propertyChange
+ * (java.beans.PropertyChangeEvent)
+ */
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ super.propertyChange(evt);
+ String proName = evt.getPropertyName();
+ if (TreeNodeModel.PRO_ADD_SOURCE_CONNECTION.equals(proName)
+ || TreeNodeModel.PRO_ADD_TARGET_CONNECTION.equals(proName)
+ || TreeNodeModel.PRO_REMOVE_SOURCE_CONNECTION.equals(proName)
+ || TreeNodeModel.PRO_REMOVE_TARGET_CONNECTION.equals(proName)) {
+ AbstractSmooksGraphicalModel pm = (AbstractSmooksGraphicalModel) this.getModel();
+ while (pm != null && !(pm instanceof FreemarkerTemplateGraphicalModel)) {
+ pm = pm.getParent();
+ }
+ if (pm != null && pm instanceof FreemarkerTemplateGraphicalModel) {
+ List<AbstractSmooksGraphicalModel> children = pm.getChildrenWithoutDynamic();
+ refreshAllChildren(children);
+ }
+ }
+ }
+
+ private void refreshAllChildren(List<AbstractSmooksGraphicalModel> children){
+ for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator
+ .next();
+ abstractSmooksGraphicalModel.fireVisualChanged();
+ refreshAllChildren(abstractSmooksGraphicalModel.getChildrenWithoutDynamic());
+ }
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -10,41 +10,72 @@
******************************************************************************/
package org.jboss.tools.smooks.graphical.editors.model.freemarker;
+import java.util.Iterator;
+import java.util.List;
+
+import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject;
-import org.jboss.tools.smooks.gef.common.RootModel;
+import org.jboss.tools.smooks.templating.template.Mapping;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
import org.w3c.dom.Attr;
+import org.w3c.dom.Node;
/**
* @author Dart
- *
+ *
*/
public class FreemarkerAttrModel extends TagPropertyObject implements IFreemarkerTemplateModel {
- /* (non-Javadoc)
- * @see org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel#isManyOccurs()
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.graphical.editors.model.freemarker.
+ * IFreemarkerTemplateModel#isManyOccurs()
*/
public boolean isManyOccurs() {
return false;
}
- /* (non-Javadoc)
- * @see org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel#isRequired()
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.graphical.editors.model.freemarker.
+ * IFreemarkerTemplateModel#isRequired()
*/
public boolean isRequired() {
Attr element = this.getReferenceAttibute();
if (element != null) {
String value = element.getValue();
- if(value != null){
+ if (value != null) {
value = value.trim();
}
- if(FreemarkerModelAnalyzer.REQUIRED.equals(value)){
+ if (FreemarkerModelAnalyzer.REQUIRED.equals(value)) {
return true;
}
}
return false;
}
- public boolean isHidden(RootModel graphRoot) {
+ public boolean isHidden(TemplateBuilder builder) {
+ AbstractXMLObject parent = this.getParent();
+ if (parent instanceof FreemarkerTemplateXMLModel) {
+ if (((FreemarkerTemplateXMLModel) parent).isHidden(builder)) {
+ return true;
+ }
+ }
+ List<Mapping> mappings = builder.getMappings();
+ for (Iterator<?> iterator = mappings.iterator(); iterator.hasNext();) {
+ Mapping mapping = (Mapping) iterator.next();
+ List<Node> hiddenNodes = mapping.getHideNodes();
+ if (hiddenNodes != null) {
+ for (Iterator<?> iterator2 = hiddenNodes.iterator(); iterator2.hasNext();) {
+ Node node = (Node) iterator2.next();
+ if (node == this.getReferenceElement()) {
+ return true;
+ }
+ }
+ }
+ }
return false;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateNodeGraphicalModel.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -110,7 +110,6 @@
*/
@Override
public void addTargetConnection(TreeNodeConnection connection) {
- super.addTargetConnection(connection);
TemplateBuilder builder = getTemplateBuilder();
Object obj = this.getData();
Node node = null;
@@ -123,7 +122,7 @@
if (builder == null || node == null)
return;
if (connection.getData() != null) {
-
+ // ignore
}
try {
if (isCollectionConnection(connection)) {
@@ -156,6 +155,7 @@
connection.setData(mapping);
}
changeFreemarkerContents();
+ super.addTargetConnection(connection);
} catch (InvalidMappingException e) {
e.printStackTrace();
}
@@ -239,7 +239,6 @@
*/
@Override
public void removeTargetConnection(TreeNodeConnection connection) {
- super.removeTargetConnection(connection);
try {
TemplateBuilder builder = getTemplateBuilder();
Object mapping = connection.getData();
@@ -249,6 +248,7 @@
builder.removeMapping((Mapping) mapping);
changeFreemarkerContents();
}
+ super.removeTargetConnection(connection);
} catch (Exception e) {
e.printStackTrace();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -17,14 +17,12 @@
import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject;
-import org.jboss.tools.smooks.gef.common.RootModel;
-import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
-import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil;
+import org.jboss.tools.smooks.templating.template.Mapping;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* @author Dart
@@ -126,49 +124,73 @@
return false;
}
- public boolean isHidden(RootModel graphRoot) {
- Element refElement = this.getReferenceElement();
- if (refElement != null) {
- NamedNodeMap nodeMap = refElement.getAttributes();
- for (int i = 0; i < nodeMap.getLength(); i++) {
- Attr attr = (Attr) nodeMap.item(i);
- if (attr != null) {
- if (FreemarkerModelAnalyzer.SPECIAL_ELEMENT_UIR.equals(attr.getNamespaceURI())) {
- String name = attr.getLocalName();
- if (name == null) {
- name = attr.getNodeName();
- }
- if (FreemarkerModelAnalyzer.HIDDEN.equals(name)) {
- String value = attr.getValue();
- try {
- boolean booleanValue = Boolean.parseBoolean(value);
- return booleanValue;
- } catch (Exception e) {
- return false;
- }
- }
- }
- }
+ public boolean isHidden(TemplateBuilder builder) {
+ AbstractXMLObject parent = this.getParent();
+ if (parent instanceof FreemarkerTemplateXMLModel) {
+ if (((FreemarkerTemplateXMLModel) parent).isHidden(builder)) {
+ return true;
}
-
- if (graphRoot != null && FreemarkerModelAnalyzer.isChoiceElement(refElement)) {
- Node parent = refElement.getParentNode();
- NodeList nodeList = parent.getChildNodes();
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node child = nodeList.item(i);
- if (child == refElement)
- continue;
- FreemarkerTemplateXMLModel model = localBrotherModel(child);
- if (model != null) {
- AbstractSmooksGraphicalModel cgm = SmooksGraphUtil.findSmooksGraphModel(graphRoot, model);
- if (!cgm.getTargetConnections().isEmpty()) {
- return true;
- }
+ }
+ List<Mapping> mappings = builder.getMappings();
+ for (Iterator<?> iterator = mappings.iterator(); iterator.hasNext();) {
+ Mapping mapping = (Mapping) iterator.next();
+ List<Node> hiddenNodes = mapping.getHideNodes();
+ if (hiddenNodes != null) {
+ for (Iterator<?> iterator2 = hiddenNodes.iterator(); iterator2.hasNext();) {
+ Node node = (Node) iterator2.next();
+ if (node == this.getReferenceElement()) {
+ return true;
}
}
}
}
return false;
+ // Element refElement = this.getReferenceElement();
+ // if (refElement != null) {
+ // NamedNodeMap nodeMap = refElement.getAttributes();
+ // for (int i = 0; i < nodeMap.getLength(); i++) {
+ // Attr attr = (Attr) nodeMap.item(i);
+ // if (attr != null) {
+ // if
+ // (FreemarkerModelAnalyzer.SPECIAL_ELEMENT_UIR.equals(attr.getNamespaceURI()))
+ // {
+ // String name = attr.getLocalName();
+ // if (name == null) {
+ // name = attr.getNodeName();
+ // }
+ // if (FreemarkerModelAnalyzer.HIDDEN.equals(name)) {
+ // String value = attr.getValue();
+ // try {
+ // boolean booleanValue = Boolean.parseBoolean(value);
+ // return booleanValue;
+ // } catch (Exception e) {
+ // return false;
+ // }
+ // }
+ // }
+ // }
+ // }
+ //
+ // if (graphRoot != null &&
+ // FreemarkerModelAnalyzer.isChoiceElement(refElement)) {
+ // Node parent = refElement.getParentNode();
+ // NodeList nodeList = parent.getChildNodes();
+ // for (int i = 0; i < nodeList.getLength(); i++) {
+ // Node child = nodeList.item(i);
+ // if (child == refElement)
+ // continue;
+ // FreemarkerTemplateXMLModel model = localBrotherModel(child);
+ // if (model != null) {
+ // AbstractSmooksGraphicalModel cgm =
+ // SmooksGraphUtil.findSmooksGraphModel(graphRoot, model);
+ // if (!cgm.getTargetConnections().isEmpty()) {
+ // return true;
+ // }
+ // }
+ // }
+ // }
+ // }
+ // return false;
}
private FreemarkerTemplateXMLModel localBrotherModel(Node refNode) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/IFreemarkerTemplateModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/IFreemarkerTemplateModel.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/IFreemarkerTemplateModel.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.smooks.graphical.editors.model.freemarker;
-import org.jboss.tools.smooks.gef.common.RootModel;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
/**
* @author Dart
@@ -19,5 +19,5 @@
public interface IFreemarkerTemplateModel {
public boolean isRequired();
public boolean isManyOccurs();
- public boolean isHidden(RootModel graphRoot);
+ public boolean isHidden(TemplateBuilder builder);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -23,17 +23,18 @@
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
-import org.jboss.tools.smooks.gef.common.RootModel;
import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
import org.jboss.tools.smooks.graphical.editors.IGraphicalEditorPart;
import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigChildNodeGraphModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.CSVLinkConnection;
+import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateNodeGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateXMLModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel;
import org.jboss.tools.smooks.graphical.editors.template.SmooksFreemarkerTemplateGraphicalEditor;
import org.jboss.tools.smooks.model.javabean12.ValueType;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
/**
* @author Dart
@@ -117,17 +118,15 @@
Object m = gm.getData();
Object obj = getData();
AbstractSmooksGraphicalModel pm = gm;
- while (pm != null && !(pm instanceof RootModel)) {
+ while (pm != null && !(pm instanceof FreemarkerTemplateGraphicalModel)) {
pm = pm.getParent();
}
obj = AdapterFactoryEditingDomain.unwrap(obj);
if (obj instanceof ValueType) {
- if (m instanceof IFreemarkerTemplateModel) {
-
- if (pm instanceof RootModel) {
- if (((IFreemarkerTemplateModel) m).isHidden((RootModel) pm)) {
- return false;
- }
+ if (m instanceof IFreemarkerTemplateModel && pm instanceof FreemarkerTemplateGraphicalModel) {
+ TemplateBuilder builder = ((FreemarkerTemplateGraphicalModel) pm).getTemplateBuilder();
+ if (((IFreemarkerTemplateModel) m).isHidden(builder)) {
+ return false;
}
if (m instanceof FreemarkerTemplateXMLModel) {
@@ -156,21 +155,6 @@
}
pgm = pgm.getParent();
}
-
- // if (m instanceof CSVNodeModel) {
- // if (!((CSVNodeModel) m).isRecord()) {
- // AbstractSmooksGraphicalModel parent = gm.getParent();
- // if (parent instanceof FreemarkerCSVNodeGraphicalModel) {
- // List<TreeNodeConnection> connections =
- // parent.getTargetConnections();
- // if (connections.isEmpty()) {
- // return false;
- // }
- // }
- // }else{
- // return false;
- // }
- // }
return true;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-01-11 07:01:54 UTC (rev 19683)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-01-11 07:10:54 UTC (rev 19684)
@@ -29,6 +29,7 @@
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
+import org.jboss.tools.smooks.templating.template.TemplateBuilder;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
@@ -92,9 +93,10 @@
Object data = abstractSmooksGraphicalModel.getData();
if (data instanceof IFreemarkerTemplateModel) {
AbstractSmooksGraphicalModel requiredCollectionLinkParent = parentIsRequriedCollectionNode(abstractSmooksGraphicalModel);
- if(requiredCollectionLinkParent != null){
- AbstractXMLObject parentNode = (AbstractXMLObject)requiredCollectionLinkParent.getData();
- abstractSmooksGraphicalModel.addMessage("Its parent node '" + parentNode.getName() + "' should be connected first.");
+ if (requiredCollectionLinkParent != null) {
+ AbstractXMLObject parentNode = (AbstractXMLObject) requiredCollectionLinkParent.getData();
+ abstractSmooksGraphicalModel.addMessage("Its parent node '" + parentNode.getName()
+ + "' should be connected first.");
abstractSmooksGraphicalModel.setSeverity(IValidatableModel.ERROR);
}
if (isRequiredNode(abstractSmooksGraphicalModel)) {
@@ -109,9 +111,9 @@
validateTemplateContentsModel(type, abstractSmooksGraphicalModel.getChildren());
}
}
-
- public static AbstractSmooksGraphicalModel parentIsRequriedCollectionNode(AbstractSmooksGraphicalModel abstractSmooksGraphicalModel) {
+ public static AbstractSmooksGraphicalModel parentIsRequriedCollectionNode(
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel) {
AbstractSmooksGraphicalModel parent = abstractSmooksGraphicalModel.getParent();
Object data = abstractSmooksGraphicalModel.getData();
if (data instanceof IFreemarkerTemplateModel) {
@@ -125,8 +127,14 @@
private boolean isRequiredNode(AbstractSmooksGraphicalModel abstractSmooksGraphicalModel) {
Object data = abstractSmooksGraphicalModel.getData();
- if (data instanceof IFreemarkerTemplateModel) {
- if (((IFreemarkerTemplateModel) data).isRequired() && !((IFreemarkerTemplateModel) data).isHidden(root)) {
+ AbstractSmooksGraphicalModel pm = abstractSmooksGraphicalModel;
+ while (pm != null && !(pm instanceof FreemarkerTemplateGraphicalModel)) {
+ pm = pm.getParent();
+ }
+
+ if (data instanceof IFreemarkerTemplateModel && pm instanceof FreemarkerTemplateGraphicalModel) {
+ TemplateBuilder builder = ((FreemarkerTemplateGraphicalModel) pm).getTemplateBuilder();
+ if (((IFreemarkerTemplateModel) data).isRequired() && !((IFreemarkerTemplateModel) data).isHidden(builder)) {
if (abstractSmooksGraphicalModel.getTargetConnections().isEmpty()) {
return true;
}
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19683 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-01-11 02:01:54 -0500 (Mon, 11 Jan 2010)
New Revision: 19683
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
Log:
The postfix of bpel archive name is inconsistent with system time because of month number
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-01-11 03:17:20 UTC (rev 19682)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2010-01-11 07:01:54 UTC (rev 19683)
@@ -155,7 +155,7 @@
IModule last = moduleTree[moduleTree.length-1];
Calendar cal = Calendar.getInstance();
StringBuffer lastSeg = new StringBuffer(formatString(cal.get(Calendar.YEAR)));
- lastSeg.append(formatString(cal.get(Calendar.MONTH)));
+ lastSeg.append(formatString(cal.get(Calendar.MONTH) + 1));
lastSeg.append(formatString(cal.get(Calendar.DAY_OF_MONTH)));
lastSeg.append(formatString(cal.get(Calendar.HOUR_OF_DAY)));
lastSeg.append(formatString(cal.get(Calendar.MINUTE)));
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19682 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-01-10 22:17:20 -0500 (Sun, 10 Jan 2010)
New Revision: 19682
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java
Log:
JBIDE-5621: Clean up blank prefs page for BPEL
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java 2010-01-09 14:03:34 UTC (rev 19681)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/BPELHomePreferencePage.java 2010-01-11 03:17:20 UTC (rev 19682)
@@ -26,7 +26,7 @@
public BPELHomePreferencePage() {
super(GRID);
setPreferenceStore(BPELUIPlugin.INSTANCE.getPreferenceStore());
- //setDescription("A demonstration of a preference page implementation");
+ setDescription("Expand the tree to edit preferences for the BPEL feature.");
}
/**
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java 2010-01-09 14:03:34 UTC (rev 19681)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/preferences/ExpressionEditorsPreferencePage.java 2010-01-11 03:17:20 UTC (rev 19682)
@@ -26,7 +26,7 @@
public ExpressionEditorsPreferencePage() {
super(GRID);
setPreferenceStore(BPELUIPlugin.INSTANCE.getPreferenceStore());
- //setDescription("A demonstration of a preference page implementation");
+ setDescription("Expand the tree to edit preferences for the Expression Editor.");
}
/**
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19681 - in trunk/jsf: tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-01-09 09:03:34 -0500 (Sat, 09 Jan 2010)
New Revision: 19681
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/pattern/PostfixUrlPattern.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5635, openOn for link to the seam page was corrected, junit was updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/pattern/PostfixUrlPattern.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/pattern/PostfixUrlPattern.java 2010-01-08 13:01:51 UTC (rev 19680)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/pattern/PostfixUrlPattern.java 2010-01-09 14:03:34 UTC (rev 19681)
@@ -18,10 +18,11 @@
protected String fileSuffix = ".jsp";
/*
* Fixes https://jira.jboss.org/jira/browse/JBIDE-5577
- * JSF files could be mapped to xhtml files also.
+ * Fixes https://jira.jboss.org/jira/browse/JBIDE-5635
+ * JSF files could be mapped to xhtml or jspx files also.
* All of this extensions should be checked.
*/
- protected String[] fileExtensions = {".jsp", ".xhtml"};
+ protected String[] fileExtensions = {".jsp", ".xhtml", ".jspx"};
public void setPostfix(String postfix) {
this.postfix = postfix;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2010-01-08 13:01:51 UTC (rev 19680)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/model/pv/test/JSFPromptingProviderTest.java 2010-01-09 14:03:34 UTC (rev 19681)
@@ -131,11 +131,13 @@
* After fixing https://jira.jboss.org/jira/browse/JBIDE-5577
* there are two files in the list: .jsp and .xhtml.
*/
- assertEquals(2, list.size());
+ assertEquals(3, list.size());
String s = (String)list.get(0);
assertEquals("/a.jsp", s);
s = (String)list.get(1);
assertEquals("/a.xhtml", s);
+ s = (String)list.get(2);
+ assertEquals("/a.jspx", s);
}
public void testGetTaglibs() {
14 years, 3 months
- 1
- 0
JBoss Tools SVN: r19680 - trunk/smooks/plugins/org.jboss.tools.smooks.ui.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-01-08 08:01:51 -0500 (Fri, 08 Jan 2010)
New Revision: 19680
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-5612
Remove the "Smooks" menu being added to the editor menu
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2010-01-07 22:46:57 UTC (rev 19679)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2010-01-08 13:01:51 UTC (rev 19680)
@@ -6,7 +6,6 @@
point="org.eclipse.ui.editors">
<editor
class="org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor"
- contributorClass="org.jboss.tools.smooks.configuration.editors.SmooksActionBarContributor"
icon="icons/smooks-sm.gif"
id="org.jboss.tools.smooks.configuration.editors.MultiPageEditor"
name="Smooks Configuration Editor">
14 years, 4 months
- 1
- 0
JBoss Tools SVN: r19679 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-07 17:46:57 -0500 (Thu, 07 Jan 2010)
New Revision: 19679
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-5582 - add support for jb 6
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-07 21:42:32 UTC (rev 19678)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-07 22:46:57 UTC (rev 19679)
@@ -211,14 +211,16 @@
}
public static boolean isValidJREVersion(String jreVersion, IRuntimeType rtType) {
+ // all servers require at least 1.3
String id = rtType.getId();
- String version = rtType.getVersion();
- if( id.equals(IConstants.EAP_50) && version.equals(IConstants.V5_0)) {
- return !jreVersion.startsWith(JavaCore.VERSION_1_1) &&
- !jreVersion.startsWith(JavaCore.VERSION_1_2) &&
- !jreVersion.startsWith(JavaCore.VERSION_1_3) &&
- !jreVersion.startsWith(JavaCore.VERSION_1_4) &&
- !jreVersion.startsWith(JavaCore.VERSION_1_5);
+ if( jreVersion.startsWith(JavaCore.VERSION_1_1)) return false;
+ if( jreVersion.startsWith(JavaCore.VERSION_1_2)) return false;
+
+ // requires java6
+ if( id.equals(IConstants.EAP_50) || id.equals(IConstants.AS_60)) {
+ if( jreVersion.startsWith(JavaCore.VERSION_1_3)) return false;
+ if( jreVersion.startsWith(JavaCore.VERSION_1_4)) return false;
+ if( jreVersion.startsWith(JavaCore.VERSION_1_5)) return false;
}
return true;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-01-07 21:42:32 UTC (rev 19678)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-01-07 22:46:57 UTC (rev 19679)
@@ -20,6 +20,7 @@
public static final String AS_42 = "org.jboss.ide.eclipse.as.runtime.42"; //$NON-NLS-1$
public static final String AS_50 = "org.jboss.ide.eclipse.as.runtime.50"; //$NON-NLS-1$
public static final String AS_51 = "org.jboss.ide.eclipse.as.runtime.51"; //$NON-NLS-1$
+ public static final String AS_60 = "org.jboss.ide.eclipse.as.runtime.60"; //$NON-NLS-1$
public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43"; //$NON-NLS-1$
public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50"; //$NON-NLS-1$
@@ -28,6 +29,7 @@
public static final String SERVER_AS_42 = "org.jboss.ide.eclipse.as.42"; //$NON-NLS-1$
public static final String SERVER_AS_50 = "org.jboss.ide.eclipse.as.50"; //$NON-NLS-1$
public static final String SERVER_AS_51 = "org.jboss.ide.eclipse.as.51"; //$NON-NLS-1$
+ public static final String SERVER_AS_60 = "org.jboss.ide.eclipse.as.60"; //$NON-NLS-1$
public static final String SERVER_EAP_43 = "org.jboss.ide.eclipse.as.eap.43"; //$NON-NLS-1$
public static final String SERVER_EAP_50 = "org.jboss.ide.eclipse.as.eap.50"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-07 21:42:32 UTC (rev 19678)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-01-07 22:46:57 UTC (rev 19679)
@@ -93,6 +93,23 @@
startTimeout="450000"
stopTimeout="450000"
supportsRemoteHosts="false"/>
+
+ <serverType
+ behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior"
+ class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
+ description="%jboss.version.60.description"
+ hasConfiguration="false"
+ id="org.jboss.ide.eclipse.as.60"
+ initialState="stopped"
+ launchConfigId="org.jboss.ide.eclipse.as.core.server.startupConfiguration"
+ launchModes="run,debug,profile"
+ name="%jboss.version.60.name"
+ runtime="true"
+ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.60"
+ startBeforePublish="false"
+ startTimeout="450000"
+ stopTimeout="450000"
+ supportsRemoteHosts="false"/>
<serverType
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior"
@@ -307,6 +324,43 @@
versions="1.1, 2.0">
</moduleType>
</runtimeType>
+ <runtimeType
+ vendor="%providerName"
+ class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime"
+ description="%jboss.version.60.description"
+ name="%jboss.version.60.runtime.name"
+ id="org.jboss.ide.eclipse.as.runtime.60"
+ version="6.0">
+ <moduleType
+ types="jst.web"
+ versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType
+ types="jst.ejb"
+ versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType
+ types="jst.ear"
+ versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType
+ types="jst.connector"
+ versions="1.0, 1.5"/>
+ <moduleType
+ types="jst.utility"
+ versions="1.0"/>
+ <moduleType
+ types="jboss.package"
+ versions="1.0"/>
+ <moduleType
+ types="jboss.singlefile"
+ versions="1.0"/>
+ <moduleType
+ types="jst.jboss.esb"
+ versions="4.2,4.3,4.4,4.5,4.6,4.7">
+ </moduleType>
+ <moduleType
+ types="jbt.bpel.module"
+ versions="1.1, 2.0">
+ </moduleType>
+ </runtimeType>
<runtimeType
@@ -545,6 +599,10 @@
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.51"
runtime-component="org.jboss.ide.eclipse.as.runtime.component"
version="5.1"/>
+ <runtimeFacetMapping
+ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.60"
+ runtime-component="org.jboss.ide.eclipse.as.runtime.component"
+ version="6.0"/>
<runtimeFacetMapping
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.stripped"
runtime-component="org.jboss.ide.eclipse.as.runtime.stripped.component"
@@ -636,6 +694,9 @@
<runtime-component-version
type="org.jboss.ide.eclipse.as.runtime.component"
version="5.1"/>
+ <runtime-component-version
+ type="org.jboss.ide.eclipse.as.runtime.component"
+ version="6.0"/>
<supported>
@@ -703,6 +764,19 @@
<facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
</supported>
+ <supported>
+ <runtime-component
+ id="org.jboss.ide.eclipse.as.runtime.component"
+ version="6.0"/>
+ <facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.utility" version="1.0"/>
+ <facet id="jst.connector" version="1.0,1.5"/>
+ <facet id="jst.ejb" version="2.0,2.1,3.0"/>
+ <facet id="jst.ear" version="1.2,1.3,1.4,5.0"/>
+ <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
+ </supported>
+
</extension>
@@ -749,6 +823,16 @@
</default-facets>
<default-facets>
<runtime-component
+ id="org.jboss.ide.eclipse.as.runtime.component"
+ version="6.0">
+ </runtime-component>
+ <facet
+ id="jst.java"
+ version="5.0">
+ </facet>
+ </default-facets>
+ <default-facets>
+ <runtime-component
id="org.jboss.ide.eclipse.eap.runtime.component"
version="4.3">
</runtime-component>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-07 21:42:32 UTC (rev 19678)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-07 22:46:57 UTC (rev 19679)
@@ -9,11 +9,11 @@
point="org.eclipse.wst.server.ui.serverImages">
<image
icon="$nl$/icons/jboss.gif"
- typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"
+ typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<image
icon="$nl$/icons/jboss.gif"
- typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50"
+ typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<image
@@ -35,12 +35,12 @@
<!-- Fragment for runtimes that require java 6 -->
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeJava6WizardFragment"
- typeIds="org.jboss.ide.eclipse.as.runtime.eap.50"
+ typeIds="org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.60"
id="org.jboss.ide.eclipse.as.ui.JBossRuntimeJava6WizardFragment"/>
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment"
- typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>
+ typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment"
14 years, 4 months
- 1
- 0
JBoss Tools SVN: r19678 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-07 16:42:32 -0500 (Thu, 07 Jan 2010)
New Revision: 19678
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
Log:
new constant
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-01-07 21:41:42 UTC (rev 19677)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-01-07 21:42:32 UTC (rev 19678)
@@ -67,6 +67,7 @@
/*
* Property keys stored in the server object
*/
+ public static final String DEPLOYMENT_METHOD = "org.jboss.ide.eclipse.as.core.server.attributes.deploymentMethod"; //$NON-NLS-1$
public static final String STARTUP_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.startupPollerKey"; //$NON-NLS-1$
public static final String SHUTDOWN_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.shutdownPollerKey"; //$NON-NLS-1$
public static final String SERVER_USERNAME = "org.jboss.ide.eclipse.as.core.server.userName"; //$NON-NLS-1$
14 years, 4 months
- 1
- 0