JBoss Tools SVN: r10197 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-11 05:49:31 -0400 (Thu, 11 Sep 2008)
New Revision: 10197
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java
Log:
JBIDE-2727
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2008-09-11 09:29:22 UTC (rev 10196)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2008-09-11 09:49:31 UTC (rev 10197)
@@ -256,6 +256,15 @@
if(a != null) registered.put(id, a);
}
+ public void dispose() {
+ if (fToggleOccurencesMarkUp != null) {
+ fToggleOccurencesMarkUp.setEditor(null);
+ fToggleOccurencesMarkUp = null;
+ }
+ super.dispose();
+ }
+
+
protected class AFakeTextEditor implements ITextEditor, ITextOperationTarget {
protected HashMap<String,IAction> actions = new HashMap<String,IAction>();
17 years, 7 months
JBoss Tools SVN: r10196 - 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-11 05:29:22 -0400 (Thu, 11 Sep 2008)
New Revision: 10196
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java
Log:
add some codes for testing NormalSmooksModelBuilder
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 09:28:47 UTC (rev 10195)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-09-11 09:29:22 UTC (rev 10196)
@@ -14,14 +14,20 @@
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.emf.ecore.EPackage.Registry;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder;
import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
@@ -32,6 +38,7 @@
import org.milyn.xsd.smooks.DocumentRoot;
import org.milyn.xsd.smooks.SmooksPackage;
import org.milyn.xsd.smooks.SmooksResourceListType;
+import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory;
import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl;
/**
@@ -41,15 +48,30 @@
private GraphInformations graph;
private Resource resource;
-
+ private ComposedAdapterFactory adapterFactory;
+ private AdapterFactoryEditingDomain editingDomain;
+ private Resource smooksResource;
+ protected CommandStack createCommandStack() {
+ return new BasicCommandStack();
+ }
public SmooksAnalyzerTester() throws IOException {
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>());
+
+
ClassLoader classLoader = SmooksAnalyzerTester.class.getClassLoader();
Registry.INSTANCE.put(GraphicalPackage.eNS_URI,
GraphicalPackage.eINSTANCE);
Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
- resource = new SmooksResourceFactoryImpl().createResource(null);
+ resource = editingDomain.getResourceSet().createResource(null);
Resource gr = new XMLResourceFactoryImpl().createResource(null);
InputStream stream1 = classLoader
.getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml");
@@ -117,6 +139,7 @@
}
public void testGenerateNormalInforPackage(){
+ eraserMappingResourceConfig();
generateNormalInforPackage();
}
}
17 years, 7 months
JBoss Tools SVN: r10195 - 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-11 05:28:47 -0400 (Thu, 11 Sep 2008)
New Revision: 10195
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
Modified:
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/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
Log:
Add a Master/Details formpage
Modified: 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 2008-09-11 09:20:50 UTC (rev 10194)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelBuilder.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -16,6 +16,7 @@
import org.milyn.xsd.smooks.ResourceConfigType;
import org.milyn.xsd.smooks.ResourceType;
import org.milyn.xsd.smooks.SmooksResourceListType;
+import org.milyn.xsd.smooks.util.SmooksConstants;
/**
* @author Dart Peng<br>
@@ -58,19 +59,35 @@
}
protected boolean isSmooksTransformType(ResourceConfigType config) {
+ if (config == null)
+ return false;
+ String selector = config.getSelector();
+ if (selector != null) {
+ return SmooksConstants.GLOBAL_PARAMETERS.equals(selector.trim());
+ }
return false;
}
protected boolean isDateConfig(ResourceConfigType config) {
+ if (config == null)
+ return false;
+ ResourceType resource = config.getResource();
+ if (resource != null) {
+ String r = resource.getValue();
+ if(r != null)
+ return SmooksConstants.DATE_DECODER.equals(r.trim());
+ }
return false;
}
protected boolean isBeanPopulator(ResourceConfigType config) {
+ if (config == null)
+ return false;
ResourceType resource = config.getResource();
if (resource != null) {
String resourceString = resource.getValue();
- return NormalSmooksModelPackage.RESOURCE_CLASS_BEAN_POPULATOR
- .equals(resourceString);
+ if(resourceString != null)
+ return SmooksConstants.BEAN_POPULATOR.equals(resourceString.trim());
}
return false;
}
Modified: 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 2008-09-11 09:20:50 UTC (rev 10194)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/NormalSmooksModelPackage.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -25,10 +25,6 @@
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
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * 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.ISelection;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.IDetailsPage;
+import org.eclipse.ui.forms.IFormPart;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public abstract class AbstractSmooksModelDetailPage implements IDetailsPage {
+ IFormPart formPart;
+ ISelection selection;
+ FormToolkit formToolKit = null;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
+ */
+ public void createContents(Composite parent) {
+ parent.setLayout(new FillLayout());
+ Section section = formToolKit.createSection(parent, Section.DESCRIPTION|Section.TITLE_BAR);
+ section.setText("Details Information");
+
+ Composite client = formToolKit.createComposite(section);
+ section.setLayout(new FillLayout());
+
+ section.setClient(client);
+ }
+
+ abstract protected void createSectionContents(Composite parent);
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#commit(boolean)
+ */
+ public void commit(boolean onSave) {
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#dispose()
+ */
+ public void dispose() {
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
+ */
+ public void initialize(IManagedForm form) {
+ if(form != null){
+ formToolKit = form.getToolkit();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#isDirty()
+ */
+ public boolean isDirty() {
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#isStale()
+ */
+ public boolean isStale() {
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#refresh()
+ */
+ public void refresh() {
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#setFocus()
+ */
+ public void setFocus() {
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IFormPart#setFormInput(java.lang.Object)
+ */
+ public boolean setFormInput(Object input) {
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
+ */
+ public void selectionChanged(IFormPart part, ISelection selection) {
+ this.selection = selection;
+ formPart = part;
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.swt.widgets.Composite;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public class BeanPopulatorDetailPage extends AbstractSmooksModelDetailPage {
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#createSectionContents(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected void createSectionContents(Composite parent) {
+
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * 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 java.util.List;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public class DateTypeContentProvider implements ITreeContentProvider {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+ */
+ public Object[] getChildren(Object parentElement) {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+ */
+ public Object getParent(Object element) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+ */
+ public boolean hasChildren(Object element) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+ */
+ public Object[] getElements(Object inputElement) {
+ if(inputElement instanceof List){
+ return ((List)inputElement).toArray();
+ }
+ return new Object[]{};
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+ */
+ public void dispose() {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+ */
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeContentProvider.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-09-11 09:20:50 UTC (rev 10194)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -36,6 +36,7 @@
import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
import org.milyn.xsd.smooks.DocumentRoot;
import org.milyn.xsd.smooks.provider.SmooksItemProviderAdapterFactory;
+import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl;
/**
* @author Dart Peng
@@ -70,11 +71,11 @@
@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");
+ normalPage = new SmooksNormalContentEditFormPage(this, "normal",
+ "Normal Edition",null);
index = this.addPage(normalPage);
setPageText(index, "Normal");
} catch (PartInitException e) {
@@ -96,8 +97,8 @@
String path = ResourcesPlugin.getWorkspace().getRoot().getLocation()
.append(file.getFullPath()).toString();
if (this.getEditingDomain() != null && smooksResource == null) {
- smooksResource = getEditingDomain().getResourceSet()
- .createResource(URI.createFileURI(path));
+ smooksResource = new SmooksResourceFactoryImpl().createResource(URI
+ .createFileURI(path));
if (!smooksResource.isLoaded()) {
try {
smooksResource.load(Collections.EMPTY_MAP);
@@ -109,14 +110,22 @@
}
public void refreshNormalPage() {
+ NormalSmooksModelPackage modelPackage = createSmooksModelPackage();
+ if (this.normalPage != null) {
+ normalPage.setModelPackage(modelPackage);
+ }
+ }
+
+ protected NormalSmooksModelPackage createSmooksModelPackage() {
NormalSmooksModelBuilder builder = NormalSmooksModelBuilder
.getInstance();
if (smooksResource.getContents().isEmpty())
- return;
+ return null;
DocumentRoot document = (DocumentRoot) smooksResource.getContents()
.get(0);
NormalSmooksModelPackage modelPackage = builder
.buildNormalSmooksModelPackage(document.getSmooksResourceList());
+ return modelPackage;
}
@Override
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 09:20:50 UTC (rev 10194)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -103,6 +103,7 @@
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.ResourceConfigEraser;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.analyzer.SmooksFileBuilder;
import org.jboss.tools.smooks.graphical.GraphInformations;
@@ -208,29 +209,28 @@
return this.getEditDomain().getCommandStack();
}
- protected void pickUpNormalInformation() {
+ protected void cleanMappingResourceConfig() {
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);
- }
- }
+ ResourceConfigEraser eraser = new ResourceConfigEraser();
+ eraser.cleanMappingResourceConfig(list, mappingResourceConfigList,
+ this.editingDomain);
} else {
DocumentRoot doc = SmooksFactory.eINSTANCE.createDocumentRoot();
smooksResource.getContents().add(doc);
list = SmooksFactory.eINSTANCE.createSmooksResourceListType();
doc.setSmooksResourceList(list);
}
+ callParentRefillNormalModelInfor();
}
+
+ private void callParentRefillNormalModelInfor(){
+ SmooksFormEditor editor = (SmooksFormEditor)getEditor();
+ editor.refreshNormalPage();
+ }
// protected void notifyParentEditorTransformNormal
@@ -240,7 +240,7 @@
try {
this.initTransformViewerModel((IEditorSite) getSite(),
getEditorInput());
- pickUpNormalInformation();
+ cleanMappingResourceConfig();
} catch (IOWrappedException ex) {
MessageDialog.openWarning(getSite().getShell(), "Waring",
"Exceptions occurd during parsing Smooks file, no worries");
@@ -848,6 +848,7 @@
initFormEditorWithGraphInfo(graph);
} catch (Throwable t) {
// ignore
+ t.printStackTrace();
}
IFile file = ((IFileEditorInput) input).getFile();
if (sourceDataTypeID == null || targetDataTypeID == null) {
@@ -880,9 +881,6 @@
*/
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
- // 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)
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-09-11 09:20:50 UTC (rev 10194)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -10,9 +10,7 @@
******************************************************************************/
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;
@@ -24,7 +22,6 @@
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;
/**
@@ -33,136 +30,43 @@
public class SmooksNormalContentEditFormPage extends FormPage {
protected NormalSmooksModelPackage modelPackage = null;
-
+
+ protected SmooksResourceConfigFormBlock resourceBlock = null;
+
public SmooksNormalContentEditFormPage(FormEditor editor, String id,
- String title) {
+ String title, NormalSmooksModelPackage modelPacakge) {
super(editor, id, title);
+ this.setModelPackage(modelPacakge);
+ resourceBlock = new SmooksResourceConfigFormBlock();
}
- public SmooksNormalContentEditFormPage(String id, String title) {
+ public SmooksNormalContentEditFormPage(String id, String title,
+ NormalSmooksModelPackage modelPacakge) {
super(id, title);
+ this.setModelPackage(modelPackage);
+ resourceBlock = new SmooksResourceConfigFormBlock();
}
-
+
@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);
+ GridLayout gridLayout = UIUtils.createGeneralFormEditorLayout(1);
+ resourceBlock.createContent(managedForm);
Composite rootMainControl = form.getBody();
form.setText("Normal Page");
- createResourceConfigGUI(rootMainControl, tool);
createSmooksTypeGUI(rootMainControl, tool);
- createDataTypeGUI(rootMainControl, tool);
+ form.getBody().setLayout(gridLayout);
+ form.pack();
+
+ resourceBlock.initViewers();
}
- 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 section = tool.createSection(mainComposite, Section.TITLE_BAR
+ | Section.DESCRIPTION | Section.TWISTIE);
section.setLayoutData(gd);
Composite typeSelectComposite = tool.createComposite(section);
section.setClient(typeSelectComposite);
@@ -198,11 +102,14 @@
}
/**
- * @param modelPackage the modelPackage to set
+ * @param modelPackage
+ * the modelPackage to set
*/
public void setModelPackage(NormalSmooksModelPackage modelPackage) {
- if(modelPackage == this.modelPackage) return;
+ if (modelPackage == this.modelPackage)
+ return;
this.modelPackage = modelPackage;
+ this.resourceBlock.setModelPackage(this.modelPackage);
}
}
Added: 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 (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-11 09:28:47 UTC (rev 10195)
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * 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 java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+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.DetailsPart;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.MasterDetailsBlock;
+import org.eclipse.ui.forms.SectionPart;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+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.milyn.xsd.smooks.impl.ResourceConfigTypeImpl;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public class SmooksResourceConfigFormBlock extends MasterDetailsBlock {
+
+ TreeViewer dateTypeViewer;
+
+ NormalSmooksModelPackage modelPackage = null;
+
+ public NormalSmooksModelPackage getModelPackage() {
+ return modelPackage;
+ }
+
+ public void setModelPackage(NormalSmooksModelPackage modelPackage) {
+ this.modelPackage = modelPackage;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @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) {
+ FormToolkit tool = managedForm.getToolkit();
+ createDataTypeGUI(parent, tool, managedForm);
+ configDateTypeViewer();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.forms.MasterDetailsBlock#createToolBarActions(org.eclipse.ui.forms.IManagedForm)
+ */
+ @Override
+ protected void createToolBarActions(IManagedForm managedForm) {
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.forms.MasterDetailsBlock#registerPages(org.eclipse.ui.forms.DetailsPart)
+ */
+ @Override
+ protected void registerPages(DetailsPart detailsPart) {
+ detailsPart.registerPage(ResourceConfigTypeImpl.class,
+ new BeanPopulatorDetailPage());
+ }
+
+ protected void configDateTypeViewer() {
+ dateTypeViewer.setContentProvider(new DateTypeContentProvider());
+ }
+
+ public void initViewers() {
+ if (this.getModelPackage() != null) {
+ List all = new ArrayList();
+ List list = modelPackage.getBeanPopulatorResourceConfigList();
+ if (list != null) {
+ all.addAll(list);
+ }
+ List dl = modelPackage.getDateResourceConfigList();
+ if (dl != null) {
+ all.addAll(dl);
+ }
+
+ dateTypeViewer.setInput(all);
+ }
+ }
+
+ protected void createDataTypeGUI(Composite rootMainControl,
+ FormToolkit tool, final IManagedForm managedForm) {
+ Section section = tool.createSection(rootMainControl, Section.TITLE_BAR
+ | Section.DESCRIPTION);
+ section.setText("Data Type");
+ final SectionPart spart = new SectionPart(section);
+ managedForm.addPart(spart);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ 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);
+ dateTypeViewer = new TreeViewer(tableComposite, SWT.NONE);
+ dateTypeViewer
+ .addSelectionChangedListener(new ISelectionChangedListener() {
+
+ public void selectionChanged(SelectionChangedEvent event) {
+ managedForm.fireSelectionChanged(spart, event
+ .getSelection());
+ }
+
+ });
+ 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);
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 7 months
JBoss Tools SVN: r10194 - 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-11 05:20:50 -0400 (Thu, 11 Sep 2008)
New Revision: 10194
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-11 07:36:58 UTC (rev 10193)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2008-09-11 09:20:50 UTC (rev 10194)
@@ -56,6 +56,10 @@
*/
public void setEditor(ITextEditor editor) {
super.setEditor(editor);
+ if(editor == null) {
+ dispose();
+ return;
+ }
fOccurrencePreferenceProvider = null;
StructuredTextEditor sse = getStructuredTextEditor(getTextEditor());
if (sse != null && sse instanceof IOccurrencePreferenceProvider) {
@@ -126,6 +130,7 @@
fPreferenceStore.setValue(fKey, !markOccurences);
}
+ static int listenerCount = 0;
/**
* Enables and initialzies the action, or disables.
* @see org.eclipse.ui.texteditor.TextEditorAction#update()
@@ -137,11 +142,13 @@
|| fOccurrencePreferenceProvider.getOccurrencePreferenceProvider() == null)
? null : fOccurrencePreferenceProvider.getOccurrencePreferenceProvider().getPreferenceStore());
if (newStore != fPreferenceStore) {
- if (fPreferenceStore != null)
+ if (fPreferenceStore != null) {
fPreferenceStore.removePropertyChangeListener(this);
+ }
fPreferenceStore = newStore;
- if (fPreferenceStore != null)
+ if (fPreferenceStore != null) {
fPreferenceStore.addPropertyChangeListener(this);
+ }
}
boolean markOccurences = false;
@@ -163,11 +170,6 @@
update();
}
- protected void finalize() throws Throwable {
- if (fPreferenceStore != null) fPreferenceStore.removePropertyChangeListener(this);
- }
-
-
private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {
URL base = null;
try {
@@ -182,4 +184,12 @@
return new URL(base, buffer.toString());
}
+ public void dispose() {
+ if (fPreferenceStore != null) {
+ fPreferenceStore.removePropertyChangeListener(this);
+ fPreferenceStore = null;
+ }
+ fOccurrencePreferenceProvider = null;
+ }
+
}
17 years, 7 months
JBoss Tools SVN: r10193 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-09-11 03:36:58 -0400 (Thu, 11 Sep 2008)
New Revision: 10193
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1805
Modified: 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 2008-09-11 06:08:13 UTC (rev 10192)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1805Test.java 2008-09-11 07:36:58 UTC (rev 10193)
@@ -36,7 +36,7 @@
super(name);
}
- public void testJBIDE924() throws Throwable {
+ public void testJBIDE1805() throws Throwable {
// get test page path
setException(null);
17 years, 7 months
JBoss Tools SVN: r10192 - trunk/smooks/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-11 02:08:13 -0400 (Thu, 11 Sep 2008)
New Revision: 10192
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksConstants.java
Log:
add some constants string field
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksConstants.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksConstants.java 2008-09-11 06:03:41 UTC (rev 10191)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.model/src/org/milyn/xsd/smooks/util/SmooksConstants.java 2008-09-11 06:08:13 UTC (rev 10192)
@@ -20,6 +20,7 @@
public static final String SAX = "SAX";
public static final String DOM = "DOM";
public static final String BEAN_POPULATOR = "org.milyn.javabean.BeanPopulator";
+ public static final String DATE_DECODER = "org.milyn.javabean.decoders.DateDecoder";
public static final String BEAN_ID = "beanId";
17 years, 7 months
JBoss Tools SVN: r10191 - 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-11 02:03:41 -0400 (Thu, 11 Sep 2008)
New Revision: 10191
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
Log:
fix a nullpointexception bug
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 06:01:40 UTC (rev 10190)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-11 06:03:41 UTC (rev 10191)
@@ -511,6 +511,7 @@
if (ar instanceof ResourceConfigType) {
ResourceConfigType rc = (ResourceConfigType) ar;
ResourceType resourceType = rc.getResource();
+ if(resourceType == null) continue;
String resource = resourceType.getValue();
if (BEANPOPULATOR.equals(resource)) {
// create root beanmodel
17 years, 7 months
JBoss Tools SVN: r10190 - 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-11 02:01:40 -0400 (Thu, 11 Sep 2008)
New Revision: 10190
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml
Log:
add some contents for testing
Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml 2008-09-11 05:57:09 UTC (rev 10189)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/Test.xml 2008-09-11 06:01:40 UTC (rev 10190)
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="ASCII"?>
<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.0.xsd">
+
+ <resource-config selector="global-parameters">
+ <param name="stream.filter.type">SAX</param>
+ </resource-config>
+
+
<resource-config selector="srcmodel.Order">
<resource>org.milyn.javabean.BeanPopulator</resource>
<param name="beanId">LineOrder</param>
@@ -35,4 +41,33 @@
selector="srcmodel.OrderItem quantity" />
</param>
</resource-config>
+
+ <resource-config selector="addtioninfo">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">no</param>
+ </resource-config>
+
+ <resource-config selector="addtioninfo1">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">no1</param>
+ </resource-config>
+
+ <resource-config selector="addtioninfo2">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">no2</param>
+ </resource-config>
+
+ <resource-config selector="addtioninfo3">
+ <resource>org.milyn.javabean.BeanPopulator</resource>
+ <param name="beanId">no3</param>
+ </resource-config>
+
+ <resource-config selector="decoder:OrderDateLong">
+ <resource>org.milyn.javabean.decoders.DateDecoder</resource>
+ <param name="format">EEE MMM dd HH:mm:ss z yyyy</param>
+ <param name="locale-language">en</param>
+ <param name="locale-country">IE</param>
+ </resource-config>
+
+
</smooks-resource-list>
\ No newline at end of file
17 years, 7 months
JBoss Tools SVN: r10189 - 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-11 01:57:09 -0400 (Thu, 11 Sep 2008)
New Revision: 10189
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java
Log:
add some method to test NormalSmooksModelBuikder and ResourceConifgEraser
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 05:55:56 UTC (rev 10188)
+++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-09-11 05:57:09 UTC (rev 10189)
@@ -23,6 +23,9 @@
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.analyzer.NormalSmooksModelBuilder;
+import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage;
+import org.jboss.tools.smooks.analyzer.ResourceConfigEraser;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.graphical.GraphicalPackage;
import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer;
@@ -35,25 +38,33 @@
* @author Dart Peng Date : 2008-9-1
*/
public class SmooksAnalyzerTester extends TestCase {
- public void testParse() {
+
+ private GraphInformations graph;
+ private Resource resource;
+
+ public SmooksAnalyzerTester() throws IOException {
+ super();
+ ClassLoader classLoader = SmooksAnalyzerTester.class.getClassLoader();
Registry.INSTANCE.put(GraphicalPackage.eNS_URI,
GraphicalPackage.eINSTANCE);
Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE);
+
+ resource = new SmooksResourceFactoryImpl().createResource(null);
+ Resource gr = new XMLResourceFactoryImpl().createResource(null);
+ InputStream stream1 = classLoader
+ .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml");
+ InputStream stream2 = classLoader
+ .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.smooks.graph");
+ gr.load(stream2, Collections.EMPTY_MAP);
+ graph = (GraphInformations) gr.getContents().get(0);
+
+ resource.load(stream1, Collections.EMPTY_MAP);
+ }
+
+ public MappingResourceConfigList analyzeGraphical() {
try {
ClassLoader classLoader = SmooksAnalyzerTester.class
.getClassLoader();
- Resource resource = new SmooksResourceFactoryImpl()
- .createResource(null);
- Resource gr = new XMLResourceFactoryImpl().createResource(null);
- InputStream stream1 = classLoader
- .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml");
- InputStream stream2 = classLoader
- .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.smooks.graph");
- gr.load(stream2, Collections.EMPTY_MAP);
- GraphInformations graph = (GraphInformations) gr.getContents().get(
- 0);
-
- resource.load(stream1, Collections.EMPTY_MAP);
JavaBeanAnalyzer sourceModelAnalyzer = new JavaBeanAnalyzer();
JavaBeanAnalyzer targetModelAnalyzer = new JavaBeanAnalyzer();
JavaBeanAnalyzer connectionsAnalyzer = new JavaBeanAnalyzer();
@@ -71,10 +82,41 @@
Assert.assertTrue(!connections.isEmpty());
Assert.assertTrue(!relationgConnection.isEmpty());
System.out.println(connections);
- } catch (IOException e) {
- e.printStackTrace();
+ return configList;
} catch (InvocationTargetException e) {
e.printStackTrace();
}
+ return null;
}
+
+ public void eraserMappingResourceConfig() {
+ ResourceConfigEraser eraser = new ResourceConfigEraser();
+ SmooksResourceListType listType = ((DocumentRoot) resource
+ .getContents().get(0)).getSmooksResourceList();
+ int oldCount = listType.getAbstractResourceConfig().size();
+ MappingResourceConfigList configList = analyzeGraphical();
+ eraser.cleanMappingResourceConfig(listType, configList, null);
+ int newCount = listType.getAbstractResourceConfig().size();
+ Assert.assertTrue(oldCount >= newCount);
+ }
+
+ public void testEraser() {
+ eraserMappingResourceConfig();
+ }
+
+ public void testAnalyzer() {
+ MappingResourceConfigList configList = analyzeGraphical();
+ }
+
+ public void generateNormalInforPackage() {
+ SmooksResourceListType listType = ((DocumentRoot) resource
+ .getContents().get(0)).getSmooksResourceList();
+ NormalSmooksModelPackage modePackage = NormalSmooksModelBuilder
+ .getInstance().buildNormalSmooksModelPackage(listType);
+
+ }
+
+ public void testGenerateNormalInforPackage(){
+ generateNormalInforPackage();
+ }
}
17 years, 7 months
JBoss Tools SVN: r10188 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-11 01:55:56 -0400 (Thu, 11 Sep 2008)
New Revision: 10188
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java
Log:
new class , it can remove the all mapping-resourceonfig model
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java 2008-09-11 05:55:56 UTC (rev 10188)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * 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.eclipse.emf.edit.domain.EditingDomain;
+import org.milyn.xsd.smooks.ResourceConfigType;
+import org.milyn.xsd.smooks.SmooksResourceListType;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 11, 2008
+ */
+public class ResourceConfigEraser {
+ public void cleanMappingResourceConfig(SmooksResourceListType list,
+ MappingResourceConfigList mappingResourceConfigList,
+ EditingDomain domain) {
+ if (mappingResourceConfigList != null) {
+ List<ResourceConfigType> resourceConfigList = mappingResourceConfigList
+ .getRelationgResourceConfigList();
+ for (Iterator iterator = resourceConfigList.iterator(); iterator
+ .hasNext();) {
+ ResourceConfigType resourceConfigType = (ResourceConfigType) iterator
+ .next();
+ list.getAbstractResourceConfig().remove(resourceConfigType);
+ }
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/analyzer/ResourceConfigEraser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 7 months