JBoss Tools SVN: r10187 - trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-10 22:42:35 -0400 (Wed, 10 Sep 2008)
New Revision: 10187
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
Log:
change the name of a method
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-11 02:40:28 UTC (rev 10186)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-11 02:42:35 UTC (rev 10187)
@@ -13,7 +13,6 @@
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -38,6 +37,7 @@
import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
import org.jboss.tools.smooks.analyzer.MappingModel;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
@@ -90,7 +90,6 @@
adapterFactory = new ComposedAdapterFactory(
ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
adapterFactory
.addAdapterFactory(new ResourceItemProviderAdapterFactory());
adapterFactory
@@ -360,14 +359,14 @@
this.analyzeGraphicalModel(root, listType);
}
- public List<MappingModel> analyzeMappingSmooksModel(
+ public MappingResourceConfigList analyzeMappingSmooksModel(
SmooksResourceListType listType, Object sourceObject,
Object targetObject) {
if (!(sourceObject instanceof JavaBeanModel)
|| !(targetObject instanceof JavaBeanModel)) {
- return Collections.EMPTY_LIST;
+ return MappingResourceConfigList.createEmptyList();
}
-
+ MappingResourceConfigList resourceConfigList = new MappingResourceConfigList();
JavaBeanModel source = (JavaBeanModel) sourceObject;
JavaBeanModel target = (JavaBeanModel) targetObject;
List<MappingModel> mappingModelList = new ArrayList<MappingModel>();
@@ -395,14 +394,16 @@
setSelectorIsUsed(sourceName);
// create the first connection
mappingModelList.add(new MappingModel(source, target));
+ resourceConfigList.addResourceConfig(rc);
analyzeMappingModelFromResourceConfig(mappingModelList,
- listType, rc, source, target);
+ resourceConfigList, listType, rc, source,
+ target);
}
}
}
}
-
- return mappingModelList;
+ resourceConfigList.setMappingModelList(mappingModelList);
+ return resourceConfigList;
}
protected boolean isReferenceSelector(String selector) {
@@ -416,6 +417,7 @@
protected void analyzeMappingModelFromResourceConfig(
List<MappingModel> mappingModelList,
+ MappingResourceConfigList mappingResourceConfigList,
SmooksResourceListType resourceList,
ResourceConfigType resourceConfig, JavaBeanModel source,
JavaBeanModel target) {
@@ -443,8 +445,10 @@
sourceModel = findTheChildJavaBeanModel(newSelector, source);
if (sourceModel != null) {
setSelectorIsUsed(newSelector);
+ mappingResourceConfigList.addResourceConfig(rc);
analyzeMappingModelFromResourceConfig(mappingModelList,
- resourceList, rc, sourceModel, targetModel);
+ mappingResourceConfigList, resourceList, rc,
+ sourceModel, targetModel);
}
}
} else {
@@ -453,14 +457,15 @@
if (sourceModel != null) {
MappingModel model = new MappingModel(sourceModel, targetModel);
FeatureMap it = binding.getAnyAttribute();
- for(int i = 0 ; i < it.size() ; i++){
+ for (int i = 0; i < it.size(); i++) {
EStructuralFeature feature = it.getEStructuralFeature(i);
- if(feature.equals(SmooksModelUtils.ATTRIBUTE_PROPERTY) ||
- feature.equals(SmooksModelUtils.ATTRIBUTE_SELECTOR))
+ if (feature.equals(SmooksModelUtils.ATTRIBUTE_PROPERTY)
+ || feature
+ .equals(SmooksModelUtils.ATTRIBUTE_SELECTOR))
continue;
String pname = feature.getName();
String pvalue = it.get(feature, false).toString();
- PropertyModel pmodel =new PropertyModel();
+ PropertyModel pmodel = new PropertyModel();
pmodel.setName(pname);
pmodel.setValue(pvalue);
model.getProperties().add(pmodel);
17 years, 7 months
JBoss Tools SVN: r10186 - trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-10 22:40:28 -0400 (Wed, 10 Sep 2008)
New Revision: 10186
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java
Log:
some methods are changed
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-09-11 02:39:50 UTC (rev 10185)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-09-11 02:40:28 UTC (rev 10186)
@@ -16,11 +16,13 @@
import java.util.Collections;
import java.util.List;
+import junit.framework.Assert;
import junit.framework.TestCase;
import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.graphical.GraphicalPackage;
import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
@@ -61,8 +63,13 @@
listType, null, classLoader);
Object target = targetModelAnalyzer.buildTargetInputObjects(graph,
listType, null, classLoader);
- List connections = connectionsAnalyzer.analyzeMappingSmooksModel(
- listType, source, target);
+ MappingResourceConfigList configList = connectionsAnalyzer
+ .analyzeMappingSmooksModel(listType, source, target);
+ List connections = configList.getMappingModelList();
+ List relationgConnection = configList
+ .getRelationgResourceConfigList();
+ Assert.assertTrue(!connections.isEmpty());
+ Assert.assertTrue(!relationgConnection.isEmpty());
System.out.println(connections);
} catch (IOException e) {
e.printStackTrace();
17 years, 7 months
JBoss Tools SVN: r10185 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui/editors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-10 22:39:50 -0400 (Wed, 10 Sep 2008)
New Revision: 10185
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
Removed:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksMainContentEditFormPage.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.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
Log:
Add a new FormPage
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-09-11 01:44:28 UTC (rev 10184)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/IMappingAnalyzer.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -23,7 +23,7 @@
public void analyzeMappingGraphModel(
SmooksConfigurationFileGenerateContext context)
throws SmooksAnalyzerException;
- public List<MappingModel> analyzeMappingSmooksModel(
+ public MappingResourceConfigList analyzeMappingSmooksModel(
SmooksResourceListType listType,Object sourceObject,Object targetObject);
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * 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.analyzer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.milyn.xsd.smooks.ResourceConfigType;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 10, 2008
+ */
+public class MappingResourceConfigList {
+ private List<MappingModel> mappingModelList = new ArrayList<MappingModel>();
+ private List<ResourceConfigType> relationgResourceConfigList = new ArrayList<ResourceConfigType>();
+
+ public List<MappingModel> getMappingModelList() {
+ return mappingModelList;
+ }
+
+ public void setMappingModelList(List<MappingModel> mappingModelList) {
+ this.mappingModelList = mappingModelList;
+ }
+
+ public List<ResourceConfigType> getRelationgResourceConfigList() {
+ return relationgResourceConfigList;
+ }
+
+ public void addResourceConfig(ResourceConfigType resourceConfig) {
+ this.getRelationgResourceConfigList().add(resourceConfig);
+ }
+
+ public void removeResourceConfig(ResourceConfigType resourceConfig) {
+ this.getRelationgResourceConfigList().remove(resourceConfig);
+ }
+
+ public void setRelationgResourceConfigList(
+ List<ResourceConfigType> relationgResourceConfigList) {
+ this.relationgResourceConfigList = relationgResourceConfigList;
+ }
+
+ public static MappingResourceConfigList createEmptyList() {
+ MappingResourceConfigList list = new MappingResourceConfigList();
+ list.setMappingModelList(new ArrayList());
+ return list;
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/MappingResourceConfigList.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * 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.analyzer;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.milyn.xsd.smooks.ResourceConfigType;
+import org.milyn.xsd.smooks.ResourceType;
+import org.milyn.xsd.smooks.SmooksResourceListType;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public class NormalSmooksModelBuilder {
+
+ private static NormalSmooksModelBuilder instance = null;
+
+ private NormalSmooksModelBuilder() {
+
+ }
+
+ public NormalSmooksModelPackage buildNormalSmooksModelPackage(
+ SmooksResourceListType list) {
+ NormalSmooksModelPackage modelPackage = new NormalSmooksModelPackage();
+ if (list != null) {
+ List resourceConfigList = list.getAbstractResourceConfig();
+ for (Iterator iterator = resourceConfigList.iterator(); iterator
+ .hasNext();) {
+ ResourceConfigType resourceConfig = (ResourceConfigType) iterator
+ .next();
+ this.processResouceConfig(resourceConfig, modelPackage);
+ }
+ }
+ return modelPackage;
+ }
+
+ protected void processResouceConfig(ResourceConfigType config,
+ NormalSmooksModelPackage modelPackage) {
+ if (isBeanPopulator(config)) {
+ modelPackage.getBeanPopulatorResourceConfigList().add(config);
+ }
+ if (isDateConfig(config)) {
+ modelPackage.getDateResourceConfigList().add(config);
+ }
+ if (isSmooksTransformType(config)) {
+ modelPackage.setSmooksTransformTypeResourceConfig(config);
+ }
+ }
+
+ protected boolean isSmooksTransformType(ResourceConfigType config) {
+ return false;
+ }
+
+ protected boolean isDateConfig(ResourceConfigType config) {
+ return false;
+ }
+
+ protected boolean isBeanPopulator(ResourceConfigType config) {
+ ResourceType resource = config.getResource();
+ if (resource != null) {
+ String resourceString = resource.getValue();
+ return NormalSmooksModelPackage.RESOURCE_CLASS_BEAN_POPULATOR
+ .equals(resourceString);
+ }
+ return false;
+ }
+
+ /**
+ * @return the instace
+ */
+ public synchronized static NormalSmooksModelBuilder getInstance() {
+ if (instance == null) {
+ instance = new NormalSmooksModelBuilder();
+ }
+ return instance;
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * 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.analyzer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.milyn.xsd.smooks.ResourceConfigType;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public class NormalSmooksModelPackage {
+ private List<ResourceConfigType> dateResourceConfigList = new ArrayList<ResourceConfigType>();
+
+ private List<ResourceConfigType> beanPopulatorResourceConfigList = new ArrayList<ResourceConfigType>();
+
+ private ResourceConfigType smooksTransformTypeResourceConfig;
+
+ public static final String RESOURCE_CLASS_BEAN_POPULATOR = "";
+
+ public static final String RESOURCE_CLASS_DATE_POPULATOR = "";
+
+ /**
+ * @return the dateResourceConfigList
+ */
+ public List<ResourceConfigType> getDateResourceConfigList() {
+ return dateResourceConfigList;
+ }
+
+ /**
+ * @param dateResourceConfigList the dateResourceConfigList to set
+ */
+ public void setDateResourceConfigList(
+ List<ResourceConfigType> dateResourceConfigList) {
+ this.dateResourceConfigList = dateResourceConfigList;
+ }
+
+ /**
+ * @return the beanPopulatorResourceConfigList
+ */
+ public List<ResourceConfigType> getBeanPopulatorResourceConfigList() {
+ return beanPopulatorResourceConfigList;
+ }
+
+ /**
+ * @param beanPopulatorResourceConfigList the beanPopulatorResourceConfigList to set
+ */
+ public void setBeanPopulatorResourceConfigList(
+ List<ResourceConfigType> beanPopulatorResourceConfigList) {
+ this.beanPopulatorResourceConfigList = beanPopulatorResourceConfigList;
+ }
+
+ /**
+ * @return the smooksTransformTypeResourceConfig
+ */
+ public ResourceConfigType getSmooksTransformTypeResourceConfig() {
+ return smooksTransformTypeResourceConfig;
+ }
+
+ /**
+ * @param smooksTransformTypeResourceConfig the smooksTransformTypeResourceConfig to set
+ */
+ public void setSmooksTransformTypeResourceConfig(
+ ResourceConfigType smooksTransformTypeResourceConfig) {
+ this.smooksTransformTypeResourceConfig = smooksTransformTypeResourceConfig;
+ }
+
+
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-11 01:44:28 UTC (rev 10184)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/SmooksFileBuilder.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -11,50 +11,59 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
import org.milyn.xsd.smooks.DocumentRoot;
-import org.milyn.xsd.smooks.ParamType;
-import org.milyn.xsd.smooks.ResourceConfigType;
import org.milyn.xsd.smooks.SmooksFactory;
import org.milyn.xsd.smooks.SmooksResourceListType;
-import org.milyn.xsd.smooks.util.SmooksConstants;
-import org.milyn.xsd.smooks.util.SmooksModelUtils;
import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl;
public class SmooksFileBuilder {
+ Resource smooksResource;
+ public Resource getSmooksResource() {
+ return smooksResource;
+ }
+
+ public void setSmooksResource(Resource smooksResource) {
+ this.smooksResource = smooksResource;
+ }
+
public InputStream generateSmooksFile(
SmooksConfigurationFileGenerateContext context,
IProgressMonitor monitor) throws SmooksAnalyzerException,
IOException, CoreException {
AnalyzerFactory factory = AnalyzerFactory.getInstance();
- IMappingAnalyzer analyzer = factory.getMappingAnalyzer(context.getSourceDataTypeID(),
- context.getTargetDataTypeID());
+ IMappingAnalyzer analyzer = factory.getMappingAnalyzer(context
+ .getSourceDataTypeID(), context.getTargetDataTypeID());
- if (analyzer == null)
+ if (analyzer == null) {
throw new SmooksAnalyzerException(
"can't find the Analyzer for sourceID : "
+ context.getSourceDataTypeID()
+ " and the targetID : "
+ context.getTargetDataTypeID());
+ }
+ if(smooksResource == null) {
+ throw new SmooksAnalyzerException("SmooksResource is NULL");
+ }
+ DocumentRoot documentRoot = (DocumentRoot)smooksResource.getContents().get(0);
+ if(documentRoot == null){
+ documentRoot = SmooksFactory.eINSTANCE.createDocumentRoot();
+ smooksResource.getContents().add(documentRoot);
+ }
+
+ SmooksResourceListType listType = documentRoot.getSmooksResourceList();
+ if(listType == null){
+ listType = SmooksFactory.eINSTANCE.createSmooksResourceListType();
+ documentRoot.setSmooksResourceList(listType);
+ }
- SmooksResourceListType listType = SmooksFactory.eINSTANCE
- .createSmooksResourceListType();
- context.setSmooksResourceListModel(listType);
- analyzer.analyzeMappingGraphModel(context);
-
// init the smooksresourcelist
initSmooksParseStyle(context, listType);
- // serialize model to stream
- Resource resource = new SmooksResourceFactoryImpl()
- .createResource(null);
- DocumentRoot dr = SmooksFactory.eINSTANCE.createDocumentRoot();
+ context.setSmooksResourceListModel(listType);
+ analyzer.analyzeMappingGraphModel(context);
- // add all model of the config file
- dr.setSmooksResourceList(listType);
- resource.getContents().add(dr);
-
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- resource.save(outputStream, Collections.EMPTY_MAP);
+ smooksResource.save(outputStream, Collections.EMPTY_MAP);
return new ByteArrayInputStream(outputStream.toByteArray());
}
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-09-11 01:44:28 UTC (rev 10184)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -10,12 +10,32 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.editors;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
+import org.milyn.xsd.smooks.DocumentRoot;
+import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory;
/**
* @author Dart Peng
@@ -25,23 +45,81 @@
ITabbedPropertySheetPageContributor {
SmooksGraphicalFormPage graphicalPage = null;
private TabbedPropertySheetPage tabbedPropertySheetPage;
+ private SmooksNormalContentEditFormPage normalPage;
public static final String EDITOR_ID = "org.jboss.tools.smooks.ui.editors.SmooksFormEditor";
+ private ComposedAdapterFactory adapterFactory;
+ private AdapterFactoryEditingDomain editingDomain;
+ private Resource smooksResource;
+ public SmooksFormEditor() {
+ super();
+ adapterFactory = new ComposedAdapterFactory(
+ ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ adapterFactory
+ .addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory
+ .addAdapterFactory(new SmooksItemProviderAdapterFactory());
+ editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
+ createCommandStack(), new HashMap<Resource, Boolean>());
+ }
+
+ protected CommandStack createCommandStack() {
+ return new BasicCommandStack();
+ }
+
@Override
protected void addPages() {
graphicalPage = new SmooksGraphicalFormPage(this, "graph", "Mapping");
+ normalPage = new SmooksNormalContentEditFormPage(this, "normal",
+ "Normal Edition");
try {
int index = this.addPage(this.graphicalPage);
this.setPageText(index, "Graph");
- SmooksMainContentEditFormPage p = new SmooksMainContentEditFormPage(this,"normal","Normal");
- index = this.addPage( p);
+ index = this.addPage(normalPage);
setPageText(index, "Normal");
} catch (PartInitException e) {
e.printStackTrace();
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.forms.editor.FormEditor#init(org.eclipse.ui.IEditorSite,
+ * org.eclipse.ui.IEditorInput)
+ */
@Override
+ public void init(IEditorSite site, IEditorInput input)
+ throws PartInitException {
+ super.init(site, input);
+ IFile file = ((IFileEditorInput) input).getFile();
+ String path = ResourcesPlugin.getWorkspace().getRoot().getLocation()
+ .append(file.getFullPath()).toString();
+ if (this.getEditingDomain() != null && smooksResource == null) {
+ smooksResource = getEditingDomain().getResourceSet()
+ .createResource(URI.createFileURI(path));
+ if (!smooksResource.isLoaded()) {
+ try {
+ smooksResource.load(Collections.EMPTY_MAP);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+ public void refreshNormalPage() {
+ NormalSmooksModelBuilder builder = NormalSmooksModelBuilder
+ .getInstance();
+ if (smooksResource.getContents().isEmpty())
+ return;
+ DocumentRoot document = (DocumentRoot) smooksResource.getContents()
+ .get(0);
+ NormalSmooksModelPackage modelPackage = builder
+ .buildNormalSmooksModelPackage(document.getSmooksResourceList());
+ }
+
+ @Override
public void doSave(IProgressMonitor monitor) {
graphicalPage.doSave(monitor);
}
@@ -59,7 +137,7 @@
}
public Object getAdapter(Class adapter) {
- if (adapter == IPropertySheetPage.class){
+ if (adapter == IPropertySheetPage.class) {
tabbedPropertySheetPage = new TabbedPropertySheetPage(this);
return tabbedPropertySheetPage;
}
@@ -75,4 +153,27 @@
this.tabbedPropertySheetPage = tabbedPropertySheetPage;
}
+ public AdapterFactoryEditingDomain getEditingDomain() {
+ return editingDomain;
+ }
+
+ public void setEditingDomain(AdapterFactoryEditingDomain editingDomain) {
+ this.editingDomain = editingDomain;
+ }
+
+ /**
+ * @return the smooksResource
+ */
+ public Resource getSmooksResource() {
+ return smooksResource;
+ }
+
+ /**
+ * @param smooksResource
+ * the smooksResource to set
+ */
+ public void setSmooksResource(Resource smooksResource) {
+ this.smooksResource = smooksResource;
+ }
+
}
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-09-11 01:44:28 UTC (rev 10184)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -12,6 +12,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EventObject;
@@ -30,6 +31,8 @@
import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.Resource.IOWrappedException;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.KeyStroke;
@@ -99,6 +102,7 @@
import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer;
import org.jboss.tools.smooks.analyzer.MappingModel;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.analyzer.SmooksFileBuilder;
import org.jboss.tools.smooks.graphical.GraphInformations;
@@ -123,6 +127,8 @@
import org.jboss.tools.smooks.ui.wizards.TransformDataSelectionWizard;
import org.jboss.tools.smooks.utils.UIUtils;
import org.milyn.xsd.smooks.DocumentRoot;
+import org.milyn.xsd.smooks.ResourceConfigType;
+import org.milyn.xsd.smooks.SmooksFactory;
import org.milyn.xsd.smooks.SmooksResourceListType;
import org.milyn.xsd.smooks.util.SmooksConstants;
import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl;
@@ -132,7 +138,8 @@
* @Date Jul 28, 2008
*/
public class SmooksGraphicalFormPage extends FormPage implements
- ISelectionChangedListener, ISelectionProvider {
+ ISelectionChangedListener, ISelectionProvider,
+ org.eclipse.emf.common.command.CommandStackListener {
private static final String REFERENCE_MODEL = "__reference_model";
protected SmooksConfigurationFileGenerateContext smooksConfigurationFileGenerateContext;
protected IViewerInitor sourceViewerInitor;
@@ -141,7 +148,7 @@
protected TreeViewer sourceViewer;
protected SelectionSynchronizer selectionSynchronizer = null;
protected GraphicalViewer graphicalViewer;
- protected DefaultEditDomain editDomain;
+ protected DefaultEditDomain gefEditDomain;
protected GraphRootModel rootModel;
protected Hyperlink sourceLink = null;
protected Hyperlink targetLink = null;
@@ -149,7 +156,7 @@
protected String targetDataTypeID = null;
protected SmooksFileBuilder smooksFileBuilder = null;
protected GraphicalInformationSaver graphicalInformationSaver = null;
-
+ protected Resource smooksResource = null;
protected Object sourceTreeViewerInputModel = null;
protected Object targetTreeViewerInputModel = null;
protected List<MappingModel> initConnectionList = null;
@@ -158,6 +165,8 @@
private List selectionChangeListener = new ArrayList();
private ISelection selection;
+ protected MappingResourceConfigList mappingResourceConfigList;
+ protected AdapterFactoryEditingDomain editingDomain;
public ISelection getSelection() {
return selection;
@@ -178,13 +187,13 @@
public SmooksGraphicalFormPage(FormEditor editor, String id, String title) {
super(editor, id, title);
- editDomain = new DefaultEditDomain(this);
+ gefEditDomain = new DefaultEditDomain(this);
smooksFileBuilder = this.createSmooksFileBulder();
}
public SmooksGraphicalFormPage(String id, String title) {
super(id, title);
- editDomain = new DefaultEditDomain(this);
+ gefEditDomain = new DefaultEditDomain(this);
smooksFileBuilder = this.createSmooksFileBulder();
}
@@ -199,12 +208,39 @@
return this.getEditDomain().getCommandStack();
}
+ protected void pickUpNormalInformation() {
+ SmooksResourceListType list = null;
+ if (!smooksResource.getContents().isEmpty()) {
+ DocumentRoot doc = (DocumentRoot) this.smooksResource.getContents()
+ .get(0);
+ list = doc.getSmooksResourceList();
+ if (mappingResourceConfigList != null) {
+ List<ResourceConfigType> resourceConfigList = mappingResourceConfigList
+ .getRelationgResourceConfigList();
+ for (Iterator iterator = resourceConfigList.iterator(); iterator
+ .hasNext();) {
+ ResourceConfigType resourceConfigType = (ResourceConfigType) iterator
+ .next();
+ list.getAbstractResourceConfig().remove(resourceConfigType);
+ }
+ }
+ } else {
+ DocumentRoot doc = SmooksFactory.eINSTANCE.createDocumentRoot();
+ smooksResource.getContents().add(doc);
+ list = SmooksFactory.eINSTANCE.createSmooksResourceListType();
+ doc.setSmooksResourceList(list);
+ }
+ }
+
+ // protected void notifyParentEditorTransformNormal
+
@Override
protected void createFormContent(IManagedForm managedForm) {
try {
- this.initTansformViewerModel((IEditorSite) getSite(),
+ this.initTransformViewerModel((IEditorSite) getSite(),
getEditorInput());
+ pickUpNormalInformation();
} catch (IOWrappedException ex) {
MessageDialog.openWarning(getSite().getShell(), "Waring",
"Exceptions occurd during parsing Smooks file, no worries");
@@ -739,11 +775,11 @@
}
public DefaultEditDomain getEditDomain() {
- return editDomain;
+ return gefEditDomain;
}
public void setEditDomain(DefaultEditDomain editDomain) {
- this.editDomain = editDomain;
+ this.gefEditDomain = editDomain;
}
public GraphicalViewer getGraphicalViewer() {
@@ -771,7 +807,38 @@
this.targetViewerInitor = targetViewerInitor;
}
- protected void initTansformViewerModel(IEditorSite site, IEditorInput input)
+ protected Resource getSmooksResource() {
+ return smooksResource;
+ }
+
+ protected void analyzeGraphicalModel(SmooksResourceListType listType,
+ GraphInformations graph, IFile file) throws IOException,
+ CoreException, InvocationTargetException {
+ ISourceModelAnalyzer sourceModelAnalyzer = AnalyzerFactory
+ .getInstance().getSourceModelAnalyzer(sourceDataTypeID);
+ ITargetModelAnalyzer targetModelAnalyzer = AnalyzerFactory
+ .getInstance().getTargetModelAnalyzer(targetDataTypeID);
+ IMappingAnalyzer connectionAnalyzer = AnalyzerFactory.getInstance()
+ .getMappingAnalyzer(sourceDataTypeID, targetDataTypeID);
+ if (sourceModelAnalyzer != null)
+ sourceTreeViewerInputModel = sourceModelAnalyzer
+ .buildSourceInputObjects(graph, listType, file);
+ if (targetModelAnalyzer != null)
+ targetTreeViewerInputModel = targetModelAnalyzer
+ .buildTargetInputObjects(graph, listType, file);
+ if (connectionAnalyzer != null) {
+ mappingResourceConfigList = connectionAnalyzer
+ .analyzeMappingSmooksModel(listType,
+ sourceTreeViewerInputModel,
+ targetTreeViewerInputModel);
+ if (mappingResourceConfigList != null) {
+ initConnectionList = mappingResourceConfigList
+ .getMappingModelList();
+ }
+ }
+ }
+
+ protected void initTransformViewerModel(IEditorSite site, IEditorInput input)
throws Throwable {
graphicalInformationSaver = new GraphicalInformationSaver(input);
@@ -782,7 +849,7 @@
} catch (Throwable t) {
// ignore
}
-
+ IFile file = ((IFileEditorInput) input).getFile();
if (sourceDataTypeID == null || targetDataTypeID == null) {
TypeIDSelectionWizard wizard = new TypeIDSelectionWizard();
wizard.setSourceDataTypeID(sourceDataTypeID);
@@ -793,34 +860,16 @@
targetDataTypeID = wizard.getTargetDataTypeID();
}
}
- String path = ResourcesPlugin.getWorkspace().getRoot().getLocation()
- .append(((IFileEditorInput) input).getFile().getFullPath())
- .toString();
- Resource resource = new SmooksResourceFactoryImpl().createResource(URI
- .createFileURI(path));
- resource.load(Collections.EMPTY_MAP);
- ISourceModelAnalyzer sourceModelAnalyzer = AnalyzerFactory
- .getInstance().getSourceModelAnalyzer(sourceDataTypeID);
- ITargetModelAnalyzer targetModelAnalyzer = AnalyzerFactory
- .getInstance().getTargetModelAnalyzer(targetDataTypeID);
- IMappingAnalyzer connectionAnalyzer = AnalyzerFactory.getInstance()
- .getMappingAnalyzer(sourceDataTypeID, targetDataTypeID);
- SmooksResourceListType listType = ((DocumentRoot) resource
- .getContents().get(0)).getSmooksResourceList();
- if (sourceModelAnalyzer != null)
- sourceTreeViewerInputModel = sourceModelAnalyzer
- .buildSourceInputObjects(graph, listType,
- ((IFileEditorInput) input).getFile());
- if (targetModelAnalyzer != null)
- targetTreeViewerInputModel = targetModelAnalyzer
- .buildTargetInputObjects(graph, listType,
- ((IFileEditorInput) input).getFile());
- if (connectionAnalyzer != null) {
- initConnectionList = connectionAnalyzer.analyzeMappingSmooksModel(
- listType, sourceTreeViewerInputModel,
- targetTreeViewerInputModel);
+ smooksResource = this.getSmooksResource();
+ if (smooksResource != null) {
+ if (!smooksResource.isLoaded())
+ smooksResource.load(Collections.EMPTY_MAP);
+ if (smooksResource.getContents().isEmpty())
+ return;
+ SmooksResourceListType listType = ((DocumentRoot) smooksResource
+ .getContents().get(0)).getSmooksResourceList();
+ this.analyzeGraphicalModel(listType, graph, file);
}
-
}
/*
@@ -834,6 +883,14 @@
// if (Registry.INSTANCE.get(GraphicalPackage.eNS_URI) == null) {
Registry.INSTANCE.put(GraphicalPackage.eNS_URI,
GraphicalPackage.eINSTANCE);
+ FormEditor parentEditor = this.getEditor();
+ if (parentEditor instanceof SmooksFormEditor) {
+ editingDomain = ((SmooksFormEditor) parentEditor)
+ .getEditingDomain();
+ smooksResource = ((SmooksFormEditor) parentEditor)
+ .getSmooksResource();
+ }
+
// }
}
@@ -1070,4 +1127,25 @@
this.selectionChangeListener.remove(listener);
}
+ public void commandStackChanged(EventObject event) {
+ commandStackChanged = true;
+ updateSelectionActions();
+ getManagedForm().dirtyStateChanged();
+ }
+
+ /**
+ * @return the editingDomain
+ */
+ protected AdapterFactoryEditingDomain getEditingDomain() {
+ return editingDomain;
+ }
+
+ /**
+ * @param editingDomain
+ * the editingDomain to set
+ */
+ protected void setEditingDomain(AdapterFactoryEditingDomain editingDomain) {
+ this.editingDomain = editingDomain;
+ }
+
}
Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksMainContentEditFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksMainContentEditFormPage.java 2008-09-11 01:44:28 UTC (rev 10184)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksMainContentEditFormPage.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -1,190 +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.ui.editors;
-
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-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.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants;
-import org.jboss.tools.smooks.utils.UIUtils;
-
-/**
- * @author Dart Peng Date : 2008-9-9
- */
-public class SmooksMainContentEditFormPage extends FormPage {
-
- public SmooksMainContentEditFormPage(FormEditor editor, String id,
- String title) {
- super(editor, id, title);
- }
-
- public SmooksMainContentEditFormPage(String id, String title) {
- super(id, title);
- }
-
- @Override
- protected void createFormContent(IManagedForm managedForm) {
- final ScrolledForm form = managedForm.getForm();
- FormToolkit tool = managedForm.getToolkit();
- tool.decorateFormHeading(form.getForm());
- GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(2);
- form.getBody().setLayout(gridLayout);
- Composite rootMainControl = form.getBody();
- form.setText("Normal Page");
- createResourceConfigGUI(rootMainControl, tool);
- createSmooksTypeGUI(rootMainControl, tool);
- createDataTypeGUI(rootMainControl, tool);
- }
-
- protected void createDataTypeGUI(Composite rootMainControl, FormToolkit tool) {
- Section section = tool.createSection(rootMainControl, Section.TITLE_BAR
- | Section.DESCRIPTION);
- section.setText("Data Type");
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- section.setLayoutData(gd);
- Composite dataTypeComposite = tool.createComposite(section);
- section.setClient(dataTypeComposite);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- dataTypeComposite.setLayout(layout);
-
- Composite tableComposite = tool
- .createComposite(dataTypeComposite);
- FillLayout fillLayout = new FillLayout();
- fillLayout.marginHeight = 1;
- fillLayout.marginWidth = 1;
- tableComposite.setLayout(fillLayout);
- TableViewer tableTreeViewer = new TableViewer(tableComposite, SWT.NONE);
- gd = new GridData(GridData.FILL_BOTH);
- tableComposite.setLayoutData(gd);
- tableComposite.setBackground(GraphicsConstants.groupBorderColor);
- tool.paintBordersFor(tableComposite);
-
- Composite buttonComposite = tool
- .createComposite(dataTypeComposite);
- gd = new GridData(GridData.FILL_VERTICAL);
- buttonComposite.setLayoutData(gd);
-
- GridLayout buttonLayout = new GridLayout();
- buttonComposite.setLayout(buttonLayout);
-
- Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- addButton.setLayoutData(gd);
- Button removeButton = tool.createButton(buttonComposite, "Delete",
- SWT.NONE);
- removeButton.setLayoutData(gd);
-
- Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE);
- upButton.setLayoutData(gd);
-
- Button downButton = tool
- .createButton(buttonComposite, "Down", SWT.NONE);
- downButton.setLayoutData(gd);
- }
-
- protected void createResourceConfigGUI(Composite rootMainControl,
- FormToolkit tool) {
- Section section = tool
- .createSection(rootMainControl, Section.TITLE_BAR);
- section.setText("Resource Config");
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.verticalSpan = 2;
- section.setLayoutData(gd);
- Composite resourceConfigComposite = tool.createComposite(section);
- section.setClient(resourceConfigComposite);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- resourceConfigComposite.setLayout(layout);
-
- Composite tableComposite = tool
- .createComposite(resourceConfigComposite);
- FillLayout fillLayout = new FillLayout();
- fillLayout.marginHeight = 1;
- fillLayout.marginWidth = 1;
- tableComposite.setLayout(fillLayout);
- TableViewer tableTreeViewer = new TableViewer(tableComposite, SWT.NONE);
- gd = new GridData(GridData.FILL_BOTH);
- tableComposite.setLayoutData(gd);
- tableComposite.setBackground(GraphicsConstants.groupBorderColor);
- tool.paintBordersFor(tableComposite);
-
- Composite buttonComposite = tool
- .createComposite(resourceConfigComposite);
- gd = new GridData(GridData.FILL_VERTICAL);
- buttonComposite.setLayoutData(gd);
-
- GridLayout buttonLayout = new GridLayout();
- buttonComposite.setLayout(buttonLayout);
-
- Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- addButton.setLayoutData(gd);
- Button removeButton = tool.createButton(buttonComposite, "Delete",
- SWT.NONE);
- removeButton.setLayoutData(gd);
-
- Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE);
- upButton.setLayoutData(gd);
-
- Button downButton = tool
- .createButton(buttonComposite, "Down", SWT.NONE);
- downButton.setLayoutData(gd);
-
- }
-
- protected void createSmooksTypeGUI(Composite mainComposite, FormToolkit tool) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- Section section = tool.createSection(mainComposite, Section.TITLE_BAR);
- section.setLayoutData(gd);
- Composite typeSelectComposite = tool.createComposite(section);
- section.setClient(typeSelectComposite);
- section.setText("Smooks Parse Type");
- GridLayout layout1 = new GridLayout();
- typeSelectComposite.setLayout(layout1);
-
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- typeSelectComposite.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- typeSelectComposite.setLayout(layout);
-
- 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;
- }
-
-}
Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java (from rev 10161, trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksMainContentEditFormPage.java)
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-11 02:39:50 UTC (rev 10185)
@@ -0,0 +1,208 @@
+/*******************************************************************************
+ * 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.ui.editors;
+
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+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.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
+import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants;
+import org.jboss.tools.smooks.utils.UIUtils;
+
+/**
+ * @author Dart Peng Date : 2008-9-9
+ */
+public class SmooksNormalContentEditFormPage extends FormPage {
+
+ protected NormalSmooksModelPackage modelPackage = null;
+
+ public SmooksNormalContentEditFormPage(FormEditor editor, String id,
+ String title) {
+ super(editor, id, title);
+ }
+
+ public SmooksNormalContentEditFormPage(String id, String title) {
+ super(id, title);
+ }
+
+ @Override
+ protected void createFormContent(IManagedForm managedForm) {
+ final ScrolledForm form = managedForm.getForm();
+ FormToolkit tool = managedForm.getToolkit();
+ tool.decorateFormHeading(form.getForm());
+ GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(2);
+ form.getBody().setLayout(gridLayout);
+ Composite rootMainControl = form.getBody();
+ form.setText("Normal Page");
+ createResourceConfigGUI(rootMainControl, tool);
+ createSmooksTypeGUI(rootMainControl, tool);
+ createDataTypeGUI(rootMainControl, tool);
+ }
+
+ protected void createDataTypeGUI(Composite rootMainControl, FormToolkit tool) {
+ Section section = tool.createSection(rootMainControl, Section.TITLE_BAR
+ | Section.DESCRIPTION);
+ section.setText("Data Type");
+
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ section.setLayoutData(gd);
+ Composite dataTypeComposite = tool.createComposite(section);
+ section.setClient(dataTypeComposite);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ layout.marginHeight = 0;
+ layout.marginWidth = 0;
+ dataTypeComposite.setLayout(layout);
+
+ Composite tableComposite = tool
+ .createComposite(dataTypeComposite);
+ FillLayout fillLayout = new FillLayout();
+ fillLayout.marginHeight = 1;
+ fillLayout.marginWidth = 1;
+ tableComposite.setLayout(fillLayout);
+ TableViewer tableTreeViewer = new TableViewer(tableComposite, SWT.NONE);
+ gd = new GridData(GridData.FILL_BOTH);
+ tableComposite.setLayoutData(gd);
+ tableComposite.setBackground(GraphicsConstants.groupBorderColor);
+ tool.paintBordersFor(tableComposite);
+
+ Composite buttonComposite = tool
+ .createComposite(dataTypeComposite);
+ gd = new GridData(GridData.FILL_VERTICAL);
+ buttonComposite.setLayoutData(gd);
+
+ GridLayout buttonLayout = new GridLayout();
+ buttonComposite.setLayout(buttonLayout);
+
+ Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ addButton.setLayoutData(gd);
+ Button removeButton = tool.createButton(buttonComposite, "Delete",
+ SWT.NONE);
+ removeButton.setLayoutData(gd);
+
+ Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE);
+ upButton.setLayoutData(gd);
+
+ Button downButton = tool
+ .createButton(buttonComposite, "Down", SWT.NONE);
+ downButton.setLayoutData(gd);
+ }
+
+ protected void createResourceConfigGUI(Composite rootMainControl,
+ FormToolkit tool) {
+ Section section = tool
+ .createSection(rootMainControl, Section.TITLE_BAR);
+ section.setText("Resource Config");
+
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.verticalSpan = 2;
+ section.setLayoutData(gd);
+ Composite resourceConfigComposite = tool.createComposite(section);
+ section.setClient(resourceConfigComposite);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ layout.marginHeight = 0;
+ layout.marginWidth = 0;
+ resourceConfigComposite.setLayout(layout);
+
+ Composite tableComposite = tool
+ .createComposite(resourceConfigComposite);
+ FillLayout fillLayout = new FillLayout();
+ fillLayout.marginHeight = 1;
+ fillLayout.marginWidth = 1;
+ tableComposite.setLayout(fillLayout);
+ TableViewer tableTreeViewer = new TableViewer(tableComposite, SWT.NONE);
+ gd = new GridData(GridData.FILL_BOTH);
+ tableComposite.setLayoutData(gd);
+ tableComposite.setBackground(GraphicsConstants.groupBorderColor);
+ tool.paintBordersFor(tableComposite);
+
+ Composite buttonComposite = tool
+ .createComposite(resourceConfigComposite);
+ gd = new GridData(GridData.FILL_VERTICAL);
+ buttonComposite.setLayoutData(gd);
+
+ GridLayout buttonLayout = new GridLayout();
+ buttonComposite.setLayout(buttonLayout);
+
+ Button addButton = tool.createButton(buttonComposite, "New", SWT.NONE);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ addButton.setLayoutData(gd);
+ Button removeButton = tool.createButton(buttonComposite, "Delete",
+ SWT.NONE);
+ removeButton.setLayoutData(gd);
+
+ Button upButton = tool.createButton(buttonComposite, "Up", SWT.NONE);
+ upButton.setLayoutData(gd);
+
+ Button downButton = tool
+ .createButton(buttonComposite, "Down", SWT.NONE);
+ downButton.setLayoutData(gd);
+
+ }
+
+ protected void createSmooksTypeGUI(Composite mainComposite, FormToolkit tool) {
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ Section section = tool.createSection(mainComposite, Section.TITLE_BAR);
+ section.setLayoutData(gd);
+ Composite typeSelectComposite = tool.createComposite(section);
+ section.setClient(typeSelectComposite);
+ section.setText("Smooks Parse Type");
+ GridLayout layout1 = new GridLayout();
+ typeSelectComposite.setLayout(layout1);
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ typeSelectComposite.setLayoutData(gd);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 3;
+ typeSelectComposite.setLayout(layout);
+
+ 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;
+ }
+
+ /**
+ * @return the modelPackage
+ */
+ public NormalSmooksModelPackage getModelPackage() {
+ return modelPackage;
+ }
+
+ /**
+ * @param modelPackage the modelPackage to set
+ */
+ public void setModelPackage(NormalSmooksModelPackage modelPackage) {
+ if(modelPackage == this.modelPackage) return;
+ this.modelPackage = modelPackage;
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 7 months
JBoss Tools SVN: r10184 - trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-10 21:44:28 -0400 (Wed, 10 Sep 2008)
New Revision: 10184
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
change the name of a method
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-10 22:00:31 UTC (rev 10183)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-11 01:44:28 UTC (rev 10184)
@@ -16,7 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.jboss.tools.smooks.analyzer.AbstractAnalyzer;
-import org.jboss.tools.smooks.analyzer.MappingModel;
+import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
@@ -203,7 +203,7 @@
return null;
}
- public List<MappingModel> analyzeMappingSmooksModel(
+ public MappingResourceConfigList analyzeMappingSmooksModel(
SmooksResourceListType listType, Object sourceObject,
Object targetObject) {
// TODO Auto-generated method stub
17 years, 7 months
JBoss Tools SVN: r10183 - in trunk/smooks/plugins/org.jboss.tools.smooks.javabean: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-10 18:00:31 -0400 (Wed, 10 Sep 2008)
New Revision: 10183
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties
Log:
manifest runtime configuration fix
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-09-10 21:38:03 UTC (rev 10182)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-09-10 22:00:31 UTC (rev 10183)
@@ -24,3 +24,4 @@
org.jboss.tools.smooks.javabean.commandprocessor,
org.jboss.tools.smooks.javabean.model,
org.jboss.tools.smooks.javabean.ui
+Bundle-ClassPath: .
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties 2008-09-10 21:38:03 UTC (rev 10182)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties 2008-09-10 22:00:31 UTC (rev 10183)
@@ -1,4 +1,15 @@
output.. = bin/
bin.includes = META-INF/,\
plugin.xml,\
- icons/
+ icons/,\
+ .
+jars.compile.order = smooks-javabean.jar
+output.smooks-javabean.jar = bin/
+src.includes = src/,\
+ plugin.xml,\
+ icons/,\
+ build.properties,\
+ META-INF/,\
+ .project,\
+ .classpath
+source.. = src/
17 years, 7 months
JBoss Tools SVN: r10182 - trunk/smooks/plugins/org.jboss.tools.smooks.javabean.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-10 17:38:03 -0400 (Wed, 10 Sep 2008)
New Revision: 10182
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath
Log:
jar files removed from .classpath to fix compilation problems after jars where removed http://fisheye.jboss.com/changelog/JBossTools?cs=10166&csize=11
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath 2008-09-10 16:57:26 UTC (rev 10181)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath 2008-09-10 21:38:03 UTC (rev 10182)
@@ -3,16 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="lib" path="libs/commons-beanutils-1.8.0-BETA.jar"/>
- <classpathentry kind="lib" path="libs/commons-beanutils-1.8.0-BETA-javadoc.jar"/>
- <classpathentry kind="lib" path="libs/commons-beanutils-1.8.0-BETA-sources.jar"/>
- <classpathentry kind="lib" path="libs/commons-beanutils-bean-collections-1.8.0-BETA.jar"/>
- <classpathentry kind="lib" path="libs/commons-beanutils-core-1.8.0-BETA.jar"/>
- <classpathentry kind="lib" path="libs/commons-logging-1.1.1.jar"/>
- <classpathentry kind="lib" path="libs/commons-logging-1.1.1-javadoc.jar"/>
- <classpathentry kind="lib" path="libs/commons-logging-1.1.1-sources.jar"/>
- <classpathentry kind="lib" path="libs/commons-logging-adapters-1.1.1.jar"/>
- <classpathentry kind="lib" path="libs/commons-logging-api-1.1.1.jar"/>
- <classpathentry kind="lib" path="libs/commons-logging-tests.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
17 years, 7 months
JBoss Tools SVN: r10181 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-09-10 12:57:26 -0400 (Wed, 10 Sep 2008)
New Revision: 10181
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2611
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java 2008-09-10 14:17:09 UTC (rev 10180)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/xpl/PagesConnectionRouter.java 2008-09-10 16:57:26 UTC (rev 10181)
@@ -19,7 +19,9 @@
import org.eclipse.draw2d.IFigure;
//import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.geometry.*;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
import org.jboss.tools.seam.ui.pages.editor.figures.ConnectionFigure;
+import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.PageFigure;
@@ -65,24 +67,48 @@
min = max;
max = r + (r-max);
}
+
if(flag){
+ if(conn.getTargetAnchor().getOwner() != null){
+ IFigure fig = conn.getTargetAnchor().getOwner();
+ PagesElement element=null;
+ if(fig instanceof PageFigure)
+ element = ((PageFigure)fig).page;
+ else if(fig instanceof ExceptionFigure)
+ element = ((ExceptionFigure)fig).exc;
+ if(element != null){
+ index = element.getInputLinks().indexOf(((ConnectionFigure)conn).getLinkModel());
+ size = element.getInputLinks().size();
+ }else flag = false;
+ }else flag = false;
+ if(flag && size > 1){
+ int value = max-20-(size-index)*STEP;
+ if(value <= min) return min+STEP;
+ if(value >= max) return max-STEP;
+ return value;
+ }
+ size = 0;
+ flag = true;
if(conn.getSourceAnchor().getOwner() != null){
IFigure fig = conn.getSourceAnchor().getOwner();
- PageFigure group=null;
- if(fig instanceof PageFigure)group = (PageFigure)fig;
- else if(fig instanceof PageFigure)group = (PageFigure)fig.getParent();
- if(group != null){
- index = group.page.getOutputLinks().indexOf(((ConnectionFigure)conn).getLinkModel());
- size = group.page.getOutputLinks().size();
+ PagesElement element=null;
+ if(fig instanceof PageFigure)
+ element = ((PageFigure)fig).page;
+ else if(fig instanceof ExceptionFigure)
+ element = ((ExceptionFigure)fig).exc;
+ if(element != null){
+ index = element.getOutputLinks().indexOf(((ConnectionFigure)conn).getLinkModel());
+ size = element.getOutputLinks().size();
}else flag = false;
}else flag = false;
+ if(flag){
+ int value = min+100+(size-index)*STEP-size/2*STEP;
+ if(value <= min) return min+STEP;
+ if(value >= max) return max-STEP;
+ return value;
+ }
}
- if(flag){
- int value = min+100+(size-index)*STEP-size/2*STEP;
- if(value <= min) return min+STEP;
- if(value >= max) return max-STEP;
- return value;
- }
+
int proximity = 0;
int direction = -1;
if (r%2 == 1)
17 years, 7 months
JBoss Tools SVN: r10180 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-10 10:17:09 -0400 (Wed, 10 Sep 2008)
New Revision: 10180
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/ElementGeneratorFactory.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/JSPTagProposalFactory.java
Log:
JBIDE-2725
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/ElementGeneratorFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/ElementGeneratorFactory.java 2008-09-10 13:59:51 UTC (rev 10179)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/ElementGeneratorFactory.java 2008-09-10 14:17:09 UTC (rev 10180)
@@ -42,6 +42,10 @@
IElementGenerator fInstance = DEFAULT_ELEMENT_GENERATOR;
try {
Class fClass = (Class)generatorMap.get(uri);
+ if(fClass == null) {
+ //No need to report, just there is no specific generator for this uri
+ return fInstance;
+ }
fInstance = (IElementGenerator)fClass.newInstance();
} catch (InstantiationException e) {
ModelUIPlugin.getPluginLog().logError(e);
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/JSPTagProposalFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/JSPTagProposalFactory.java 2008-09-10 13:59:51 UTC (rev 10179)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/JSPTagProposalFactory.java 2008-09-10 14:17:09 UTC (rev 10180)
@@ -35,6 +35,10 @@
ITagProposalLoader fInstance = DEFAULT_PROPOSAL_LOADER;
try {
String fClassName = (String)loaderMap.get(mimeType);
+ if(fClassName == null) {
+ //No need to report, just there is no specific proposal loader for this myme type.
+ return fInstance;
+ }
Class newClass = this.getClass().getClassLoader().loadClass(fClassName);
fInstance = (ITagProposalLoader)newClass.newInstance();
} catch (InstantiationException e) {
17 years, 7 months
JBoss Tools SVN: r10179 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/1805 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-09-10 09:59:51 -0400 (Wed, 10 Sep 2008)
New Revision: 10179
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1805/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1805/test.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1805
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1805/test.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1805/test.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1805/test.xhtml 2008-09-10 13:59:51 UTC (rev 10179)
@@ -0,0 +1,9 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+<body>
+<span id="invisibleElement"> <f:converter /> </span>
+</body>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-09-10 13:50:48 UTC (rev 10178)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-09-10 13:59:51 UTC (rev 10179)
@@ -25,6 +25,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1720Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1730Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1744Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1805Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2010Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2119Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2219Test;
@@ -94,6 +95,7 @@
suite.addTestSuite(JBIDE924Test.class);
suite.addTestSuite(JBIDE2526Test.class);
suite.addTestSuite(JBIDE2624.class);
+ suite.addTestSuite(JBIDE1805Test.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2008-09-10 13:59:51 UTC (rev 10179)
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
+
+/**
+ * @author Sergey Dzmitrovich
+ *
+ */
+public class JBIDE1805Test extends VpeTest {
+
+ private static final String TEST_PAGE = "JBIDE/1805/test.xhtml"; //$NON-NLS-1$
+ private static final String ELEMENT_WRAPPER_ID = "invisibleElement"; //$NON-NLS-1$
+
+ public JBIDE1805Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE924() throws Throwable {
+
+ // get test page path
+ setException(null);
+
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE,
+ JsfAllTests.IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file " + file.getFullPath(), //$NON-NLS-1$
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ VpeController vpeController = getVpeController(part);
+ assertNotNull(vpeController);
+
+ // set show invisible tag's flag to false
+ vpeController.getVisualBuilder().setShowInvisibleTags(false);
+ // refresh vpe
+ vpeController.visualRefresh();
+
+ TestUtil.waitForIdle();
+
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ assertNotNull(document);
+ // get element
+ nsIDOMElement element = document.getElementById(ELEMENT_WRAPPER_ID);
+ assertNotNull(element);
+ // element must have not children
+
+ assertEquals(0, countElementsChildren(element.getChildNodes()));
+
+ // set show invisible tag's flag to true
+ vpeController.getVisualBuilder().setShowInvisibleTags(true);
+ vpeController.visualRefresh();
+
+ TestUtil.waitForIdle();
+ document = getVpeVisualDocument(part);
+ assertNotNull(document);
+ // get element
+ element = document.getElementById(ELEMENT_WRAPPER_ID);
+
+ assertEquals(1, countElementsChildren(element.getChildNodes()));
+
+ if (getException() != null) {
+
+ throw getException();
+ }
+ }
+
+ private int countElementsChildren(nsIDOMNodeList list) {
+
+ int count = 0;
+ for (int i = 0; i < list.getLength(); i++) {
+ nsIDOMNode child = list.item(i);
+ if (child.getNodeType() == nsIDOMNode.ELEMENT_NODE)
+ count++;
+ }
+
+ return count;
+ }
+
+}
17 years, 7 months
JBoss Tools SVN: r10178 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-10 09:50:48 -0400 (Wed, 10 Sep 2008)
New Revision: 10178
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java
Log:
JBIDE-2727
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2008-09-10 13:13:07 UTC (rev 10177)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2008-09-10 13:50:48 UTC (rev 10178)
@@ -133,7 +133,9 @@
public void update() {
IPreferenceStore newStore = null;
super.update();
- newStore = (fOccurrencePreferenceProvider == null ? null : fOccurrencePreferenceProvider.getOccurrencePreferenceProvider().getPreferenceStore());
+ newStore = ((fOccurrencePreferenceProvider == null
+ || fOccurrencePreferenceProvider.getOccurrencePreferenceProvider() == null)
+ ? null : fOccurrencePreferenceProvider.getOccurrencePreferenceProvider().getPreferenceStore());
if (newStore != fPreferenceStore) {
if (fPreferenceStore != null)
fPreferenceStore.removePropertyChangeListener(this);
17 years, 7 months