JBoss Tools SVN: r11701 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-12 07:44:10 -0500 (Wed, 12 Nov 2008)
New Revision: 11701
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Logger.java
Log:
Add Logger to log problems to log file
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Logger.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Logger.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/Logger.java 2008-11-12 12:44:10 UTC (rev 11701)
@@ -0,0 +1,37 @@
+package org.jboss.tools.flow.jpdl4;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+public class Logger {
+
+ public static void logInfo(String message) {
+ log(IStatus.INFO, IStatus.OK, message, null);
+ }
+
+ public static void logError(Throwable exception) {
+ logError("Unexpected Exception", exception);
+ }
+
+ public static void logError(String message, Throwable exception) {
+ log(IStatus.ERROR, IStatus.OK, message, exception);
+ }
+
+ public static void log(int severity, int code, String message, Throwable exception) {
+ log(createStatus(severity, code, message, exception));
+ }
+
+ public static IStatus createStatus(int severity, int code, String message, Throwable exception) {
+ return new Status(
+ severity,
+ Activator.getDefault().getBundle().getSymbolicName(),
+ code,
+ message,
+ exception);
+ }
+
+ public static void log(IStatus status) {
+ Activator.getDefault().getLog().log(status);
+ }
+
+}
17 years, 5 months
JBoss Tools SVN: r11700 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-11-12 07:43:09 -0500 (Wed, 12 Nov 2008)
New Revision: 11700
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java
Log:
allow delete of nodes embedded in node containers (problem with dangling edges)
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java 2008-11-12 10:35:31 UTC (rev 11699)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteElementCommand.java 2008-11-12 12:43:09 UTC (rev 11700)
@@ -34,6 +34,8 @@
private NodeWrapper child;
private ContainerWrapper parent;
+ private List<DeleteElementCommand> embeddedCommands;
+
private List<NodeWrapper> incomingElementWrappers = new ArrayList<NodeWrapper>();
private List<NodeWrapper> outgoingElementWrappers = new ArrayList<NodeWrapper>();
private List<ConnectionWrapper> incomingConnections = new ArrayList<ConnectionWrapper>();
@@ -56,8 +58,32 @@
connection.disconnect();
}
}
+
+ private void initializeEmbeddedCommands() {
+ embeddedCommands = new ArrayList<DeleteElementCommand>();
+ ContainerWrapper container = (ContainerWrapper)child;
+ List<NodeWrapper> children = container.getElements();
+ for (NodeWrapper w : children) {
+ DeleteElementCommand c = new DeleteElementCommand();
+ c.setParent(container);
+ c.setChild(w);
+ embeddedCommands.add(c);
+ }
+ }
+
+ private void executeEmbeddedCommands() {
+ if (embeddedCommands == null) {
+ initializeEmbeddedCommands();
+ }
+ for (DeleteElementCommand c : embeddedCommands) {
+ c.execute();
+ }
+ }
public void execute() {
+ if (child instanceof ContainerWrapper) {
+ executeEmbeddedCommands();
+ }
deleteConnections(child);
parent.removeElement(child);
}
@@ -86,10 +112,19 @@
public void setParent(ContainerWrapper parent) {
this.parent = parent;
}
+
+ private void undoEmbeddedCommands() {
+ for (DeleteElementCommand c : embeddedCommands) {
+ c.undo();
+ }
+ }
public void undo() {
parent.addElement(child);
restoreConnections();
+ if (child instanceof ContainerWrapper) {
+ undoEmbeddedCommands();
+ }
}
}
17 years, 5 months
JBoss Tools SVN: r11699 - in trunk: jmx/plugins/org.jboss.tools.jmx.ui and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-11-12 05:35:31 -0500 (Wed, 12 Nov 2008)
New Revision: 11699
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.core/
trunk/jmx/plugins/org.jboss.tools.jmx.ui/
trunk/jmx/tests/org.jboss.tools.jmx.core.test/
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/
trunk/smooks/plugins/org.jboss.tools.smooks.core/
Log:
svn bin ignore
Property changes on: trunk/jmx/plugins/org.jboss.tools.jmx.core
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/jmx/plugins/org.jboss.tools.jmx.ui
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/jmx/tests/org.jboss.tools.jmx.core.test
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/jmx/tests/org.jboss.tools.jmx.ui.test
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core
___________________________________________________________________
Name: svn:ignore
+ bin
17 years, 5 months
JBoss Tools SVN: r11698 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-12 05:05:38 -0500 (Wed, 12 Nov 2008)
New Revision: 11698
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java
Log:
JBIDE-3175: the client sample java file has errors when the web service method is void
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-11-12 09:03:50 UTC (rev 11697)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2008-11-12 10:05:38 UTC (rev 11698)
@@ -42,7 +42,7 @@
/**
* @author Grid Qian
*
- * create a sample class to call web service according to wsdl
+ * create a sample class to call web service according to wsdl
*/
public class ClientSampleCreationCommand extends AbstractDataModelOperation {
@@ -68,7 +68,8 @@
.getWebProjectName());
} catch (JavaModelException e) {
JBossWSCreationCore.getDefault().logError(e);
- return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
}
// find web service client classes
@@ -77,15 +78,17 @@
// find web service classes
List<ICompilationUnit> serviceUnits = findJavaUnitsByAnnotation(
- project, JBossWSCreationCoreMessages.Webservice_Annotation_Check);
+ project,
+ JBossWSCreationCoreMessages.Webservice_Annotation_Check);
// create a client sample class
ICompilationUnit clientCls = createJavaClass(model.getCustomPackage()
+ JBossWSCreationCoreMessages.Client_Sample_Package_Name,
- JBossWSCreationCoreMessages.Client_Sample_Class_Name, false, null,
- project);
- if(clientCls == null){
- return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
+ JBossWSCreationCoreMessages.Client_Sample_Class_Name, false,
+ null, project);
+ if (clientCls == null) {
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
}
// add imports to client sample class
@@ -95,7 +98,8 @@
clientCls.save(null, true);
} catch (Exception e1) {
JBossWSCreationCore.getDefault().logError(e1);
- return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
}
// create main method
@@ -109,7 +113,9 @@
createWebServiceClient(clientUnits, serviceUnits, sb);
sb.append(" System.out.println(\"***********************\");");
sb.append(LINE_SEPARATOR);
- sb.append(" System.out.println(\"").append(JBossWSCreationCoreMessages.Client_Sample_Run_Over).append("\");");
+ sb.append(" System.out.println(\"").append(
+ JBossWSCreationCoreMessages.Client_Sample_Run_Over).append(
+ "\");");
sb.append(LINE_SEPARATOR);
sb.append("}");
try {
@@ -117,7 +123,8 @@
clientCls.save(null, true);
} catch (JavaModelException e) {
JBossWSCreationCore.getDefault().logError(e);
- return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
+ return StatusUtils
+ .errorStatus(JBossWSCreationCoreMessages.Error_Create_Client_Sample);
}
return status;
@@ -133,16 +140,18 @@
* @param i
*/
@SuppressWarnings("unchecked")
- private void createWebService(List<ICompilationUnit> serviceUnits,MethodDeclaration method, StringBuffer sb,int i) {
- sb.append(" System.out.println(\""
- + "Create Web Service...\");");
+ private void createWebService(List<ICompilationUnit> serviceUnits,
+ MethodDeclaration method, StringBuffer sb, int i) {
+ sb
+ .append(" System.out.println(\""
+ + "Create Web Service...\");");
sb.append(LINE_SEPARATOR);
- sb.append(" "+method.getReturnType2().toString());
+ sb.append(" " + method.getReturnType2().toString());
sb.append(" port").append(i).append(" = ");
sb.append("service").append(i).append(".");
sb.append(method.getName()).append("();");
sb.append(LINE_SEPARATOR);
-
+
for (ICompilationUnit unit : serviceUnits) {
// parse the unit
ASTParser parser = ASTParser.newParser(AST.JLS3);
@@ -152,9 +161,10 @@
CompilationUnit result = (CompilationUnit) parser.createAST(null);
List types = result.types();
TypeDeclaration typeDec1 = (TypeDeclaration) types.get(0);
- if(typeDec1.getName().toString().equals(method.getReturnType2().toString())){
- callWebServiceOperation(typeDec1,sb,i);
- }
+ if (typeDec1.getName().toString().equals(
+ method.getReturnType2().toString())) {
+ callWebServiceOperation(typeDec1, sb, i);
+ }
}
}
@@ -170,23 +180,30 @@
sb.append(" System.out.println(\""
+ "Call Web Service Operation...\");");
sb.append(LINE_SEPARATOR);
-
+
MethodDeclaration methodDec[] = typeDec.getMethods();
// call web serivce Operation
for (MethodDeclaration method : methodDec) {
- sb.append(" System.out.println(\"Server said: \" + ");
- sb.append("port").append(i).append(".");
- sb.append(method.getName()).append("(");
-
- for(int j=0;j<method.parameters().size();j++){
- sb.append("args[").append(j).append("]");
- if(j!=method.parameters().size()-1){
- sb.append(",");
- }
- }
- sb.append("));");
- sb.append(LINE_SEPARATOR);
+ if (method.getReturnType2().toString().equals("void")) {
+ sb.append(" System.out.println(\"Server said: ");
+ sb.append("port").append(i).append(".");
+ sb.append(method.getName()).append("() is a void method!\");");
+ sb.append(LINE_SEPARATOR);
+ } else {
+ sb.append(" System.out.println(\"Server said: \" + ");
+ sb.append("port").append(i).append(".");
+ sb.append(method.getName()).append("(");
+
+ for (int j = 0; j < method.parameters().size(); j++) {
+ sb.append("args[").append(j).append("]");
+ if (j != method.parameters().size() - 1) {
+ sb.append(",");
+ }
+ }
+ sb.append("));");
+ sb.append(LINE_SEPARATOR);
+ }
}
}
17 years, 5 months
JBoss Tools SVN: r11697 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-11-12 04:03:50 -0500 (Wed, 12 Nov 2008)
New Revision: 11697
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
Log:
JBIDE-3174: a error dialog opened when web service annotation isjavax.jws.WebService
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java 2008-11-12 08:22:45 UTC (rev 11696)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ValidateWSImplCommand.java 2008-11-12 09:03:50 UTC (rev 11697)
@@ -40,7 +40,7 @@
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
-
+
String implClass = model.getServiceClasses().get(0);
String project = model.getWebProjectName();
ICompilationUnit unit = null;
@@ -48,14 +48,18 @@
if (JBossWSCreationUtils.getJavaProjectByName(project).findType(
implClass) != null) {
unit = JBossWSCreationUtils.getJavaProjectByName(project)
- .findType(implClass).getCompilationUnit();
+ .findType(implClass).getCompilationUnit();
} else {
return StatusUtils.errorStatus(NLS.bind(
JBossWSCreationCoreMessages.Error_No_Class,
new String[] { implClass, project }));
}
if (!unit.getSource().contains(
- JBossWSCreationCoreMessages.Webservice_Annotation)) {
+ JBossWSCreationCoreMessages.Webservice_Annotation)
+ && !unit
+ .getSource()
+ .contains(
+ JBossWSCreationCoreMessages.Webservice_Annotation_Prefix)) {
return StatusUtils
.errorStatus(JBossWSCreationCoreMessages.Error_No_Annotation);
}
@@ -64,7 +68,7 @@
return StatusUtils.errorStatus(NLS.bind(
JBossWSCreationCoreMessages.Error_No_Class, new String[] {
implClass, project }));
- }
+ }
return Status.OK_STATUS;
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-11-12 08:22:45 UTC (rev 11696)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-11-12 09:03:50 UTC (rev 11697)
@@ -23,6 +23,7 @@
Error_No_Annotation=This class has no required JAXWS Annotation!
WebserviceClient_Annotation=@WebServiceClient
Webservice_Annotation=@WebService
+Webservice_Annotation_Prefix=(a)javax.jws.WebService
Error_No_Class= The class {0} cannot be loaded via project {1}.Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project.
Error_WS_Location=The JBoss WS Runtime Location is NULL. Please set the location on JBoss WS preferences page.
Webservice_Annotation_Check=@WebService(
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-11-12 08:22:45 UTC (rev 11696)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2008-11-12 09:03:50 UTC (rev 11697)
@@ -50,6 +50,7 @@
public static String Error_WS_Chose_runtime;
public static String Webservice_Annotation_Check;
public static String Webservice_Annotation;
+ public static String Webservice_Annotation_Prefix;
public static String Client_Sample_Package_Name;
public static String Client_Sample_Class_Name;
public static String Error_Create_Client_Sample;
17 years, 5 months
JBoss Tools SVN: r11695 - trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-12 02:52:05 -0500 (Wed, 12 Nov 2008)
New Revision: 11695
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
Log:
JBIDE-3160
when the source was changed , smooks editor will clean all graphical model and re-create them.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-12 07:49:44 UTC (rev 11694)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-12 07:52:05 UTC (rev 11695)
@@ -74,6 +74,7 @@
public static String getTransformType(ResourceConfigType resourceConfig){
ParamType typeParam = null;
+ if(resourceConfig == null) return "";
if(isTransformTypeResourceConfig(resourceConfig)){
List paramList = resourceConfig.getParam();
for (Iterator iterator = paramList.iterator(); iterator.hasNext();) {
17 years, 5 months
JBoss Tools SVN: r11694 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: javabean/analyzer and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-12 02:49:44 -0500 (Wed, 12 Nov 2008)
New Revision: 11694
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AnalyzeResult.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IAnalyzeListener.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
JBIDE-3160
when the source was changed , smooks editor will clean all graphical model and re-create them.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingModel.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -9,41 +9,61 @@
import org.jboss.tools.smooks.ui.gef.model.PropertyModel;
/**
- * @author root
- *
+ * @author Dart
+ *
*/
public class MappingModel {
protected Object source;
protected Object target;
-
+
protected List<PropertyModel> properties = new ArrayList<PropertyModel>();
-
- public MappingModel(Object source,Object target){
+
+ public MappingModel(Object source, Object target) {
setSource(source);
setTarget(target);
}
-
+
public Object getSource() {
return source;
}
+
public void setSource(Object source) {
this.source = source;
}
+
public Object getTarget() {
return target;
}
+
public void setTarget(Object target) {
this.target = target;
}
-
-
- public String toString(){
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null)
+ return false;
+ if (!(obj instanceof MappingModel)) {
+ return false;
+ }
+
+ Object es = ((MappingModel) obj).getSource();
+ Object et = ((MappingModel) obj).getTarget();
+
+ if (source != null && target != null) {
+ return (source == es && target == et );
+ } else {
+ return false;
+ }
+ }
+ @Override
+ public String toString() {
StringBuffer buffer = new StringBuffer();
- if(source != null)
+ if (source != null)
buffer.append(Messages.getString("MappingModel.Source") + source); //$NON-NLS-1$
else
buffer.append(Messages.getString("MappingModel.SourceIsNull")); //$NON-NLS-1$
- if(target != null)
+ if (target != null)
buffer.append(Messages.getString("MappingModel.Target") + target); //$NON-NLS-1$
else
buffer.append(Messages.getString("MappingModel.TargetIsNull")); //$NON-NLS-1$
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -494,6 +494,9 @@
sourceName = sourceClazz.getName();
}
String selector = rc.getSelector();
+ if(selector != null){
+ selector = selector.trim();
+ }
if (sourceName.equals(selector)) {
String targetName = target.getName();
Class targetClazz = target.getBeanClass();
@@ -543,8 +546,14 @@
AnyType binding = (AnyType) iterator.next();
String property = SmooksModelUtils.getAttributeValueFromAnyType(
binding, SmooksModelUtils.ATTRIBUTE_PROPERTY);
+ if(property != null){
+ property = property.trim();
+ }
String selector = SmooksModelUtils.getAttributeValueFromAnyType(
binding, SmooksModelUtils.ATTRIBUTE_SELECTOR);
+ if(selector != null){
+ selector = selector.trim();
+ }
JavaBeanModel childTargetModel = findTheChildJavaBeanModel(
property, target);
JavaBeanModel sourceModel = null;
@@ -674,8 +683,9 @@
}
if (rootClassName == null) {
return null;
+ } else {
+ rootClassName = rootClassName.trim();
}
-
boolean isWarning = false;
boolean isError = false;
Class clazz = null;
@@ -686,8 +696,13 @@
}
clazz = classLoader.loadClass(rootClassName);
- } catch (Exception e) {
- // ignore
+ } catch (ClassNotFoundException e) {
+ // TODO if can't find the class throws exception
+ // MODIFY by Dart 2008.11.12
+ throw new RuntimeException("Can't find the class : \""
+ + rootClassName + "\" to create the JavaBean model");
+ } catch (JavaModelException e) {
+ e.printStackTrace();
}
JavaBeanModel model = null;
if (clazz != null) {
@@ -788,7 +803,10 @@
try {
rootClass = loader.loadClass(rootClassName);
} catch (ClassNotFoundException e) {
- // ignore
+ // TODO if can't find the class throws exception
+ // MODIFY by Dart 2008.11.12
+ throw new RuntimeException("Can't find the class : \""
+ + rootClassName + "\" to create the JavaBean model");
}
}
boolean rootIsError = false;
@@ -949,16 +967,22 @@
JavaBeanModel model = findTheChildJavaBeanModel(
referenceSelector, currentModel);
// try to test the selector is can be loaded by classloader??
- Class clazz = null;
- try {
- if (classLoader != null) {
- clazz = classLoader.loadClass(referenceSelector);
- if (clazz != null && model == null)
- model = JavaBeanModelFactory
- .getJavaBeanModelWithLazyLoad(clazz);
+ if (model == null) {
+ Class clazz = null;
+ try {
+ if (classLoader != null) {
+ clazz = classLoader.loadClass(referenceSelector);
+ if (clazz != null && model == null)
+ model = JavaBeanModelFactory
+ .getJavaBeanModelWithLazyLoad(clazz);
+ }
+ } catch (ClassNotFoundException e) {
+ // TODO if can't find the class throws exception
+ // MODIFY by Dart 2008.11.12
+ throw new RuntimeException("Can't find the class : \""
+ + referenceSelector
+ + "\" to create the JavaBean model");
}
- } catch (Exception e) {
- // ignore
}
// something wrong
if (model == null) {
@@ -968,6 +992,8 @@
model.setProperties(new ArrayList());
setCollectionsInstanceClassName(model, resourceConfig);
}
+ // if there occurs error so we need to add the child node by
+ // hand , if no , don't care that.
if (currentModel.getError() != null) {
currentModel.addProperty(model);
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AnalyzeResult.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AnalyzeResult.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AnalyzeResult.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -0,0 +1,14 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui;
+
+import org.jboss.tools.smooks.ui.editors.SaveResult;
+
+/**
+ * @author Dart
+ *
+ */
+public class AnalyzeResult extends SaveResult {
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AnalyzeResult.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IAnalyzeListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IAnalyzeListener.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IAnalyzeListener.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -0,0 +1,14 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.ui;
+
+/**
+ * @author Dart
+ *
+ */
+public interface IAnalyzeListener {
+
+ public void endAnalyze(AnalyzeResult result);
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/IAnalyzeListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -139,6 +139,8 @@
protected void assosiateEditors(){
xmlTextEditor.addSaveListener(graphicalPage);
+ graphicalPage.addAnalyzeListener(xmlTextEditor);
+ graphicalPage.addAnalyzeListener(normalPage);
}
public void setParseException(boolean onlyShowTextEditor, Throwable reason) {
@@ -214,7 +216,7 @@
}
public void refreshNormalPage(List resourceHidenConfigs) {
- NormalSmooksModelPackage modelPackage = createSmooksModelPackage();
+ NormalSmooksModelPackage modelPackage = createNewSmooksModelPackage();
if (modelPackage != null) {
modelPackage.setHidenSmooksElements(resourceHidenConfigs);
}
@@ -223,7 +225,7 @@
}
}
- protected NormalSmooksModelPackage createSmooksModelPackage() {
+ public NormalSmooksModelPackage createNewSmooksModelPackage() {
NormalSmooksModelBuilder builder = NormalSmooksModelBuilder
.getInstance();
if (smooksResource.getContents().isEmpty())
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -75,7 +75,6 @@
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
@@ -121,6 +120,8 @@
import org.jboss.tools.smooks.model.SmooksFactory;
import org.jboss.tools.smooks.model.SmooksResourceListType;
import org.jboss.tools.smooks.model.util.SmooksModelConstants;
+import org.jboss.tools.smooks.ui.AnalyzeResult;
+import org.jboss.tools.smooks.ui.IAnalyzeListener;
import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard;
import org.jboss.tools.smooks.ui.IViewerInitor;
import org.jboss.tools.smooks.ui.SmooksUIActivator;
@@ -129,7 +130,6 @@
import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel;
import org.jboss.tools.smooks.ui.gef.model.GraphRootModel;
import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel;
-import org.jboss.tools.smooks.ui.gef.model.RootModel;
import org.jboss.tools.smooks.ui.gef.model.SourceModel;
import org.jboss.tools.smooks.ui.gef.model.TargetModel;
import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel;
@@ -150,6 +150,8 @@
ISelectionChangedListener, ISelectionProvider,
org.eclipse.emf.common.command.CommandStackListener, ISaveListener {
+ private List<IAnalyzeListener> analyzeListenerList = new ArrayList<IAnalyzeListener>();
+
protected boolean disableMappingGUI = false;
private List<DesignTimeAnalyzeResult> analyzeResultList = new ArrayList<DesignTimeAnalyzeResult>();
@@ -190,7 +192,7 @@
protected Resource smooksResource = null;
protected Object sourceTreeViewerInputModel = null;
protected Object targetTreeViewerInputModel = null;
- protected List<MappingModel> initConnectionList = null;
+ protected List<MappingModel> mappingModelList = null;
protected boolean commandStackChanged = false;
protected ActionRegistry actionRegistry;
@@ -264,17 +266,31 @@
list = SmooksFactory.eINSTANCE.createSmooksResourceListType();
doc.setSmooksResourceList(list);
}
+ }
+ public void addAnalyzeListener(IAnalyzeListener listener) {
+ if (listener != null) {
+ analyzeListenerList.add(listener);
+ }
}
- private void callParentRefillNormalModelInfor(List hidenResourceConfigs) {
- SmooksFormEditor editor = (SmooksFormEditor) getEditor();
- editor.refreshNormalPage(hidenResourceConfigs);
+ public void removeAnalyzeListener(IAnalyzeListener listener) {
+ if (listener != null) {
+ analyzeListenerList.remove(listener);
+ }
}
- // protected void notifyParentEditorTransformNormal
+ public void cleanAnalyzeListenerList() {
+ analyzeListenerList.clear();
+ }
@Override
+ public void dispose() {
+ cleanAnalyzeListenerList();
+ super.dispose();
+ }
+
+ @Override
protected void createFormContent(IManagedForm managedForm) {
final ScrolledForm form = managedForm.getForm();
@@ -452,10 +468,7 @@
this.getSmooksResource().unload();
this.initTransformViewerModel((IEditorSite) getSite(),
getEditorInput());
- } catch (IOWrappedException ex) {
- MessageDialog.openWarning(getSite().getShell(), "Waring",
- "Exceptions occurd during parsing Smooks file, no worries");
- } catch (Throwable e) {
+ } catch (Throwable e) {
throwable = e;
}
if (throwable == null) {
@@ -470,12 +483,14 @@
initTargetTreeViewer();
expandTargetConnectionModel();
}
-
this.redrawMappingPanel();
+ notifyAnalyzeListeners(null);
} else {
cleanMappingPanel();
this.disableMappingGUI = true;
- mappingGUISection.setEnabled(false);
+ if (mappingGUISection != null)
+ mappingGUISection.setEnabled(false);
+ this.notifyAnalyzeListeners(throwable);
}
}
@@ -485,45 +500,6 @@
}
}
- protected void createOtherSmooksGUI(Composite parent, FormToolkit tool) {
- Composite mainComposite = tool.createComposite(parent);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- mainComposite.setLayout(gridLayout);
-
- createSmooksTypeGUI(mainComposite, tool);
- }
-
- protected void createSmooksTypeGUI(Composite mainComposite, FormToolkit tool) {
- Composite typeSelectComposite = tool.createComposite(mainComposite);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- typeSelectComposite.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- typeSelectComposite.setLayout(layout);
-
- Label label = tool.createLabel(typeSelectComposite,
- "Smooks Parse Type : ");
- gd = new GridData();
- gd.horizontalSpan = 3;
-
- label.setLayoutData(gd);
- createTypeSelectRadioButton(typeSelectComposite, tool, "SAX")
- .setSelection(true);
- createTypeSelectRadioButton(typeSelectComposite, tool, "DOM");
- createTypeSelectRadioButton(typeSelectComposite, tool, "SAX/DOM");
-
- }
-
- private Button createTypeSelectRadioButton(Composite parent,
- FormToolkit tool, String labelName) {
- Button button = tool.createButton(parent, labelName, SWT.RADIO);
- return button;
- }
-
protected SmooksFileBuilder createSmooksFileBulder() {
return new SmooksFileBuilder(this.getEditingDomain());
}
@@ -559,13 +535,13 @@
}
protected void expandConnectionModel(TreeViewer viewer, boolean isSource) {
- if (initConnectionList == null || initConnectionList.isEmpty())
+ if (mappingModelList == null || mappingModelList.isEmpty())
return;
ITreeContentProvider provider = (ITreeContentProvider) viewer
.getContentProvider();
if (provider == null)
return;
- for (Iterator iterator = initConnectionList.iterator(); iterator
+ for (Iterator iterator = mappingModelList.iterator(); iterator
.hasNext();) {
MappingModel connection = (MappingModel) iterator.next();
Object currentModel = connection.getTarget();
@@ -624,14 +600,11 @@
}
}
- protected void initViewerInitor() {
-
- }
-
protected void createSourceGraphModels() {
+ clearExsitingGraphModels(SourceModel.class);
+ if(sourceViewer == null) return;
Tree tree = sourceViewer.getTree();
TreeItem[] items = tree.getItems();
- clearExsitingGraphModels(SourceModel.class);
createGraphModels(items, SourceModel.class);
}
@@ -660,9 +633,13 @@
}
/**
+ * Remove GEF models from the root , and remove all associated connection
+ * model.
+ * <p>
+ * If the param is SourceModel.class , it will remove the SourceModel and
+ * the their connections.Same with TargetModel.class param
*
- * @param clazz
- * SourceModel/TargetModel
+ * @param class SourceModel.class | TargetModel.class
*/
private void clearExsitingGraphModels(Class<? extends Object> clazz) {
if (rootModel != null) {
@@ -680,9 +657,10 @@
}
protected void createTargetGraphModels() {
+ clearExsitingGraphModels(TargetModel.class);
+ if(targetViewer == null) return;
Tree tree = targetViewer.getTree();
TreeItem[] items = tree.getItems();
- clearExsitingGraphModels(TargetModel.class);
createGraphModels(items, TargetModel.class);
}
@@ -782,6 +760,13 @@
return context;
}
+ /**
+ * Init the Smooks context. The context will be used by IAnalyzer to save or
+ * parse the Smooks configuration file.
+ * <p>
+ *
+ * @param context
+ */
protected void initSmooksConfigurationFileGenerateContext(
SmooksConfigurationFileGenerateContext context) {
context.setSourceDataTypeID(this.sourceDataTypeID);
@@ -870,7 +855,11 @@
});
}
+ /**
+ *
+ */
protected void createConnectionModels() {
+ if(rootModel == null) return;
List children = this.rootModel.getChildren();
for (Iterator iterator = children.iterator(); iterator.hasNext();) {
TreeItemRelationModel source = (TreeItemRelationModel) iterator
@@ -897,9 +886,9 @@
TreeItemRelationModel target) {
Object sourceReferModel = source.getReferenceEntityModel();
Object targetReferModel = target.getReferenceEntityModel();
- if (initConnectionList == null)
+ if (mappingModelList == null)
return null;
- for (Iterator iterator = initConnectionList.iterator(); iterator
+ for (Iterator iterator = mappingModelList.iterator(); iterator
.hasNext();) {
MappingModel mapping = (MappingModel) iterator.next();
Object s = mapping.getSource();
@@ -979,7 +968,7 @@
sourceTreeViewerInputModel,
targetTreeViewerInputModel);
if (mappingResourceConfigList != null) {
- initConnectionList = mappingResourceConfigList
+ mappingModelList = mappingResourceConfigList
.getMappingModelList();
}
}
@@ -1084,9 +1073,29 @@
if (throwable != null) {
this.disableMappingGUI = true;
((SmooksFormEditor) getEditor()).setParseException(true, throwable);
+ this.notifyAnalyzeListeners(throwable);
}
}
+ /**
+ *
+ * @param error
+ * . The exception occurs when analyze the smooks config file.
+ * <p>
+ * If the param is NULL means that there doesn't occur exception
+ * during analyze config file.
+ */
+ protected void notifyAnalyzeListeners(Throwable error) {
+ AnalyzeResult result = new AnalyzeResult();
+ result.setSourceEdtior(this);
+ result.setError(error);
+ for (Iterator<IAnalyzeListener> iterator = this.analyzeListenerList
+ .iterator(); iterator.hasNext();) {
+ IAnalyzeListener listener = (IAnalyzeListener) iterator.next();
+ listener.endAnalyze(result);
+ }
+ }
+
protected void initFormEditorWithGraphInfo(GraphInformations graph) {
MappingDataType mapping = graph.getMappingType();
if (mapping != null) {
@@ -1167,9 +1176,15 @@
}
}
+ /**
+ * Clean the source and target treeviewer , and remove all items on the
+ * graphical panel (middle panel).
+ */
public void cleanMappingPanel() {
- sourceViewer.setInput(Collections.EMPTY_LIST);
- targetViewer.setInput(Collections.EMPTY_LIST);
+ if (sourceViewer != null && targetViewer != null) {
+ sourceViewer.setInput(Collections.EMPTY_LIST);
+ targetViewer.setInput(Collections.EMPTY_LIST);
+ }
clearExsitingGraphModels(SourceModel.class);
clearExsitingGraphModels(TargetModel.class);
}
@@ -1318,7 +1333,7 @@
// System.out.println("Block a event fire !!");
return;
}
- rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, null,
+ rootModel.firePropertyChange(AbstractStructuredDataModel.P_REFRESH_PANEL, null,
new Object());
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -36,12 +36,15 @@
import org.jboss.tools.smooks.model.SmooksPackage;
import org.jboss.tools.smooks.model.util.SmooksModelConstants;
import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.ui.AnalyzeResult;
+import org.jboss.tools.smooks.ui.IAnalyzeListener;
import org.jboss.tools.smooks.utils.UIUtils;
/**
* @author Dart Peng Date : 2008-9-9
*/
-public class SmooksNormalContentEditFormPage extends FormPage {
+public class SmooksNormalContentEditFormPage extends FormPage implements
+ IAnalyzeListener {
protected NormalSmooksModelPackage modelPackage = null;
@@ -111,16 +114,16 @@
form.pack();
this.initTransformTypeResourceConfig();
resourceBlock.initViewers(transformType);
-
+
setGUIStates();
}
public void setGUIStates() {
- if(resourceBlock != null){
+ if (resourceBlock != null) {
resourceBlock.setSectionStates(!disableGUI);
}
-
- if(this.parseTypeSection != null && !parseTypeSection.isDisposed()){
+
+ if (this.parseTypeSection != null && !parseTypeSection.isDisposed()) {
parseTypeSection.setEnabled(!disableGUI);
}
}
@@ -147,6 +150,12 @@
}
protected void initTransformTypeResourceConfig() {
+ if (saxButton != null)
+ saxButton.setSelection(false);
+ if (domButton != null)
+ domButton.setSelection(false);
+ if (saxdomButton != null)
+ saxdomButton.setSelection(false);
if (this.getModelPackage() != null) {
List list = modelPackage.getSmooksResourceList()
.getAbstractResourceConfig();
@@ -162,13 +171,16 @@
if (transformType != null) {
String type = SmooksModelUtils.getTransformType(transformType);
if (SmooksModelConstants.SAX.equals(type)) {
- saxButton.setSelection(true);
+ if (saxButton != null)
+ saxButton.setSelection(true);
}
if (SmooksModelConstants.DOM.equals(type)) {
- domButton.setSelection(true);
+ if (domButton != null)
+ domButton.setSelection(true);
}
if ("SAX/DOM".equals(type)) {
- saxdomButton.setSelection(true);
+ if (saxdomButton != null)
+ saxdomButton.setSelection(true);
}
}
}
@@ -258,4 +270,29 @@
if (resourceBlock != null)
this.resourceBlock.setModelPackage(this.modelPackage);
}
+
+ public void endAnalyze(AnalyzeResult result) {
+ if (result.getError() == null) {
+ disableGUI = false;
+ SmooksFormEditor parentEditor = (SmooksFormEditor) getEditor();
+ NormalSmooksModelPackage pa = parentEditor
+ .createNewSmooksModelPackage();
+ SmooksGraphicalFormPage graphicalEditor = (SmooksGraphicalFormPage) result
+ .getSourceEdtior();
+ MappingResourceConfigList rclist = graphicalEditor
+ .getMappingResourceConfigList();
+ if (rclist != null) {
+ pa.setHidenSmooksElements(rclist
+ .getRelationgResourceConfigList());
+ }
+ setModelPackage(pa);
+ } else {
+ setModelPackage(null);
+ disableGUI = true;
+ }
+ initTransformTypeResourceConfig();
+ if (resourceBlock != null)
+ this.resourceBlock.initViewers(transformType);
+ setGUIStates();
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.editors;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -47,6 +48,7 @@
import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
import org.jboss.tools.smooks.model.ResourceConfigType;
import org.jboss.tools.smooks.model.SmooksPackage;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
import org.jboss.tools.smooks.model.util.SmooksModelUtils;
import org.jboss.tools.smooks.ui.BeanPopulatorWarrper;
import org.jboss.tools.smooks.ui.DateTypeWarrper;
@@ -106,13 +108,20 @@
public void setModelPackage(NormalSmooksModelPackage modelPackage) {
this.modelPackage = modelPackage;
+ // if (this.dateTypeViewer != null) {
+ // if (this.modelPackage != null) {
+ // dateTypeViewer.setInput(this.modelPackage
+ // .getSmooksResourceList().getAbstractResourceConfig());
+ // }
+ // }
}
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.MasterDetailsBlock#createMasterPart(org.eclipse.ui.forms.IManagedForm,
- * org.eclipse.swt.widgets.Composite)
+ * @see
+ * org.eclipse.ui.forms.MasterDetailsBlock#createMasterPart(org.eclipse.
+ * ui.forms.IManagedForm, org.eclipse.swt.widgets.Composite)
*/
@Override
protected void createMasterPart(IManagedForm managedForm, Composite parent) {
@@ -125,7 +134,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.MasterDetailsBlock#createToolBarActions(org.eclipse.ui.forms.IManagedForm)
+ * @see
+ * org.eclipse.ui.forms.MasterDetailsBlock#createToolBarActions(org.eclipse
+ * .ui.forms.IManagedForm)
*/
@Override
protected void createToolBarActions(IManagedForm managedForm) {
@@ -135,7 +146,9 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart)
+ * @see
+ * org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.
+ * forms.DetailsPart)
*/
@Override
protected void registerPages(DetailsPart detailsPart) {
@@ -193,6 +206,7 @@
return false;
if (modelPackage != null) {
List hidenList = modelPackage.getHidenSmooksElements();
+ if(hidenList == null) return false;
for (Iterator iterator = hidenList.iterator(); iterator
.hasNext();) {
Object object = (Object) iterator.next();
@@ -208,20 +222,34 @@
public void initViewers(ResourceConfigType transformType) {
this.transformType = transformType;
if (this.getModelPackage() != null) {
- dateTypeViewer.setInput(modelPackage.getSmooksResourceList()
- .getAbstractResourceConfig());
+ if (dateTypeViewer != null) {
+ SmooksResourceListType tea = modelPackage
+ .getSmooksResourceList();
+ if(tea != null){
+ dateTypeViewer.setInput(tea.getAbstractResourceConfig());
+ }
+
+ }
+ } else {
+ if (dateTypeViewer != null) {
+ dateTypeViewer.setInput(Collections.EMPTY_LIST);
+ SelectionChangedEvent event = new SelectionChangedEvent(
+ dateTypeViewer, new StructuredSelection(new Object()));
+ selectionChanged(event);
+ }
}
}
protected void createDataTypeGUI(Composite rootMainControl,
FormToolkit tool, final IManagedForm managedForm) {
- configurationSection = tool.createSection(rootMainControl, Section.TITLE_BAR
- | Section.DESCRIPTION);
+ configurationSection = tool.createSection(rootMainControl,
+ Section.TITLE_BAR | Section.DESCRIPTION);
configurationSection.setText("Data Type");
sectionPart = new SectionPart(configurationSection);
managedForm.addPart(sectionPart);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- Composite dataTypeComposite = tool.createComposite(configurationSection);
+ Composite dataTypeComposite = tool
+ .createComposite(configurationSection);
configurationSection.setClient(dataTypeComposite);
GridLayout layout = new GridLayout();
layout.numColumns = 2;
@@ -265,9 +293,9 @@
hookButtons();
}
-
- public void setSectionStates(boolean state){
- if(configurationSection != null && !configurationSection.isDisposed()){
+
+ public void setSectionStates(boolean state) {
+ if (configurationSection != null && !configurationSection.isDisposed()) {
configurationSection.setEnabled(state);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -73,7 +73,7 @@
if (selector.indexOf(splitString) != -1) {
throw new InvocationTargetException(new Exception(
"The Selector string dosen't support \"" + splitString
- + "\" character"));
+ + "\" character. Selector is \"" + selector + "\""));
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-12 07:40:20 UTC (rev 11693)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-12 07:49:44 UTC (rev 11694)
@@ -419,6 +419,7 @@
if (rt == null)
continue;
String value = rt.getValue();
+ if(value != null) value = value.trim();
if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) {
return resource;
}
17 years, 5 months
JBoss Tools SVN: r11693 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-11-12 02:40:20 -0500 (Wed, 12 Nov 2008)
New Revision: 11693
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java
Log:
JBIDE-3143
Add error message diaplay GUI above the text editor.
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java 2008-11-12 02:07:11 UTC (rev 11692)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksTextEdtor.java 2008-11-12 07:40:20 UTC (rev 11693)
@@ -18,13 +18,15 @@
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.smooks.ui.editors.ISaveListener;
import org.jboss.tools.smooks.ui.editors.SaveResult;
+import org.jboss.tools.smooks.ui.editors.SmooksGraphicalFormPage;
import org.jboss.tools.smooks.utils.SmooksGraphConstants;
/**
* @author Dart
*
*/
-public class SmooksTextEdtor extends StructuredTextEditor {
+public class SmooksTextEdtor extends StructuredTextEditor implements
+ IAnalyzeListener {
private List<ISaveListener> saveListenerList = new ArrayList<ISaveListener>();
@@ -34,7 +36,7 @@
public SmooksTextEdtor(Throwable error) {
super();
- this.setErrorMessage(error);
+ this.setErrorThrowable(error);
}
public SmooksTextEdtor() {
@@ -45,19 +47,21 @@
if (listener != null)
this.saveListenerList.add(listener);
}
-
- public void removeSaveListener(ISaveListener listener){
+
+ public void removeSaveListener(ISaveListener listener) {
if (listener != null)
this.saveListenerList.remove(listener);
}
-
- public void cleanSaveListenerList(){
+
+ public void cleanSaveListenerList() {
saveListenerList.clear();
}
- public void setErrorMessage(Throwable error) {
- if (error == null)
+ public void setErrorThrowable(Throwable error) {
+ if (error == null) {
+ setErrorMessage(null);
return;
+ }
this.error = error;
while (this.error != null
&& this.error instanceof InvocationTargetException) {
@@ -65,36 +69,73 @@
.getTargetException();
}
String errorMessage = null;
- if (error != null)
- errorMessage = error.getLocalizedMessage();
+ if (this.error != null)
+ errorMessage = this.error.getLocalizedMessage();
if (errorMessage == null)
errorMessage = Messages
.getString("SmooksTextEdtor.UnKnownErrorMessage"); //$NON-NLS-1$
- if (messageLabel != null)
- messageLabel.setText(errorMessage);
+ setErrorMessage(errorMessage);
}
public void setErrorMessage(String message) {
+ boolean flag = false;
+ if (errorComposite == null || errorComposite.isDisposed()
+ || messageLabel == null || messageLabel.isDisposed()) {
+ return;
+ }
if (message == null) {
GridData gd = new GridData();
- gd.exclude = true;
- this.errorComposite.setLayoutData(gd);
+ if (flag) {
+ for (int i = 70; i >= 0; i--) {
+ gd.heightHint = i;
+ if (gd.heightHint <= 0) {
+ gd.heightHint = 0;
+ errorComposite.setVisible(false);
+ gd.exclude = true;
+ }
+ this.errorComposite.setLayoutData(gd);
+ Composite parent = errorComposite.getParent();
+ parent.layout();
+ }
+ } else {
+ gd.heightHint = 0;
+ errorComposite.setVisible(false);
+ gd.exclude = true;
+ this.errorComposite.setLayoutData(gd);
+ Composite parent = errorComposite.getParent();
+ parent.layout();
+ }
} else {
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- errorComposite.setLayoutData(gd);
+ errorComposite.setVisible(true);
messageLabel.setText(message);
+ if (flag) {
+ for (int i = 0; i < 70; i++) {
+ gd.heightHint = i;
+ errorComposite.setLayoutData(gd);
+ Composite parent = errorComposite.getParent();
+ parent.layout();
+ }
+ } else {
+ errorComposite.setLayoutData(gd);
+ Composite parent = errorComposite.getParent();
+ parent.layout();
+ }
+
}
}
public void doSave(IProgressMonitor monitor) {
SaveResult result = new SaveResult();
result.setSourceEdtior(this);
- for (Iterator<ISaveListener> iterator = saveListenerList.iterator(); iterator.hasNext();) {
+ for (Iterator<ISaveListener> iterator = saveListenerList.iterator(); iterator
+ .hasNext();) {
ISaveListener l = (ISaveListener) iterator.next();
l.preSave(result);
}
super.doSave(monitor);
- for (Iterator<ISaveListener> iterator = saveListenerList.iterator(); iterator.hasNext();) {
+ for (Iterator<ISaveListener> iterator = saveListenerList.iterator(); iterator
+ .hasNext();) {
ISaveListener l = (ISaveListener) iterator.next();
l.endSave(result);
}
@@ -147,4 +188,10 @@
textComposite.setLayout(new FillLayout());
super.createPartControl(textComposite);
}
+
+ public void endAnalyze(AnalyzeResult result) {
+ if (result.getSourceEdtior() instanceof SmooksGraphicalFormPage) {
+ setErrorThrowable(result.getError());
+ }
+ }
}
17 years, 5 months
JBoss Tools SVN: r11692 - in trunk: jst/plugins/org.jboss.tools.jst.web.ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-11 21:07:11 -0500 (Tue, 11 Nov 2008)
New Revision: 11692
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-2999 fixed. Labels for Server Toolbar were restored
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2008-11-12 01:37:56 UTC (rev 11691)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2008-11-12 02:07:11 UTC (rev 11692)
@@ -1,2 +1,16 @@
pluginName=JBoss WTP Server Tools UI Plugin
-jbossLaunchconfigurationTabGroupDescription=Below is the launch configuration properties for starting JBoss Servers.
\ No newline at end of file
+jbossLaunchconfigurationTabGroupDescription=Below is the launch configuration properties for starting JBoss Servers
+
+actionSets.modelActions.label=JBoss Tools Run Actions
+actionSets.modelActions.description=Description For JBoss Tools Model Actions
+actionSets.projectActions.saveModel.label=Save Model
+
+actionSets.serverActions.selectServer.label=JBoss Tools WTP Server Actions
+actionSets.serverActions.label=JBoss Tools WTP Server Actions
+actionSets.serverActions.description=Description for JBoss Tools WTP Server Actions
+actionSets.serverActions.changeWebXmlTimeStamp.label=Touch descriptors
+actionSets.serverActions.restartServer.label=Restart Server
+actionSets.serverActions.stopServer.label=Stop Server
+actionSets.serverActions.debugServer.label=Start Server in Debug Mode
+actionSets.serverActions.startServer.label=Start Server
+actionSets.serverActions.runApplicationFromSelectedElement.label=Run Application from Selected Element
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2008-11-12 01:37:56 UTC (rev 11691)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2008-11-12 02:07:11 UTC (rev 11692)
@@ -1,19 +1,5 @@
providerName=Red Hat, Inc.
-actionSets.modelActions.label=JBoss Tools Run Actions
-actionSets.modelActions.description=Description For JBoss Tools Model Actions
-actionSets.projectActions.saveModel.label=Save Model
-
-actionSets.serverActions.selectServer.label=JBoss Tools WTP Server Actions
-actionSets.serverActions.label=JBoss Tools WTP Server Actions
-actionSets.serverActions.description=Description for JBoss Tools WTP Server Actions
-actionSets.serverActions.changeWebXmlTimeStamp.label=Touch descriptors
-actionSets.serverActions.restartServer.label=Restart Server
-actionSets.serverActions.stopServer.label=Stop Server
-actionSets.serverActions.debugServer.label=Start Server in Debug Mode
-actionSets.serverActions.startServer.label=Start Server
-actionSets.serverActions.runApplicationFromSelectedElement.label=Run Application from Selected Element
-
editors.tld12.name=JBoss Tools TLD Editor
editors.web.name=JBoss Tools Web Descriptor Editor
17 years, 5 months
JBoss Tools SVN: r11691 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-11-11 20:37:56 -0500 (Tue, 11 Nov 2008)
New Revision: 11691
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2525 resolved. Project name now is got from master project data model
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-11 22:42:53 UTC (rev 11690)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-12 01:37:56 UTC (rev 11691)
@@ -719,7 +719,7 @@
if(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)==null) {
model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, warProject?ISeamFacetDataModelProperties.DEPLOY_AS_WAR:ISeamFacetDataModelProperties.DEPLOY_AS_EAR);
}
- Object projectNamePackage = model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
+ Object projectNamePackage = model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME);
IStatus status = JavaConventions.validatePackageName(projectNamePackage.toString(), CompilerOptions.VERSION_1_5, CompilerOptions.VERSION_1_5);
if(!status.isOK()) {
projectNamePackage = "project";
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-11-11 22:42:53 UTC (rev 11690)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-11-12 01:37:56 UTC (rev 11691)
@@ -12,6 +12,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.FileLocator;
@@ -43,7 +44,7 @@
* @return set of property names
*/
public Set getPropertyNames() {
- Set<String> names = super.getPropertyNames();
+ Set<String> names = super.getPropertyNames();//super.getPropertyNames();
// General group
names.add(ISeamFacetDataModelProperties.JBOSS_AS_HOME);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-11-11 22:42:53 UTC (rev 11690)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-11-12 01:37:56 UTC (rev 11691)
@@ -40,6 +40,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
@@ -233,9 +234,6 @@
*/
public void setConfig(Object config) {
model = (IDataModel) config;
- sync = new DataModelSynchronizer(model);
- model.addListener(this);
-
model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
HIBERNATE_HELPER.getDialectClass(jBossHibernateDbTypeEditor.getValueAsString()));
}
@@ -298,6 +296,7 @@
* Creates Seam Facet Wizard Page contents
*/
public void createControl(Composite parent) {
+ sync = new DataModelSynchronizer(model);
jBossSeamHomeEditor = SeamWizardFactory.createSeamRuntimeSelectionFieldEditor(new SeamVersion[0], SeamFacetInstallDataModelProvider.getSeamRuntimeDefaultValue(model), new NewSeamRuntimeAction());
initializeDialogUnits(parent);
@@ -400,6 +399,7 @@
Dialog.applyDialogFont(parent);
initDefaultWizardProperties();
+ ((IDataModel)model.getProperty(FacetInstallDataModelProvider.MASTER_PROJECT_DM)).addListener(this);
}
private boolean isNewSeamProjectWizard() {
@@ -421,7 +421,9 @@
ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, event
.getProperty().toString());
} else if(event.getPropertyName().equals(IFacetDataModelProperties.FACET_PROJECT_NAME)) {
- setCodeGenerationProperties();
+ model.setStringProperty(
+ ISeamFacetDataModelProperties.SEAM_PROJECT_NAME, event
+ .getProperty().toString());
}
}
@@ -431,8 +433,9 @@
*/
@Override
public void setVisible(boolean visible) {
- setCodeGenerationProperties();
+
if(visible) {
+ setCodeGenerationProperties();
setDefaultSeamRuntime();
validate();
}
@@ -452,18 +455,15 @@
String p = (String)model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME);
sessionBeanPkgNameditor
.setValue("org.domain." //$NON-NLS-1$
- + model
- .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
+ + p
+ ".session"); //$NON-NLS-1$
entityBeanPkgNameditor
.setValue("org.domain." //$NON-NLS-1$
- + model
- .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
+ + p
+ ".entity"); //$NON-NLS-1$
testsPkgNameditor
.setValue("org.domain." //$NON-NLS-1$
- + model
- .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)
+ + p
+ ".test"); //$NON-NLS-1$
}
17 years, 5 months