November 2008 - jbosstools-commits

JBoss Tools SVN: r11842 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-11-17 08:47:28 -0500 (Mon, 17 Nov 2008) New Revision: 11842 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java Log: https://jira.jboss.org/jira/browse/JBIDE-3140, fixes sashes' zero width when tabs are switching. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2008-11-17 13:29:27 UTC (rev 11841) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2008-11-17 13:47:28 UTC (rev 11842) @@ -363,6 +363,11 @@ switch (type) { case VISUALSOURCE_MODE: selectionBar.showBar(showSelectionBar); + /* + * Fixes https://jira.jboss.org/jira/browse/JBIDE-3140 + * author Denis Maliarevich. + */ + container.setMaximizedControl(null); if (sourceContent != null) sourceContent.setVisible(true); if (visualContent != null) @@ -387,6 +392,11 @@ selectionBar.showBar(showSelectionBar); if (sourceContent != null) { sourceContent.setVisible(true); + /* + * Fixes https://jira.jboss.org/jira/browse/JBIDE-3140 + * author Denis Maliarevich. + */ + container.setMaximizedControl(sourceContent); //Added by Max Areshkau //was fixed bug(border which drawed by iflasher doesn't hide on MACOS when we swith @@ -396,28 +406,37 @@ // visualEditor.getController().visualRefresh(); // } } - if (visualContent != null) - visualContent.setVisible(false); - if (previewContent != null) { - previewContent.setVisible(false); - } + /* + * Fixes https://jira.jboss.org/jira/browse/JBIDE-3140 + * author Denis Maliarevich. + */ +// if (visualContent != null) +// visualContent.setVisible(false); +// if (previewContent != null) { +// previewContent.setVisible(false); +// } break; case PREVIEW_MODE: if (selectionBar != null) { selectionBar.showBar("no"); } - if (sourceContent != null) { - sourceContent.setVisible(false); - } + /* + * Fixes https://jira.jboss.org/jira/browse/JBIDE-3140 + * author Denis Maliarevich. + */ +// if (sourceContent != null) { +// sourceContent.setVisible(false); +// } +// +// if (visualContent != null) { +// visualContent.setVisible(false); +// } - if (visualContent != null) { - visualContent.setVisible(false); - } - if (previewContent != null) { previewWebBrowser.rebuildDom(); previewContent.setVisible(true); + container.setMaximizedControl(previewContent); } break; }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11841 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-11-17 08:29:27 -0500 (Mon, 17 Nov 2008) New Revision: 11841 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java Log: JBIDE-3144 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java 2008-11-17 12:04:57 UTC (rev 11840) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTreeNodeTemplate.java 2008-11-17 13:29:27 UTC (rev 11841) @@ -591,7 +591,8 @@ if (lastElement != null) { break; } - if (el.equals(sourceNode)) { + + if (sourceNode.equals(el)) { lastElement = el; } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-11-17 12:04:57 UTC (rev 11840) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-11-17 13:29:27 UTC (rev 11841) @@ -33,8 +33,7 @@ //The shared instance. private static VpePlugin plugin; - //Resource bundle. -// private ResourceBundle resourceBundle; + /** * The constructor.

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11840 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-11-17 07:04:57 -0500 (Mon, 17 Nov 2008) New Revision: 11840 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/calendar.xhtml.xml Log: corrected test Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/calendar.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/calendar.xhtml.xml 2008-11-17 11:58:22 UTC (rev 11839) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/calendar.xhtml.xml 2008-11-17 12:04:57 UTC (rev 11840) @@ -1,30 +1,16 @@ <tests> <test id="calendar1"> - <TABLE> - <TR> - <TD> - <DIV> - <DIV STYLE="overflow: hidden; width: 220px;"> - <TABLE STYLE="width: 100%;"> - <TR> - <TD> - <INPUT TYPE="text" CLASS="rich-calendar-input" STYLE="width: 180px;" /> - </TD> - <TD> - <IMG CLASS="rich-calendar-button" VPE-USER-TOGGLE-ID="false" /> - </TD> - </TR> - <TR> - <TD> - </TD> - </TR> - </TABLE> - </DIV> - </DIV> - </TD> - </TR> - <BR VPE:PSEUDO-ELEMENT="yes" - STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" /> - </TABLE> + <SPAN> + <SPAN> + <INPUT TYPE="text" STYLE="vertical-align: middle;" CLASS="rich-calendar-input null" + SIZE=" " VALUE="" /> + + <IMG + SRC="/.*org\.jboss\.tools\.jsf\.vpe.richfaces\/resources\/calendar\/calendar\.gif/" + STYLE="vertical-align: middle;" CLASS="rich-calendar-button null" + VPE-USER-TOGGLE-ID="true" /> + + </SPAN> + </SPAN> </test> </tests> \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11839 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-11-17 06:58:22 -0500 (Mon, 17 Nov 2008) New Revision: 11839 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-2734 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java 2008-11-17 10:38:59 UTC (rev 11838) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationCreationWizard.java 2008-11-17 11:58:22 UTC (rev 11839) @@ -21,42 +21,17 @@ */ package org.hibernate.eclipse.console.wizards; -import java.util.ArrayList; -import java.util.List; - import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; -import org.eclipse.jdt.launching.IRuntimeClasspathEntry; -import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWizard; import org.hibernate.console.ImageConstants; -import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; -import org.hibernate.eclipse.console.EclipseConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.utils.EclipseImages; -import org.hibernate.eclipse.console.utils.ProjectUtils; -import org.hibernate.eclipse.launch.ICodeGenerationLaunchConstants; -import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; -import org.hibernate.eclipse.nature.HibernateNature; -import org.hibernate.util.StringHelper; /** * @author max

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11838 - in trunk/esb/plugins: org.jboss.tools.esb.project.ui and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-11-17 05:38:59 -0500 (Mon, 17 Nov 2008) New Revision: 11838 Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml Log: JBIDE-3194: add JBoss ESB runtime classpath container page Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2008-11-17 10:30:32 UTC (rev 11837) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2008-11-17 10:38:59 UTC (rev 11838) @@ -93,7 +93,7 @@ } public String getDescription() { - return JBossFacetCoreMessages.JBoss_Runtime; + return JBossFacetCoreMessages.JBoss_Runtime + " [" + path.segment(path.segmentCount() - 1) + "]"; } public int getKind() { Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2008-11-17 10:30:32 UTC (rev 11837) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/META-INF/MANIFEST.MF 2008-11-17 10:38:59 UTC (rev 11838) @@ -30,6 +30,7 @@ org.eclipse.jst.j2ee.ui;bundle-version="1.1.200", org.eclipse.jdt.core;bundle-version="3.4.0", org.jboss.tools.esb.project.core;bundle-version="1.0.0", - org.jboss.tools.common.model.ui;bundle-version="2.0.0" + org.jboss.tools.common.model.ui;bundle-version="2.0.0", + org.eclipse.jdt.ui;bundle-version="3.4.1" Eclipse-LazyStart: true Bundle-Vendor: JBoss, a division of Red Hat Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-11-17 10:30:32 UTC (rev 11837) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-11-17 10:38:59 UTC (rev 11838) @@ -68,4 +68,12 @@ </enablement> </decorator> </extension> + <extension + point="org.eclipse.jdt.ui.classpathContainerPage"> + <classpathContainerPage + class="org.jboss.tools.esb.project.ui.wizards.pages.JBossESBRuntimeContainerPage" + id="org.jboss.esb.runtime.classpath" + name="JBoss ESB Libraries"> + </classpathContainerPage> + </extension> </plugin> Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2008-11-17 10:38:59 UTC (rev 11838) @@ -0,0 +1,208 @@ +package org.jboss.tools.esb.project.ui.wizards.pages; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.ui.wizards.IClasspathContainerPage; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.ColumnLayoutData; +import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TableLayout; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.ui.ServerUICore; +import org.jboss.tools.esb.core.runtime.JBossRuntime; +import org.jboss.tools.esb.core.runtime.JBossRuntimeClassPathInitializer; +import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; + +public class JBossESBRuntimeContainerPage extends WizardPage implements + IClasspathContainerPage { + + private IClasspathEntry entry; + private TableViewer runtimeViewer; + private Object selectedRuntime; + + public JBossESBRuntimeContainerPage(){ + super("JBoss ESB Runtime Library"); + setTitle("JBoss ESB Library"); + setDescription("Select a ESB runtime to add to the project classpath"); + } + + public JBossESBRuntimeContainerPage(String pageName) { + super(pageName); + } + + + public JBossESBRuntimeContainerPage(String pageName, String title, + ImageDescriptor titleImage) { + super(pageName, title, titleImage); + } + + public void createControl(Composite parent) { + Composite com = new Composite(parent, SWT.NONE); + com.setLayout(new GridLayout()); + com.setLayoutData(new GridData(GridData.FILL_BOTH)); + + Table table = new Table(com, SWT.BORDER); + runtimeViewer = new TableViewer(table); + runtimeViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH)); + runtimeViewer.addSelectionChangedListener(new ISelectionChangedListener(){ + + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (StructuredSelection)event.getSelection(); + selectedRuntime = selection.getFirstElement(); + setPageComplete(isPageComplete()); + + }}); + + TableLayout tablelayout = new TableLayout(); + table.setLayout(tablelayout); + + tablelayout.addColumnData(new ColumnWeightData(60)); + TableColumn tc1 = new TableColumn(table, SWT.NONE); + tc1.setText("Name"); + tablelayout.addColumnData(new ColumnWeightData(40)); + TableColumn tc2 = new TableColumn(table, SWT.NONE); + tc2.setText("Runtime Type"); + + tc1.pack(); + tc2.pack(); + table.setHeaderVisible(true); + + + + runtimeViewer.setContentProvider(new ArrayContentProvider()); + runtimeViewer.setLabelProvider(new RuntimeLabelProvider()); + + runtimeViewer.setInput(getAllAvailableESBRuntimes()); + setControl(com); + } + + public boolean finish() { + IStructuredSelection selection = (StructuredSelection)runtimeViewer.getSelection(); + Object obj = selection.getFirstElement(); + IPath path = new Path(JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_CONTAINER_ID); + if(obj instanceof IRuntime){ + path = path.append(JBossRuntimeClassPathInitializer.JBOSS_ESB_RUNTIME_CLASSPATH_SERVER_SUPPLIED); + path = path.append(((IRuntime)obj).getId()); + }else if(obj instanceof JBossRuntime){ + path = path.append(((JBossRuntime)obj).getName()); + } + entry = JavaCore.newContainerEntry(path); + return true; + } + + public IClasspathEntry getSelection() { + + return entry; + } + + public void setSelection(IClasspathEntry containerEntry) { + entry = containerEntry; + System.out.print(containerEntry); + } + + private List getAllAvailableESBRuntimes(){ + List runtimes = new ArrayList(); + JBossRuntime[] preRuntimes = JBossRuntimeManager.getInstance().getRuntimes(); + IRuntime[] serverRuntimes = ServerCore.getRuntimes(); + List<JBossRuntime> preList = Arrays.asList(preRuntimes); + List<IRuntime> serverRuntimeList = Arrays.asList(serverRuntimes); + runtimes.addAll(preList); + runtimes.addAll(serverRuntimeList); + + return runtimes; + + } + + + + @Override + public boolean isPageComplete() { + + return selectedRuntime != null; + } + + + + class RuntimeLabelProvider implements ITableLabelProvider{ + + private ILabelProvider serverLabel = ServerUICore.getLabelProvider(); + + public Image getColumnImage(Object element, int columnIndex) { + if(columnIndex == 0){ + if(element instanceof IRuntime){ + return serverLabel.getImage(element); + } + } + return null; + } + + public String getColumnText(Object element, int columnIndex) { + switch (columnIndex) { + case 0: + if(element instanceof IRuntime){ + return serverLabel.getText(element); + }else if(element instanceof JBossRuntime){ + return ((JBossRuntime)element).getName(); + } + break; + case 1: + if(element instanceof IRuntime){ + return "Server contained"; + }else if(element instanceof JBossRuntime){ + return "ESB Runtime Only"; + } + break; + } + + + return null; + } + + public void addListener(ILabelProviderListener listener) { + // TODO Auto-generated method stub + + } + + public void dispose() { + // TODO Auto-generated method stub + + } + + public boolean isLabelProperty(Object element, String property) { + // TODO Auto-generated method stub + return false; + } + + public void removeListener(ILabelProviderListener listener) { + // TODO Auto-generated method stub + + } + + } +}

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11837 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-11-17 05:30:32 -0500 (Mon, 17 Nov 2008) New Revision: 11837 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java Log: JBIDE-3144 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -118,9 +118,10 @@ // get atribute's offset //mareshkau because it's node can be a proxy, see JBIDE-3144 - outputAttr = (Attr) ((((Attr)outputAttr).getOwnerElement()).getAttributes().getNamedItem(outputAttr.getLocalName())); + if(!(outputAttr instanceof IDOMAttr)) { + outputAttr = (Attr) ((((Attr)outputAttr).getOwnerElement()).getAttributes().getNamedItem(outputAttr.getLocalName())); + } - int offset = ((IDOMAttr) outputAttr) .getValueRegionStartOffset(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -71,7 +71,7 @@ nsIDOMNode domNode = simpleTextTemplate.getVisualNodeByBySourcePosition(simpleTextMapping, TestUtil.getLinePositionOffcet(itextViewer, 14, 10), 0, domMapping).getFirstChild(); - assertEquals(simpleTextNode ,simpleTextTemplate.getNodeData(domNode, null, domMapping).getSourceNode()); + assertEquals(simpleTextNode ,domMapping.getNearElementMappingAtVisualNode(domNode).getSourceNode()); assertEquals("Node should be a text node", nsIDOMNode.TEXT_NODE,domNode.getNodeType()); //$NON-NLS-1$ assertEquals(simpleTextNode.getNodeValue(), domNode.getNodeValue()); @@ -110,7 +110,7 @@ nsIDOMNode domNode = simpleTextTemplate.getVisualNodeByBySourcePosition(simpleTextMapping, TestUtil.getLinePositionOffcet(itextViewer, 15, 27), 0, domMapping).getFirstChild(); assertEquals("Node should be a text node", nsIDOMNode.TEXT_NODE,domNode.getNodeType()); //$NON-NLS-1$ - assertEquals(simpleTextNode ,simpleTextTemplate.getNodeData(domNode, null, domMapping).getSourceNode()); + assertEquals(simpleTextNode ,domMapping.getNearElementMappingAtVisualNode(domNode).getSourceNode()); assertEquals("Hello", domNode.getNodeValue().trim()); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -315,6 +315,7 @@ performContentTest("components/treeNodesAdaptor.xhtml");//$NON-NLS-1$ } + @Override protected String getTestProjectName() { return RichFacesAllTests.IMPORT_PROJECT_NAME; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.regex.Pattern; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Path; @@ -103,10 +101,6 @@ public static final String VPE_USER_TOGGLE_ID = "vpe-user-toggle-id"; //$NON-NLS-1$ public static final String VPE_USER_TOGGLE_LOOKUP_PARENT = "vpe-user-toggle-lookup-parent"; //$NON-NLS-1$ - /** REGEX_EL */ - private static final Pattern REGEX_EL = Pattern.compile( - "[\\$|\\#]\\{.*\\}", Pattern.MULTILINE + Pattern.DOTALL); //$NON-NLS-1$ - private static final String PSEUDO_ELEMENT = "br"; //$NON-NLS-1$ private static final String PSEUDO_ELEMENT_ATTR = "vpe:pseudo-element"; //$NON-NLS-1$ private static final String INIT_ELEMENT_ATTR = "vpe:init-element"; //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-11-17 08:35:46 UTC (rev 11836) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-11-17 10:30:32 UTC (rev 11837) @@ -134,6 +134,7 @@ private void addAttributes(Element sourceElement, nsIDOMElement visualElement, VpePageContext pageContext) { + NamedNodeMap sourceAttributes = sourceElement.getAttributes(); if (sourceAttributes == null) { return; @@ -142,9 +143,9 @@ for (int i = 0; i < len; i++) { Attr sourceAttr = (Attr) sourceAttributes.item(i); String name = sourceAttr.getName(); + //mareshkau, here we should have access to modified value fix for jbide-3144 + String value = sourceElement.getAttribute(name); - String value = sourceAttr.getValue(); - if (isAttribute(name)) { visualElement.setAttribute(name, value); }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11836 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-11-17 03:35:46 -0500 (Mon, 17 Nov 2008) New Revision: 11836 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateDecorater.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/Decorater.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterContentProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterLabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 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/DateTypeDetailPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java Log: JBIDE-3200 1.Add a Date Decorater detals page on the Configuration page 2.Add a dialog to show all decorater ResourceConfigType and show the dialog when user click the "customer type" button which is on JavaProperties Section. 3.Fix some "Control is dispose" bugs. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -21,6 +21,7 @@ import org.jboss.tools.smooks.model.ParamType; import org.jboss.tools.smooks.model.ResourceConfigType; import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; import org.jboss.tools.smooks.model.SmooksPackage; /** @@ -30,11 +31,11 @@ public class SmooksModelUtils { public static final String BEAN_CLASS = "beanClass"; - + public static final String BEAN_ID = "beanId"; - + public static final String BINDINGS = "bindings"; - + public static EStructuralFeature ATTRIBUTE_PROPERTY = ExtendedMetaData.INSTANCE .demandFeature(null, "property", false); @@ -54,12 +55,13 @@ param.getMixed().add(ELEMENT_BINDING, binding); return binding; } - + public static List<Object> getBindingListFromResourceConfigType( ResourceConfigType resourceConfig) { List<ParamType> paramList = resourceConfig.getParam(); - for (Iterator<ParamType> iterator = paramList.iterator(); iterator.hasNext();) { - ParamType param = iterator.next(); + for (Iterator<ParamType> iterator = paramList.iterator(); iterator + .hasNext();) { + ParamType param = iterator.next(); if ("bindings".equals(param.getName())) { if (param.eContents().isEmpty()) continue; @@ -70,20 +72,22 @@ } return null; } - - public static String getTransformType(ResourceConfigType resourceConfig){ + + public static String getTransformType(ResourceConfigType resourceConfig) { ParamType typeParam = null; - if(resourceConfig == null) return ""; - if(isTransformTypeResourceConfig(resourceConfig)){ + if (resourceConfig == null) + return ""; + if (isTransformTypeResourceConfig(resourceConfig)) { List paramList = resourceConfig.getParam(); for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType param = (ParamType) iterator.next(); - if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param.getName())) { + if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param + .getName())) { typeParam = param; break; } } - if(typeParam != null){ + if (typeParam != null) { return SmooksModelUtils.getAnyTypeText(typeParam); } } @@ -92,28 +96,31 @@ public static void setTransformType(ResourceConfigType resourceConfig, String type) { - if(type == null) type = ""; + if (type == null) + type = ""; if (isTransformTypeResourceConfig(resourceConfig)) { List paramList = resourceConfig.getParam(); for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { ParamType param = (ParamType) iterator.next(); - if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param.getName())) { + if (SmooksModelConstants.STREAM_FILTER_TYPE.equals(param + .getName())) { cleanTextToSmooksType(param); setTextToSmooksType(param, type); } } } } - - public static boolean isFilePathResourceConfig(ResourceConfigType resourceConfig){ + + public static boolean isFilePathResourceConfig( + ResourceConfigType resourceConfig) { ResourceType resource = resourceConfig.getResource(); - if(resource != null){ + if (resource != null) { String value = resource.getValue(); - if(value != null){ - if(value.startsWith("\\")){ + if (value != null) { + if (value.startsWith("\\")) { return true; } - if(value.startsWith("/")){ + if (value.startsWith("/")) { return true; } } @@ -142,12 +149,31 @@ } } + public static void setParamText(String paramName, String value, + ResourceConfigType resourceConfigType) { + List<ParamType> list = resourceConfigType.getParam(); + ParamType param = null; + for (Iterator<ParamType> iterator = list.iterator(); iterator.hasNext();) { + ParamType paramType = (ParamType) iterator.next(); + if (paramType.getName().equalsIgnoreCase(paramName)) { + param = paramType; + break; + } + } + if (param == null) { + param = SmooksFactory.eINSTANCE.createParamType(); + resourceConfigType.getParam().add(param); + } + param.setName(paramName); + setTextToSmooksType(param, value); + } + public static String getParmaText(String paramName, ResourceConfigType resourceConfigType) { List plist = resourceConfigType.getParam(); for (Iterator iterator = plist.iterator(); iterator.hasNext();) { ParamType p = (ParamType) iterator.next(); - if (paramName.equals(p.getName())) { + if (paramName.equalsIgnoreCase(p.getName())) { return getAnyTypeText(p); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -12,8 +12,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.gef.DefaultEditDomain; -import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.GraphicalViewer; import org.eclipse.jdt.core.IJavaProject; @@ -24,6 +24,7 @@ import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory; import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -33,7 +34,6 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -46,9 +46,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.SmooksResourceListType; import org.jboss.tools.smooks.ui.AbstractSmooksPropertySection; import org.jboss.tools.smooks.ui.SmooksUIActivator; -import org.jboss.tools.smooks.ui.gef.editparts.AbstractStructuredDataEditPart; +import org.jboss.tools.smooks.ui.editors.Decorater; +import org.jboss.tools.smooks.ui.editors.DecoraterSelectionDialog; +import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; +import org.jboss.tools.smooks.ui.editors.SmooksGraphicalFormPage; import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; import org.jboss.tools.smooks.ui.gef.model.PropertyModel; @@ -82,7 +87,8 @@ .getWidgetFactory(); Section section = createRootSection(factory, parent); - section.setText(Messages.getString("JavaBeanPropertiesSection.JavaBeanProperties")); //$NON-NLS-1$ + section.setText(Messages + .getString("JavaBeanPropertiesSection.JavaBeanProperties")); //$NON-NLS-1$ Composite controlComposite = factory.createComposite(section); section.setClient(controlComposite); GridLayout gl = new GridLayout(); @@ -90,7 +96,8 @@ controlComposite.setLayout(gl); - factory.createLabel(controlComposite, Messages.getString("JavaBeanPropertiesSection.TargetInstanceClass")); //$NON-NLS-1$ + factory.createLabel(controlComposite, Messages + .getString("JavaBeanPropertiesSection.TargetInstanceClass")); //$NON-NLS-1$ instanceClassComposite = factory.createComposite(controlComposite); GridData gd = new GridData(GridData.FILL_HORIZONTAL); @@ -104,7 +111,8 @@ gd.grabExcessHorizontalSpace = true; instanceClassText.setLayoutData(gd); - Button button1 = factory.createButton(instanceClassComposite, Messages.getString("JavaBeanPropertiesSection.Browse"), //$NON-NLS-1$ + Button button1 = factory.createButton(instanceClassComposite, Messages + .getString("JavaBeanPropertiesSection.Browse"), //$NON-NLS-1$ SWT.NONE); button1.addSelectionListener(new SelectionAdapter() { @@ -115,7 +123,8 @@ }); - factory.createLabel(controlComposite, Messages.getString("JavaBeanPropertiesSection.MappingType")); //$NON-NLS-1$ + factory.createLabel(controlComposite, Messages + .getString("JavaBeanPropertiesSection.MappingType")); //$NON-NLS-1$ typeComposite = factory.createComposite(controlComposite); gd = new GridData(GridData.FILL_HORIZONTAL); typeComposite.setLayoutData(gd); @@ -146,7 +155,8 @@ GridLayout buttonLayout = new GridLayout(); buttonLayout.numColumns = 2; buttonCom.setLayout(buttonLayout); - Button button3 = factory.createButton(buttonCom, Messages.getString("JavaBeanPropertiesSection.ClassBrowse"), //$NON-NLS-1$ + Button button3 = factory.createButton(buttonCom, Messages + .getString("JavaBeanPropertiesSection.ClassBrowse"), //$NON-NLS-1$ SWT.NONE); button3.addSelectionListener(new SelectionAdapter() { @@ -157,7 +167,8 @@ }); - Button button2 = factory.createButton(buttonCom, Messages.getString("JavaBeanPropertiesSection.CustomTypeBrowse"), //$NON-NLS-1$ + Button button2 = factory.createButton(buttonCom, Messages + .getString("JavaBeanPropertiesSection.CustomTypeBrowse"), //$NON-NLS-1$ SWT.NONE); button2.addSelectionListener(new SelectionAdapter() { @@ -192,14 +203,32 @@ } protected void browseBeanCustomTypeButtonSelected() { - + SmooksGraphicalFormPage page = this.getGraphicalEditor(); + SmooksFormEditor editor = (SmooksFormEditor) page.getEditor(); + Resource resource = editor.getSmooksResource(); + if(resource.getContents().isEmpty()){ + return; + } + DocumentRoot root = (DocumentRoot) resource.getContents().get(0); + SmooksResourceListType list = root.getSmooksResourceList(); + DecoraterSelectionDialog dialog = new DecoraterSelectionDialog(getPart().getSite().getShell(),list); + if (dialog.open() == Dialog.OK) { + Decorater decorater = dialog.getSelectedDecorater(); + if(decorater != null){ + String selector = decorater.getSelector(); + classTypeText.setText(selector); + } + } } protected void openJavaTypeDialog(Text text) { IJavaProject javaProject = createNewProjectClassLoader(); if (javaProject == null) { - MessageDialog.openError(this.getPart().getSite().getShell(), - Messages.getString("JavaBeanPropertiesSection.ErrorMessageTitle"), Messages.getString("JavaBeanPropertiesSection.TypeDialogErrorMessage")); //$NON-NLS-1$ //$NON-NLS-2$ + MessageDialog + .openError( + this.getPart().getSite().getShell(), + Messages + .getString("JavaBeanPropertiesSection.ErrorMessageTitle"), Messages.getString("JavaBeanPropertiesSection.TypeDialogErrorMessage")); //$NON-NLS-1$ //$NON-NLS-2$ return; } IJavaSearchScope scope = JavaSearchScopeFactory.getInstance() @@ -210,8 +239,10 @@ SmooksUIActivator.getDefault().getWorkbench() .getActiveWorkbenchWindow(), scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false); - dialog.setMessage(Messages.getString("JavaBeanPropertiesSection.JavaType")); //$NON-NLS-1$ - dialog.setTitle(Messages.getString("JavaBeanPropertiesSection.SearchJavaType")); //$NON-NLS-1$ + dialog.setMessage(Messages + .getString("JavaBeanPropertiesSection.JavaType")); //$NON-NLS-1$ + dialog.setTitle(Messages + .getString("JavaBeanPropertiesSection.SearchJavaType")); //$NON-NLS-1$ if (dialog.open() == Window.OK) { Object[] results = dialog.getResult(); @@ -292,13 +323,15 @@ } return null; } + protected JavaBeanModel getTargetJavaBeanModel() { LineConnectionModel connection = getLineConnectionModel(); - if(connection != null){ - AbstractStructuredDataModel t = (AbstractStructuredDataModel)connection.getTarget(); + if (connection != null) { + AbstractStructuredDataModel t = (AbstractStructuredDataModel) connection + .getTarget(); Object target = t.getReferenceEntityModel(); - if(target != null && target instanceof JavaBeanModel){ - return (JavaBeanModel)target; + if (target != null && target instanceof JavaBeanModel) { + return (JavaBeanModel) target; } } return null; @@ -313,7 +346,7 @@ if (type == null) type = ""; //$NON-NLS-1$ LineConnectionModel connection = getLineConnectionModel(); - if(connection == null){ + if (connection == null) { instanceClassComposite.setEnabled(false); typeComposite.setEnabled(false); return; @@ -322,7 +355,7 @@ if (model != null) { // if (!instanceClassComposite.getEnabled()) instanceClassComposite.setEnabled(true); -// classTypeText.setEnabled(false); + // classTypeText.setEnabled(false); String className = model.getBeanClassString(); lockEventFire(); this.classTypeText.setText(""); //$NON-NLS-1$ @@ -344,12 +377,15 @@ } private String getTypeProperty(LineConnectionModel connection) { - if(connection == null) return null; + if (connection == null) + return null; Object[] properties = connection.getPropertyArray(); - if(properties == null) return null; + if (properties == null) + return null; for (int i = 0; i < properties.length; i++) { PropertyModel pro = (PropertyModel) properties[i]; - if (Messages.getString("JavaBeanPropertiesSection.TypePropertyName").equalsIgnoreCase(pro.getName())) { //$NON-NLS-1$ + if (Messages + .getString("JavaBeanPropertiesSection.TypePropertyName").equalsIgnoreCase(pro.getName())) { //$NON-NLS-1$ return pro.getValue(); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -26,26 +26,39 @@ * */ public class AbstractSmooksPropertySection extends AbstractPropertySection { - + protected boolean lock = false; - + protected void fireDirty() { + SmooksGraphicalFormPage page = this.getGraphicalEditor(); + if (page != null) { + SmooksFormEditor editor = (SmooksFormEditor) ((SmooksGraphicalFormPage) page) + .getEditor(); + editor.fireEditorDirty(true); + } + } + + public SmooksGraphicalFormPage getGraphicalEditor() { IStructuredSelection selection = (IStructuredSelection) this .getSelection(); Object obj = selection.getFirstElement(); if (obj == null) - return; + return null; if (obj instanceof GraphicalEditPart) { - GraphicalViewer viewer = (GraphicalViewer) ((GraphicalEditPart)obj).getViewer(); - IEditorPart part = ((DefaultEditDomain)viewer.getEditDomain()).getEditorPart(); - if(part instanceof SmooksGraphicalFormPage){ - SmooksFormEditor editor = (SmooksFormEditor)((SmooksGraphicalFormPage)part).getEditor(); - editor.fireEditorDirty(true); + GraphicalViewer viewer = (GraphicalViewer) ((GraphicalEditPart) obj) + .getViewer(); + IEditorPart part = ((DefaultEditDomain) viewer.getEditDomain()) + .getEditorPart(); + if (part instanceof SmooksGraphicalFormPage) { + return (SmooksGraphicalFormPage) part; } } + + return null; } - - protected Section createRootSection(TabbedPropertySheetWidgetFactory factory , Composite parent){ + + protected Section createRootSection( + TabbedPropertySheetWidgetFactory factory, Composite parent) { Composite main = factory.createComposite(parent); FillLayout fill = new FillLayout(); fill.marginHeight = 8; @@ -70,11 +83,11 @@ } return null; } - + public boolean isLock() { return lock; } - + protected void unLockEventFire() { lock = false; } @@ -83,6 +96,4 @@ lock = true; } - - } Modified: 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 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.ui.editors; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -21,6 +22,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.eclipse.ui.forms.widgets.Section; import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksResourceListType; import org.jboss.tools.smooks.ui.ResourceConfigWarrper; /** @@ -155,6 +157,25 @@ public boolean setFormInput(Object input) { return false; } + + public SmooksResourceListType getSmooksResourceList(){ + if(resourceConfigList != null){ + EObject parent = resourceConfigList.eContainer(); + while(parent != null){ + EObject temp = parent.eContainer(); + if(temp == null){ + break; + } + parent = temp; + if(parent instanceof SmooksResourceListType){ + break; + } + } + return (SmooksResourceListType) parent; + } + + return null; + } /* * (non-Javadoc) Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateDecorater.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateDecorater.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateDecorater.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -0,0 +1,17 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +/** + * @author Dart + * + */ +public class DateDecorater extends Decorater{ + + public DateDecorater(String selector) { + super(selector); + // TODO Auto-generated constructor stub + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateDecorater.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DateTypeDetailPage.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -12,6 +12,8 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Combo; @@ -28,6 +30,7 @@ private Text formatText; private Combo localeLangaugeCombo; private Combo localeContryCombo; + private Text selectorText; public DateTypeDetailPage(SmooksFormEditor parentEditor, EditingDomain domain) { @@ -45,8 +48,14 @@ GridLayout layout = new GridLayout(); layout.numColumns = 2; parent.setLayout(layout); + + this.formToolKit.createLabel(parent, "Name :"); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + selectorText = this.formToolKit.createText(parent, ""); //$NON-NLS-1$ + selectorText.setLayoutData(gd); + this.formToolKit.createLabel(parent, Messages.getString("DateTypeDetailPage.DateTypeFormatText")); //$NON-NLS-1$ - GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd = new GridData(GridData.FILL_HORIZONTAL); formatText = this.formToolKit.createText(parent, ""); //$NON-NLS-1$ formatText.setLayoutData(gd); @@ -61,19 +70,98 @@ localeContryCombo.setLayoutData(gd); formToolKit.paintBordersFor(parent); + + hookControls(); } + private void hookControls() { + selectorText.addModifyListener(new ModifyListener(){ + public void modifyText(ModifyEvent e) { + setSelector(); + } + }); + + formatText.addModifyListener(new ModifyListener(){ + + public void modifyText(ModifyEvent e) { + setFormat(); + } + + }); + + localeContryCombo.addModifyListener(new ModifyListener(){ + + public void modifyText(ModifyEvent e) { + setLocalContry(); + } + + }); + + localeLangaugeCombo.addModifyListener(new ModifyListener(){ + + public void modifyText(ModifyEvent e) { + setLocalLang(); + } + + }); + } + + protected void setFormat() { + String format = formatText.getText(); + if(format == null) format = ""; + SmooksModelUtils.setParamText("format", format, resourceConfigList); + this.parentEditor.fireEditorDirty(true); + } + + protected void setLocalLang() { + String ll = localeLangaugeCombo.getText(); + if(ll == null) ll = ""; + SmooksModelUtils.setParamText("locale-language", ll, resourceConfigList); + this.parentEditor.fireEditorDirty(true); + } + + protected void setLocalContry() { + String lc = localeContryCombo.getText(); + if(lc == null) lc = ""; + SmooksModelUtils.setParamText("locale-country", lc, resourceConfigList); + this.parentEditor.fireEditorDirty(true); + } + + protected void setSelector() { + String text = selectorText.getText(); + if(text == null || text.length() == 0){ + resourceConfigList.setSelector(""); + this.parentEditor.fireEditorDirty(true); + return; + } + text = "decorat:"+text; + if(this.resourceConfigList != null){ + resourceConfigList.setSelector(text); + this.parentEditor.fireEditorDirty(true); + } + } + + private String getSelectorName(String selector){ + if(selector == null) return ""; + if(selector.indexOf(":") != -1){ + return selector.substring(selector.indexOf(":") + 1,selector.length()); + } + return selector; + } + @Override protected void initSectionUI() { if(this.resourceConfigList != null){ String formate = SmooksModelUtils.getParmaText("format", resourceConfigList); //$NON-NLS-1$ String locallang = SmooksModelUtils.getParmaText("Locale-Language", resourceConfigList); //$NON-NLS-1$ - String localcontry = SmooksModelUtils.getParmaText("Locale-Contry", resourceConfigList); //$NON-NLS-1$ + String localcontry = SmooksModelUtils.getParmaText("locale-country", resourceConfigList); //$NON-NLS-1$ if(formate == null) formate = ""; //$NON-NLS-1$ if(locallang == null) locallang = ""; //$NON-NLS-1$ if(localcontry == null) localcontry = ""; //$NON-NLS-1$ - + String selector = resourceConfigList.getSelector(); + selector = getSelectorName(selector); + selectorText.setText(selector); formatText.setText(formate); localeContryCombo.setText(localcontry); localeLangaugeCombo.setText(locallang); Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/Decorater.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/Decorater.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/Decorater.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -0,0 +1,24 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +/** + * @author Dart + * + */ +public class Decorater { + private String selector; + + public Decorater(String selector){ + setSelector(selector); + } + + public String getSelector() { + return selector; + } + + public void setSelector(String selector) { + this.selector = selector; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/Decorater.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterContentProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterContentProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterContentProvider.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -0,0 +1,53 @@ +/** + * + */ +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 + * + */ +public class DecoraterContentProvider implements ITreeContentProvider { + + public Object[] getChildren(Object parentElement) { + if(parentElement instanceof List){ + if(!((List)parentElement).isEmpty()){ + return ((List)parentElement).toArray(); + } + } + return new Object[]{}; + } + + public Object getParent(Object element) { + return null; + } + + public boolean hasChildren(Object element) { + if(element instanceof List){ + return !((List)element).isEmpty(); + } + return false; + } + + public Object[] getElements(Object inputElement) { + if(inputElement instanceof List){ + return ((List)inputElement).toArray(); + } + return new Object[]{}; + } + + public void dispose() { + + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterLabelProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterLabelProvider.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -0,0 +1,39 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import java.util.List; + +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; + +/** + * @author Dart + * + */ +public class DecoraterLabelProvider extends LabelProvider { + + @Override + public Image getImage(Object element) { + return super.getImage(element); + } + + @Override + public String getText(Object element) { + if(element instanceof List){ + if(!((List)element).isEmpty()){ + Object obj = ((List)element).get(0); + if(obj instanceof DateDecorater){ + return "Date decorater list"; + } + } + return "Unknown decorater list"; + } + if(element instanceof Decorater){ + return ((Decorater)element).getSelector(); + } + return super.getText(element); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterLabelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -0,0 +1,164 @@ +/** + * + */ +package org.jboss.tools.smooks.ui.editors; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.viewers.DoubleClickEvent; +import org.eclipse.jface.viewers.IDoubleClickListener; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.window.IShellProvider; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksResourceListType; + +/** + * @author Dart + * + */ +public class DecoraterSelectionDialog extends Dialog implements + ISelectionChangedListener { + + private SmooksResourceListType resourceList; + + private Decorater selectedDecorater; + + private TreeViewer viewer; + + public Decorater getSelectedDecorater() { + return selectedDecorater; + } + + public void setSelectedDecorater(Decorater selectedDecorater) { + this.selectedDecorater = selectedDecorater; + } + + public DecoraterSelectionDialog(IShellProvider parentShell) { + super(parentShell); + } + + public DecoraterSelectionDialog(Shell parentShell, + SmooksResourceListType list) { + super(parentShell); + this.resourceList = list; + } + + @Override + protected Control createDialogArea(Composite parent) { + Composite composite = (Composite) super.createDialogArea(parent); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = 400; + gd.widthHint = 200; + composite.setLayoutData(gd); + composite.setLayout(new FillLayout()); + viewer = new TreeViewer(composite, SWT.NONE); + viewer.setContentProvider(new DecoraterContentProvider()); + viewer.setLabelProvider(new DecoraterLabelProvider()); + viewer.addSelectionChangedListener(this); + viewer.addDoubleClickListener(new IDoubleClickListener() { + + public void doubleClick(DoubleClickEvent event) { + IStructuredSelection selection = (IStructuredSelection) event.getSelection(); + Object obj = selection.getFirstElement(); + if (obj == null) { + return; + } + if(obj instanceof Decorater){ + okPressed(); + } + } + }); + initViewer(viewer); + return composite; + } + + private void initViewer(TreeViewer viewer) { + if (resourceList != null) { + List allList = new ArrayList(); + List dateDecoraterList = new ArrayList(); + allList.add(dateDecoraterList); + List list = resourceList.getAbstractResourceConfig(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + ResourceConfigType config = (ResourceConfigType) iterator + .next(); + String selector = config.getSelector(); + + if (selector != null && selector.indexOf(":") != -1) { + String selector1 = selector.substring(0, selector + .indexOf(":")); + selector1 = selector1.trim(); + String selector2 = selector.substring(selector + .indexOf(":") + 1 , selector.length()); + selector2 = selector2.trim(); + if (selector1.equals("decorat")) { + ResourceType resource = config.getResource(); + if (resource != null) { + String value = resource.getValue(); + if(value != null) value = value.trim(); + if ("org.milyn.javabean.decoders.DateDecoder" + .equals(value)) { + dateDecoraterList.add(new DateDecorater( + selector2)); + } + } + } + } + } + viewer.setInput(allList); + } + } + + private void updateButtonStatus() { + if (this.getSelectedDecorater() == null) { + Button button = this.getButton(IDialogConstants.OK_ID); + if (button != null) + button.setEnabled(false); + } else { + Button button = this.getButton(IDialogConstants.OK_ID); + if (button != null) + button.setEnabled(true); + } + } + + public static Decorater openDialog(Shell shell, + SmooksResourceListType resourceList) { + DecoraterSelectionDialog dialog = new DecoraterSelectionDialog(shell, + resourceList); + if (dialog.open() == Dialog.OK) { + return dialog.getSelectedDecorater(); + } + return null; + } + + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) viewer + .getSelection(); + Object obj = selection.getFirstElement(); + if (obj == null) { + setSelectedDecorater(null); + } else { + if (obj instanceof Decorater) { + this.setSelectedDecorater((Decorater) obj); + }else{ + setSelectedDecorater(null); + } + } + updateButtonStatus(); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/DecoraterSelectionDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/ResourceConfigWarrperFactory.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -48,7 +48,9 @@ ResourceType resource = type.getResource(); if (resource == null) return false; - if (SmooksModelConstants.BEAN_POPULATOR.equals(resource.getValue())) { + String value = resource.getValue(); + if(value != null) value = value.trim(); + if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { return true; } return false; @@ -58,7 +60,9 @@ ResourceType resource = type.getResource(); if (resource == null) return false; - if (SmooksModelConstants.DATE_DECODER.equals(resource.getValue())) { + String value = resource.getValue(); + if(value != null) value = value.trim(); + if (SmooksModelConstants.DATE_DECODER.equals(value)) { return true; } return false; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataConnectionEditPart.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -26,30 +26,30 @@ import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; public class StructuredDataConnectionEditPart extends - AbstractConnectionEditPart implements PropertyChangeListener{ + AbstractConnectionEditPart implements PropertyChangeListener { public StructuredDataConnectionEditPart() { super(); } - + public void activate() { super.activate(); Object model = getModel(); - if(model instanceof AbstractStructuredDataConnectionModel){ - ((AbstractStructuredDataConnectionModel)model).addPropertyChangeListener(this); + if (model instanceof AbstractStructuredDataConnectionModel) { + ((AbstractStructuredDataConnectionModel) model) + .addPropertyChangeListener(this); } } public void deactivate() { Object model = getModel(); - if(model instanceof AbstractStructuredDataConnectionModel){ - ((AbstractStructuredDataConnectionModel)model).removePropertyChangeListener(this); + if (model instanceof AbstractStructuredDataConnectionModel) { + ((AbstractStructuredDataConnectionModel) model) + .removePropertyChangeListener(this); } super.deactivate(); } - - /* * (non-Javadoc) * @@ -174,15 +174,21 @@ Tree targetTree = null; if (source instanceof TreeItemRelationModel) { TreeItem item = ((TreeItemRelationModel) source).getTreeItem(); - item.setData(TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS, - new Boolean(selected)); - sourceTree = item.getParent(); + if (!item.isDisposed()) { + item.setData( + TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS, + new Boolean(selected)); + sourceTree = item.getParent(); + } } if (target instanceof TreeItemRelationModel) { TreeItem item = ((TreeItemRelationModel) target).getTreeItem(); - item.setData(TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS, - new Boolean(selected)); - targetTree = item.getParent(); + if (!item.isDisposed()) { + item.setData( + TreeItemRelationModel.PRO_TREE_ITEM_SELECTION_STATUS, + new Boolean(selected)); + targetTree = item.getParent(); + } } refreshTree(sourceTree); refreshTree(targetTree); @@ -211,6 +217,6 @@ } public void propertyChange(PropertyChangeEvent evt) { - + } } \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java 2008-11-17 06:33:24 UTC (rev 11835) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java 2008-11-17 08:35:46 UTC (rev 11836) @@ -40,7 +40,11 @@ graphics.pushState(); graphics.setForegroundColor(ColorConstants.red); - graphics.drawText(treeItem.getText(), getBounds().getTopLeft()); + if (!treeItem.isDisposed()) { + String text = treeItem.getText(); + if (text != null) + graphics.drawText(text, getBounds().getTopLeft()); + } graphics.popState(); }

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11835 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui and 10 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-11-17 01:33:24 -0500 (Mon, 17 Nov 2008) New Revision: 11835 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSectonFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractConnectionModelSectionFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSectionFilter.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelDecorator.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.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/SmooksNormalContentEditFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java Log: JBIDE-3193 1.Add a new property section for XML model 2.Add a label decorater for XML data viewer to display xml name-space url Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/util/SmooksModelUtils.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -14,7 +14,6 @@ import java.util.List; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.ExtendedMetaData; import org.eclipse.emf.ecore.xml.type.AnyType; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-11-17 06:33:24 UTC (rev 11835) @@ -95,14 +95,18 @@ type="org.jboss.tools.smooks.ui.gef.model.LineConnectionModel"> </input> </propertySection> - <propertySection - class="org.jboss.tools.smooks.javabean.ui.JavaBeanPropertiesSection" - id="org.jboss.tools.smooks.ui.javabean.propertyTab.Section" + <propertySection + class="org.jboss.tools.smooks.javabean.ui.JavaBeanPropertiesSection" + filter="org.jboss.tools.smooks.javabean.ui.JavaBeanPropertiesSectonFilter" + id="org.jboss.tools.smooks.ui.javabean.propertyTab.Section" tab="org.jboss.tools.smooks.ui.javabean.propertyTab"> - <input - type="org.jboss.tools.smooks.ui.gef.model.LineConnectionModel"> - </input> </propertySection> + <propertySection + class="org.jboss.tools.smooks.xml.ui.XMLPropertiesSection" + filter="org.jboss.tools.smooks.xml.ui.XMLPropertiesSectionFilter" + id="org.jboss.tools.smooks.ui.xml.propertySection" + tab="org.jboss.tools.smooks.ui.xml.propertyTab"> + </propertySection> </propertySections> </extension> <extension @@ -128,6 +132,11 @@ id="org.jboss.tools.smooks.ui.javabean.propertyTab" label="JavaBean Properties"> </propertyTab> + <propertyTab + category="connection" + id="org.jboss.tools.smooks.ui.xml.propertyTab" + label="XML Properties"> + </propertyTab> </propertyTabs> </extension> <extension @@ -269,4 +278,16 @@ priority="normal"> </content-type> </extension> + <extension + point="org.eclipse.ui.decorators"> + <decorator + adaptable="false" + class="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelDecorator" + id="org.jboss.tools.smooks.ui.xml.decorator" + label="Smooks XML Data Viewer Decorator" + lightweight="false" + objectClass="org.jboss.tools.smooks.xml.model.TagObject" + state="true"> + </decorator> + </extension> </plugin> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -34,9 +34,11 @@ CreateConnectionCommand command = (CreateConnectionCommand) gefCommand; if (command.getSource() != null && command.getTarget() != null) { Object m = command.getTarget(); - if (m instanceof AbstractStructuredDataModel) { + Object s = command.getSource(); + if (m instanceof AbstractStructuredDataModel && s instanceof AbstractStructuredDataModel) { + Object source = ((AbstractStructuredDataModel)s).getReferenceEntityModel(); Object t = ((AbstractStructuredDataModel)m).getReferenceEntityModel(); - if (!UIUtils.isInstanceCreatingConnection(t)) { + if (!UIUtils.isInstanceCreatingConnection(source,t)) { if (t instanceof JavaBeanModel) { Class clazz = ((JavaBeanModel) t).getBeanClass(); if (clazz != null && clazz != String.class) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSection.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -48,6 +48,7 @@ import org.jboss.tools.smooks.javabean.model.JavaBeanModel; import org.jboss.tools.smooks.ui.AbstractSmooksPropertySection; import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.ui.gef.editparts.AbstractStructuredDataEditPart; import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; import org.jboss.tools.smooks.ui.gef.model.PropertyModel; @@ -63,8 +64,6 @@ private Text instanceClassText; - private boolean lock = false; - protected String beanClassType; protected String instanceClass; @@ -81,13 +80,8 @@ super.createControls(parent, tabbedPropertySheetPage); TabbedPropertySheetWidgetFactory factory = tabbedPropertySheetPage .getWidgetFactory(); - Composite main = factory.createComposite(parent); - FillLayout fill = new FillLayout(); - fill.marginHeight = 8; - fill.marginWidth = 8; - main.setLayout(fill); - Section section = factory.createSection(main, Section.TITLE_BAR); + Section section = createRootSection(factory, parent); section.setText(Messages.getString("JavaBeanPropertiesSection.JavaBeanProperties")); //$NON-NLS-1$ Composite controlComposite = factory.createComposite(section); section.setClient(controlComposite); @@ -298,46 +292,18 @@ } return null; } - - private JavaBeanModel getTargetJavaBeanModel() { - ISelection s = (ISelection) this.getSelection(); - if (s instanceof IStructuredSelection) { - IStructuredSelection selection = (IStructuredSelection) s; - Object obj = selection.getFirstElement(); - if (obj == null) - return null; - if (obj instanceof EditPart) { - Object model = ((EditPart) obj).getModel(); - if (model instanceof LineConnectionModel) { - AbstractStructuredDataModel target = (AbstractStructuredDataModel) ((LineConnectionModel) model) - .getTarget(); - Object referenceObj = target.getReferenceEntityModel(); - if (referenceObj instanceof JavaBeanModel) { - return (JavaBeanModel) referenceObj; - } - } + protected JavaBeanModel getTargetJavaBeanModel() { + LineConnectionModel connection = getLineConnectionModel(); + if(connection != null){ + AbstractStructuredDataModel t = (AbstractStructuredDataModel)connection.getTarget(); + Object target = t.getReferenceEntityModel(); + if(target != null && target instanceof JavaBeanModel){ + return (JavaBeanModel)target; } } return null; } - private LineConnectionModel getLineConnectionModel() { - ISelection s = (ISelection) this.getSelection(); - if (s instanceof IStructuredSelection) { - IStructuredSelection selection = (IStructuredSelection) s; - Object obj = selection.getFirstElement(); - if (obj == null) - return null; - if (obj instanceof EditPart) { - Object model = ((EditPart) obj).getModel(); - if (model instanceof LineConnectionModel) { - return (LineConnectionModel) model; - } - } - } - return null; - } - public void refresh() { super.refresh(); lockEventFire(); @@ -389,13 +355,4 @@ } return null; } - - private void unLockEventFire() { - lock = false; - } - - private void lockEventFire() { - lock = true; - } - } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSectonFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSectonFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSectonFilter.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -0,0 +1,31 @@ +/** + * + */ +package org.jboss.tools.smooks.javabean.ui; + +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.ui.AbstractConnectionModelSectionFilter; + +/** + * @author Dart + * + */ +public class JavaBeanPropertiesSectonFilter extends + AbstractConnectionModelSectionFilter { + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.IFilter#select(java.lang.Object) + */ + public boolean select(Object toTest) { + Object source = this.getReferenceSourceObject(toTest); + Object target = this.getReferenceTargetObject(toTest); + if (source != null && source instanceof JavaBeanModel) { + return true; + } + if (target != null && target instanceof JavaBeanModel) { + return true; + } + return false; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanPropertiesSectonFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractConnectionModelSectionFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractConnectionModelSectionFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractConnectionModelSectionFilter.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -0,0 +1,51 @@ +/** + * + */ +package org.jboss.tools.smooks.ui; + +import org.eclipse.gef.EditPart; +import org.eclipse.jface.viewers.IFilter; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; + +/** + * @author Dart + * + */ +public abstract class AbstractConnectionModelSectionFilter implements IFilter { + + + public LineConnectionModel getConnectionModel(Object input){ + if (input instanceof EditPart) { + Object model = ((EditPart) input).getModel(); + if (model instanceof LineConnectionModel) { + return (LineConnectionModel) model; + } + } + return null; + } + + public Object getReferenceSourceObject(Object input){ + LineConnectionModel connection = getConnectionModel(input); + if(connection != null){ + AbstractStructuredDataModel s = (AbstractStructuredDataModel)connection.getSource(); + if(s != null){ + return s.getReferenceEntityModel(); + } + } + return null; + } + + public Object getReferenceTargetObject(Object input){ + LineConnectionModel connection = getConnectionModel(input); + if(connection != null){ + AbstractStructuredDataModel s = (AbstractStructuredDataModel)connection.getTarget(); + if(s != null){ + return s.getReferenceEntityModel(); + } + } + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractConnectionModelSectionFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -4,19 +4,31 @@ package org.jboss.tools.smooks.ui; import org.eclipse.gef.DefaultEditDomain; +import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.GraphicalViewer; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.widgets.Section; import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; import org.jboss.tools.smooks.ui.editors.SmooksGraphicalFormPage; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; /** * @author Dart * */ public class AbstractSmooksPropertySection extends AbstractPropertySection { + + protected boolean lock = false; + protected void fireDirty() { IStructuredSelection selection = (IStructuredSelection) this .getSelection(); @@ -32,4 +44,45 @@ } } } + + protected Section createRootSection(TabbedPropertySheetWidgetFactory factory , Composite parent){ + Composite main = factory.createComposite(parent); + FillLayout fill = new FillLayout(); + fill.marginHeight = 8; + fill.marginWidth = 8; + main.setLayout(fill); + return factory.createSection(main, Section.TITLE_BAR); + } + + protected LineConnectionModel getLineConnectionModel() { + ISelection s = (ISelection) this.getSelection(); + if (s instanceof IStructuredSelection) { + IStructuredSelection selection = (IStructuredSelection) s; + Object obj = selection.getFirstElement(); + if (obj == null) + return null; + if (obj instanceof EditPart) { + Object model = ((EditPart) obj).getModel(); + if (model instanceof LineConnectionModel) { + return (LineConnectionModel) model; + } + } + } + return null; + } + + public boolean isLock() { + return lock; + } + + protected void unLockEventFire() { + lock = false; + } + + protected void lockEventFire() { + lock = true; + } + + + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksResourceChangeListener.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -80,10 +80,14 @@ IFile newFile = ResourcesPlugin.getWorkspace().getRoot() .getFile(newPath1); if (newFile.exists()) { - if (MessageDialog.openQuestion(new Shell(Display - .getDefault()), Messages.getString("SmooksResourceChangeListener.CoverFile"), Messages.getString("SmooksResourceChangeListener.ConverFileMsg1") //$NON-NLS-1$ //$NON-NLS-2$ - + newFile.getFullPath() - + Messages.getString("SmooksResourceChangeListener.ConverFileMsg2"))) { //$NON-NLS-1$ + if (MessageDialog + .openQuestion( + new Shell(Display.getDefault()), + Messages + .getString("SmooksResourceChangeListener.CoverFile"), Messages.getString("SmooksResourceChangeListener.ConverFileMsg1") //$NON-NLS-1$ //$NON-NLS-2$ + + newFile.getFullPath() + + Messages + .getString("SmooksResourceChangeListener.ConverFileMsg2"))) { //$NON-NLS-1$ newFile.setContents(file.getContents(), true, true, monitor); } @@ -106,7 +110,9 @@ public boolean visit(IResourceDelta delta) { IResource res = delta.getResource(); String fileExtension = res.getFileExtension(); - if (!Messages.getString("SmooksResourceChangeListener.SmooksFileExtensionName").equals(fileExtension)) { //$NON-NLS-1$ + if (!Messages + .getString( + "SmooksResourceChangeListener.SmooksFileExtensionName").equals(fileExtension)) { //$NON-NLS-1$ return true; } int flags = delta.getFlags(); @@ -122,17 +128,21 @@ fileExtension = fileName.substring(dotIndex + 1, fileName.length()); } - if (!Messages.getString("SmooksResourceChangeListener.SmooksFileExtensionName").equals(fileExtension)) { //$NON-NLS-1$ + if (!Messages + .getString( + "SmooksResourceChangeListener.SmooksFileExtensionName").equals(fileExtension)) { //$NON-NLS-1$ return true; } - fileName += Messages.getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$ + fileName += Messages + .getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$ path = path.removeLastSegments(1); path = path.append(fileName); } IPath newPath = res.getFullPath(); fileName = newPath.lastSegment(); - fileName += Messages.getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$ + fileName += Messages + .getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$ newPath = newPath.removeLastSegments(1).append(fileName); newFile(path, newPath); } @@ -143,14 +153,16 @@ } IProject project = res.getProject(); try { - IProjectNature nature = project - .getNature(JavaCore.NATURE_ID); - if (nature != null) { - IJavaProject javaProject = JavaCore.create(project); - IPath outPut = javaProject.getOutputLocation(); - IPath removeRes = res.getFullPath(); - if (outPut.isPrefixOf(removeRes)) { - break; + if (project.isOpen()) { + IProjectNature nature = project + .getNature(JavaCore.NATURE_ID); + if (nature != null) { + IJavaProject javaProject = JavaCore.create(project); + IPath outPut = javaProject.getOutputLocation(); + IPath removeRes = res.getFullPath(); + if (outPut.isPrefixOf(removeRes)) { + break; + } } } } catch (CoreException e) { @@ -158,7 +170,8 @@ } IPath path = res.getFullPath(); String fileName = path.lastSegment(); - fileName += Messages.getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$ + fileName += Messages + .getString("SmooksResourceChangeListener.SmooksGraphFileExtensionName"); //$NON-NLS-1$ path = path.removeLastSegments(1).append(fileName); deleteFile(path); break; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -136,8 +136,8 @@ .createErrorStatus(e)); } } - - protected void assosiateEditors(){ + + protected void assosiateEditors() { xmlTextEditor.addSaveListener(graphicalPage); graphicalPage.addAnalyzeListener(xmlTextEditor); graphicalPage.addAnalyzeListener(normalPage); @@ -240,11 +240,12 @@ @Override public void doSave(IProgressMonitor monitor) { this.graphicalPage.doSave(monitor); -// IEditorPart activeEditor = this.getEditor(this.getCurrentPage()); -// if (activeEditor != normalPage && activeEditor != null) { -// activeEditor.doSave(monitor); -// fireEditorDirty(false); -// } + fireEditorDirty(false); + // IEditorPart activeEditor = this.getEditor(this.getCurrentPage()); + // if (activeEditor != normalPage && activeEditor != null) { + // activeEditor.doSave(monitor); + // fireEditorDirty(false); + // } } public void fireEditorDirty(boolean dirty) { @@ -268,10 +269,6 @@ public Object getAdapter(Class adapter) { if (adapter == IPropertySheetPage.class) { - System.out.println(); - } - if (adapter == IPropertySheetPage.class - && this.getActiveEditor() == graphicalPage) { tabbedPropertySheetPage = new TabbedPropertySheetPage(this); return tabbedPropertySheetPage; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -117,7 +117,14 @@ setGUIStates(); } + + + @Override + public boolean isDirty() { + return false; + } + public void setGUIStates() { if (resourceBlock != null) { resourceBlock.setSectionStates(!disableGUI); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeItemRelationFigure.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -45,21 +45,25 @@ graphics.popState(); } - public void caculateLocationY() { - if (treeItem != null) { + if (treeItem != null && !treeItem.isDisposed()) { int y = this.collapsedParentItemLocation(treeItem); Tree tree = treeItem.getParent(); int height = tree.getItemHeight(); - this.setLocation(new Point(0, y + height/2)); + this.setLocation(new Point(0, y + height / 2)); } } protected int collapsedParentItemLocation(TreeItem item) { - int y = item.getBounds().y; - if (y == 0) { - if (item.getParentItem() != null) - return this.collapsedParentItemLocation(item.getParentItem()); + int y = 0; + if (item != null && !item.isDisposed()) { + y = item.getBounds().y; + if (y == 0) { + if (item.getParentItem() != null) + return this.collapsedParentItemLocation(item + .getParentItem()); + } + return y; } return y; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/AbstractStructuredDataConnectionModel.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -4,6 +4,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public class AbstractStructuredDataConnectionModel implements PropertyChangeListener { @@ -78,7 +79,7 @@ return properties.toArray(); } - protected List<PropertyModel> getProperties() { + public List<PropertyModel> getProperties() { return properties; } @@ -92,6 +93,19 @@ support.firePropertyChange(CONNECTION_PROPERTY_CHANGE, null, property); } + public void removePropertyModel(String propertyName){ + List<PropertyModel> list= this.getProperties(); + for (Iterator<PropertyModel> iterator = list.iterator(); iterator.hasNext();) { + PropertyModel propertyModel = (PropertyModel) iterator.next(); + if(propertyModel.getName().equals(propertyName)){ + list.remove(propertyModel); + support.firePropertyChange(CONNECTION_PROPERTY_CHANGE, propertyModel, null); + break; + } + } + + } + public void removePropertyModel(PropertyModel property){ property.removePropertyChangeListener(this); this.getProperties().remove(property); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jst.jsp.core.internal.modelhandler.TagModelLoader; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Shell; @@ -45,6 +46,8 @@ import org.jboss.tools.smooks.ui.gef.model.PropertyModel; import org.jboss.tools.smooks.ui.gef.model.TargetModel; import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; import org.jboss.tools.smooks.xml.model.TagObject; /** @@ -54,7 +57,7 @@ */ public class UIUtils { - public static final String[] SELECTORE_SPLITER = new String[] { "\\", //$NON-NLS-1$ + public static final String[] SELECTORE_SPLITER = new String[] { "\\", //$NON-NLS-1$ "/" }; //$NON-NLS-1$ public static FillLayout createFillLayout(int marginW, int marginH) { @@ -64,6 +67,20 @@ return fill; } + public static AbstractXMLObject getRootTagXMLObject(AbstractXMLObject xmlObj) { + AbstractXMLObject parent = xmlObj.getParent(); + while (true) { + AbstractXMLObject p = parent.getParent(); + if (p == null) + break; + parent = p; + } + if (parent instanceof DocumentObject) { + parent = ((DocumentObject) parent).getRootTag(); + } + return parent; + } + public static void checkSelector(String selector) throws InvocationTargetException { if (selector == null) @@ -71,9 +88,12 @@ for (int i = 0; i < SELECTORE_SPLITER.length; i++) { String splitString = SELECTORE_SPLITER[i]; if (selector.indexOf(splitString) != -1) { - throw new InvocationTargetException(new Exception( - Messages.getString("UIUtils.SelectorCheckErrorMessage1") + splitString //$NON-NLS-1$ - + Messages.getString("UIUtils.SelectorCheckErrorMessage2") + selector + "\"")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new InvocationTargetException( + new Exception( + Messages + .getString("UIUtils.SelectorCheckErrorMessage1") + splitString //$NON-NLS-1$ + + Messages + .getString("UIUtils.SelectorCheckErrorMessage2") + selector + "\"")); //$NON-NLS-1$ //$NON-NLS-2$ } } } @@ -157,19 +177,24 @@ LineConnectionModel connection) { AbstractStructuredDataModel sourceModel = (AbstractStructuredDataModel) connection .getSource(); - Object referenceObj = sourceModel.getReferenceEntityModel(); - return isInstanceCreatingConnection(referenceObj); + AbstractStructuredDataModel targetModel = (AbstractStructuredDataModel) connection + .getTarget(); + Object target = targetModel.getReferenceEntityModel(); + Object source = sourceModel.getReferenceEntityModel(); + return isInstanceCreatingConnection(source, target); } - public static boolean isInstanceCreatingConnection(Object targetModel) { - Object referenceObj = targetModel; - if (referenceObj != null) { - if (referenceObj instanceof JavaBeanModel) { - return !((JavaBeanModel) referenceObj).isPrimitive(); + public static boolean isInstanceCreatingConnection(Object sourceModel, + Object targetModel) { + if (targetModel != null) { + if (targetModel instanceof JavaBeanModel) { + if (sourceModel instanceof TagObject) { + return !((JavaBeanModel) targetModel).isPrimitive(); + } + if (sourceModel instanceof JavaBeanModel) { + return !((JavaBeanModel) targetModel).isPrimitive(); + } } - if (referenceObj instanceof TagObject) { - return true; - } } return false; } @@ -185,11 +210,11 @@ context); CompositeResolveCommand compositeCommand = new CompositeResolveCommand( context); - compositeCommand - .setResolveDescription(Messages.getString("UIUtils.ConnectAllConnections")); //$NON-NLS-1$ - disconnectCommand - .setResolveDescription(Messages.getString("UIUtils.DisconnectAllConnections") //$NON-NLS-1$ - + currentNode.getName() + Messages.getString("UIUtils.Node")); //$NON-NLS-1$ + compositeCommand.setResolveDescription(Messages + .getString("UIUtils.ConnectAllConnections")); //$NON-NLS-1$ + disconnectCommand.setResolveDescription(Messages + .getString("UIUtils.DisconnectAllConnections") //$NON-NLS-1$ + + currentNode.getName() + Messages.getString("UIUtils.Node")); //$NON-NLS-1$ AbstractStructuredDataModel targetNode = UIUtils.findGraphModel(root, currentNode); if (targetNode instanceof IConnectableModel) { @@ -214,9 +239,11 @@ if (tempMap.get(sourceParentNode) == null) { JavaModelConnectionResolveCommand connectParent = new JavaModelConnectionResolveCommand( context); - connectParent.setResolveDescription(Messages.getString("UIUtils.ConnectNode1") //$NON-NLS-1$ + connectParent.setResolveDescription(Messages + .getString("UIUtils.ConnectNode1") //$NON-NLS-1$ + context.getSourceViewerLabelProvider().getText( - sourceParent) + Messages.getString("UIUtils.ConnectNode2") //$NON-NLS-1$ + sourceParent) + + Messages.getString("UIUtils.ConnectNode2") //$NON-NLS-1$ + parentNode.getName() + "\""); //$NON-NLS-1$ connectParent.setSourceModel(sourceParentNode); connectParent.setTargetModel(targetParentNode); @@ -259,11 +286,13 @@ if (pgm != null && pgm instanceof IConnectableModel) { if (((IConnectableModel) pgm) .getModelTargetConnections().isEmpty()) { - String errorMessage = Messages.getString("UIUtils.ParentNodeConnectErrorMessage1") //$NON-NLS-1$ + String errorMessage = Messages + .getString("UIUtils.ParentNodeConnectErrorMessage1") //$NON-NLS-1$ + javaModel.getName() + "\" : \"" //$NON-NLS-1$ + parent.getName() - + Messages.getString("UIUtils.ParentNodeConnectErrorMessage2"); //$NON-NLS-1$ + + Messages + .getString("UIUtils.ParentNodeConnectErrorMessage2"); //$NON-NLS-1$ DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult(); dr.setErrorMessage(errorMessage); createJavaModelConnectionErrorResolveCommand(dr, @@ -306,14 +335,18 @@ } if (instanceClazz == null) { DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult(); - result.setErrorMessage(Messages.getString("UIUtils.InstanceLoadedErrorMessage1") //$NON-NLS-1$ - + ((JavaBeanModel) refObj).getName() - + Messages.getString("UIUtils.InstanceLoadedErrorMessage2") //$NON-NLS-1$ - + instanceName + "\""); //$NON-NLS-1$ + result + .setErrorMessage(Messages + .getString("UIUtils.InstanceLoadedErrorMessage1") //$NON-NLS-1$ + + ((JavaBeanModel) refObj).getName() + + Messages + .getString("UIUtils.InstanceLoadedErrorMessage2") //$NON-NLS-1$ + + instanceName + "\""); //$NON-NLS-1$ JavaModelResolveCommand command = new JavaModelResolveCommand( context); command - .setResolveDescription(Messages.getString("UIUtils.InstanceLoadedResolveMessage1") //$NON-NLS-1$ + .setResolveDescription(Messages + .getString("UIUtils.InstanceLoadedResolveMessage1") //$NON-NLS-1$ + ((JavaBeanModel) refObj) .getBeanClass() .getCanonicalName() + "\""); //$NON-NLS-1$ @@ -325,16 +358,22 @@ } if (instanceClazz != null && instanceClazz.isInterface()) { DesignTimeAnalyzeResult result = new DesignTimeAnalyzeResult(); - result.setErrorMessage(Messages.getString("UIUtils.JavaModelLoadedErrorMessage1") //$NON-NLS-1$ - + ((JavaBeanModel) refObj).getName() - + Messages.getString("UIUtils.JavaModelLoadedErrorMessage2") //$NON-NLS-1$ - + instanceName + "\""); //$NON-NLS-1$ + result + .setErrorMessage(Messages + .getString("UIUtils.JavaModelLoadedErrorMessage1") //$NON-NLS-1$ + + ((JavaBeanModel) refObj).getName() + + Messages + .getString("UIUtils.JavaModelLoadedErrorMessage2") //$NON-NLS-1$ + + instanceName + "\""); //$NON-NLS-1$ if (List.class.isAssignableFrom(instanceClazz)) { JavaModelResolveCommand command = new JavaModelResolveCommand( context); command - .setResolveDescription(Messages.getString("UIUtils.InstanceClassResolveMessage1")); //$NON-NLS-1$ - command.setInstanceName(Messages.getString("UIUtils.InstanceClassResolveMessage2")); //$NON-NLS-1$ + .setResolveDescription(Messages + .getString("UIUtils.InstanceClassResolveMessage1")); //$NON-NLS-1$ + command + .setInstanceName(Messages + .getString("UIUtils.InstanceClassResolveMessage2")); //$NON-NLS-1$ command.setJavaBean((JavaBeanModel) refObj); result.addResolveCommand(command); } @@ -481,7 +520,9 @@ .getTreeCotentProvider(dataTypeID); if (tprovider == null) return false; - viewer.setLabelProvider(new DecoratingLabelProvider(lprovider, null)); + viewer.setLabelProvider(new DecoratingLabelProvider(lprovider, + SmooksUIActivator.getDefault().getWorkbench() + .getDecoratorManager().getLabelDecorator())); viewer.setContentProvider(tprovider); return true; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -23,6 +23,16 @@ protected String name; + public String getNamespaceURL() { + return namespaceURL; + } + + public void setNamespaceURL(String namespaceURL) { + this.namespaceURL = namespaceURL; + } + + protected String namespaceURL = null; + protected List<AbstractXMLObject> children = new ArrayList<AbstractXMLObject>(); public String getName() { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -64,7 +64,7 @@ } tag.setName(element.getName()); fillProperties(element, tag); - + tag.setNamespaceURL(element.getNamespaceURI()); List list = element.elements(); for (Iterator iterator = list.iterator(); iterator.hasNext();) { Element childElement = (Element) iterator.next(); @@ -79,8 +79,8 @@ } protected boolean hasSameNameProperty(String proName, TagObject tag) { - List pros = tag.getProperties(); - for (Iterator iterator = pros.iterator(); iterator.hasNext();) { + List<TagPropertyObject> pros = tag.getProperties(); + for (Iterator<TagPropertyObject> iterator = pros.iterator(); iterator.hasNext();) { TagPropertyObject tp = (TagPropertyObject) iterator.next(); if (tp.getName().equals(proName)) return true; @@ -97,7 +97,7 @@ } TagPropertyObject pro = new TagPropertyObject(); pro.setName(attr.getName()); - + pro.setNamespaceURL(attr.getNamespaceURI()); tag.addProperty(pro); } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSection.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSection.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSection.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -0,0 +1,146 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +import java.util.Iterator; +import java.util.List; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.forms.widgets.Section; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; +import org.jboss.tools.smooks.ui.AbstractSmooksPropertySection; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.PropertyModel; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; + +/** + * @author Dart + * + */ +public class XMLPropertiesSection extends AbstractSmooksPropertySection { + + private static final String SELECTOR_NAMESPACE = "selector-namespace"; + private Text namespaceText; + private Button checkButton; + + @Override + public void createControls(Composite parent, + TabbedPropertySheetPage tabbedPropertySheetPage) { + super.createControls(parent, tabbedPropertySheetPage); + TabbedPropertySheetWidgetFactory factory = tabbedPropertySheetPage + .getWidgetFactory(); + Section section = createRootSection(factory, parent); + section.setText("XML Properties"); //$NON-NLS-1$ + + section.setLayout(new FillLayout()); + + Composite com = factory.createComposite(section); + section.setClient(com); + + GridLayout gl = new GridLayout(); + gl.numColumns = 2; + com.setLayout(gl); + + checkButton = factory.createButton(com, "Set Namespace", SWT.CHECK); + checkButton.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + if (isLock()) + return; + boolean check = checkButton.getSelection(); + if (check) { + LineConnectionModel connection = getLineConnectionModel(); + AbstractXMLObject obj = getXMLSourceModel(); + if (connection != null && obj != null) { + PropertyModel property = new PropertyModel(); + property.setName(SELECTOR_NAMESPACE); + property.setValue(obj.getNamespaceURL()); + connection.addPropertyModel(property); + } + } else { + LineConnectionModel connection = getLineConnectionModel(); + if (connection != null) { + connection.removePropertyModel(SELECTOR_NAMESPACE); + } + } + fireDirty(); + } + + }); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + checkButton.setLayoutData(gd); + + factory.createLabel(com, "Namespace : "); + namespaceText = factory.createText(com, ""); + gd = new GridData(GridData.FILL_HORIZONTAL); + namespaceText.setLayoutData(gd); + namespaceText.setEditable(false); + } + + @Override + public void refresh() { + super.refresh(); + lockEventFire(); + checkButton.setSelection(false); + unLockEventFire(); + AbstractXMLObject source = this.getXMLSourceModel(); + if (source != null) { + String namespace = source.getNamespaceURL(); + if (namespace != null) { + namespaceText.setText(namespace); + LineConnectionModel connection = getLineConnectionModel(); + if (connection != null) { + List<PropertyModel> list = connection.getProperties(); + for (Iterator<PropertyModel> iterator = list.iterator(); iterator + .hasNext();) { + PropertyModel propertyModel = (PropertyModel) iterator + .next(); + if (propertyModel.getName() + .equals(SELECTOR_NAMESPACE)) { + if (propertyModel.getValue().equals(namespace)) { + lockEventFire(); + checkButton.setSelection(true); + unLockEventFire(); + } + } + } + } + } + } + } + + /** + * Get the XML type source model + * + * @return XML data type source model + */ + private AbstractXMLObject getXMLSourceModel() { + LineConnectionModel connection = this.getLineConnectionModel(); + if (connection != null) { + AbstractStructuredDataModel sourceModel = (AbstractStructuredDataModel) connection + .getSource(); + if (sourceModel != null) { + Object source = sourceModel.getReferenceEntityModel(); + if (source instanceof AbstractXMLObject) { + return (AbstractXMLObject) source; + } + } + } + + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSectionFilter.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSectionFilter.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSectionFilter.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -0,0 +1,29 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +import org.jboss.tools.smooks.ui.AbstractConnectionModelSectionFilter; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; + +/** + * @author Dart + * + */ +public class XMLPropertiesSectionFilter extends + AbstractConnectionModelSectionFilter { + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IFilter#select(java.lang.Object) + */ + public boolean select(Object toTest) { + Object source = getReferenceSourceObject(toTest); + if (source != null && source instanceof AbstractXMLObject) { + return true; + } + return false; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLPropertiesSectionFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelDecorator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelDecorator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelDecorator.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -0,0 +1,77 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +import org.eclipse.jface.viewers.IDecorationContext; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.LabelDecorator; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; + +/** + * @author Dart + * + */ +public class XMLStructuredDataLabelDecorator extends LabelDecorator { + + @Override + public Image decorateImage(Image image, Object element, + IDecorationContext context) { + return null; + } + + @Override + public String decorateText(String text, Object element, + IDecorationContext context) { + return null; + } + + @Override + public boolean prepareDecoration(Object element, String originalText, + IDecorationContext context) { + return false; + } + + public Image decorateImage(Image image, Object element) { + // TODO Auto-generated method stub + return null; + } + + public String decorateText(String text, Object element) { + if (element instanceof AbstractXMLObject) { + AbstractXMLObject parent = UIUtils + .getRootTagXMLObject((AbstractXMLObject) element); + String namespace = parent.getNamespaceURL(); + if (parent != element && namespace != null) { + namespace = namespace.trim(); + if (namespace.equals(((AbstractXMLObject) element).getNamespaceURL())) { + return text; + } + } + if (((AbstractXMLObject) element).getNamespaceURL() != null) + text += " [" + + ((AbstractXMLObject) element).getNamespaceURL() + "]"; + return text; + } + return text; + } + + public void addListener(ILabelProviderListener listener) { + + } + + public void dispose() { + + } + + public boolean isLabelProperty(Object element, String property) { + return false; + } + + public void removeListener(ILabelProviderListener listener) { + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-17 04:10:06 UTC (rev 11834) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-11-17 06:33:24 UTC (rev 11835) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.tools.smooks.xml2java.analyzer; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -114,6 +117,17 @@ // addResourceConfigType(listType, resourceConfigType); // set the selector string value resourceConfigType.setSelector(source.getName()); + + // add the properties of connection + List<PropertyModel> propertyList = connection.getProperties(); + for (Iterator<PropertyModel> iterator = propertyList.iterator(); iterator.hasNext();) { + PropertyModel propertyModel = (PropertyModel) iterator.next(); + if (propertyModel.getName().equals("selector-namespace")) { + resourceConfigType.setSelectorNamespace(propertyModel + .getValue()); + break; + } + } // create a resource and add it to resourceConfig ResourceType resourceType = SmooksFactory.eINSTANCE .createResourceType(); @@ -224,9 +238,10 @@ // TODO if the type of input source/target data is illegal , throw // exceptions. // MODIFY by Dart 2008.11.07 -// throw new RuntimeException( -// "[XMLBeanAnalyzer]Can't load the source/target data from Smooks configuration file."); - return MappingResourceConfigList.createEmptyList(); + // throw new RuntimeException( + // "[XMLBeanAnalyzer]Can't load the source/target data from Smooks configuration file." + // ); + return MappingResourceConfigList.createEmptyList(); } AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject; JavaBeanModel sourceTarget = (JavaBeanModel) targetObject; @@ -237,15 +252,16 @@ // TODO if can't find the org.milyn.javabean.BeanPopulator , throw // exception // MODIFY by Dart 2008.11.07 -// throw new RuntimeException("Can't parse the config file."); - return null; + // throw new RuntimeException("Can't parse the config file."); + return null; } String xmlName = rootResourceConfig.getSelector(); AbstractXMLObject source = findXMLObjectByName(xmlName, sourceRoot); if (source == null) { // TODO if can't find the root , throw exception // MODIFY by Dart 2008.11.07 - throw new RuntimeException(Messages.getString("XML2JavaAnalyzer.CantFindRootNodeErrorMessage")); //$NON-NLS-1$ + throw new RuntimeException(Messages + .getString("XML2JavaAnalyzer.CantFindRootNodeErrorMessage")); //$NON-NLS-1$ // return MappingResourceConfigList.createEmptyList(); } @@ -290,6 +306,21 @@ MappingModel mapping = new MappingModel(sourceRoot, targetJavaBean); configList.getMappingModelList().add(mapping); + String namespace = config.getSelectorNamespace(); + if(namespace != null){ + PropertyModel np = new PropertyModel(); + np.setName("selector-namespace"); + np.setValue(namespace); + mapping.getProperties().add(np); + } +// String targetProfile = config.getTargetProfile(); +// if(targetProfile != null){ +// PropertyModel np = new PropertyModel(); +// np.setName("targetProfile"); +// np.setValue(targetProfile); +// mapping.getProperties().add(np); +// } + configList.addResourceConfig(config); this.setSelectorIsUsed(config.getSelector()); @@ -340,7 +371,9 @@ if (newRoot == null) { // TODO If can't find the element , throw exception // MODIFY by Dart , 2008.11.07 - throw new RuntimeException(Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1")+ newSelector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new RuntimeException( + Messages + .getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1") + newSelector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$ } createMappingResourceConfigList(configList, listType, resourceConfig1, newRoot, targetBean); @@ -350,7 +383,9 @@ if (source == null) { // TODO If can't find the element , throw exception // MODIFY by Dart , 2008.11.07 - throw new RuntimeException(Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1")+ selector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new RuntimeException( + Messages + .getString("XML2JavaAnalyzer.CantFindNodeErrorMessage1") + selector + Messages.getString("XML2JavaAnalyzer.CantFindNodeErrorMessage2")); //$NON-NLS-1$ //$NON-NLS-2$ } if (source != null) { MappingModel mapping = new MappingModel(source, targetBean); @@ -419,7 +454,8 @@ if (rt == null) continue; String value = rt.getValue(); - if(value != null) value = value.trim(); + if (value != null) + value = value.trim(); if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { return resource; } @@ -489,8 +525,10 @@ boolean connectAuto = MessageDialog .openQuestion( displayParent, - Messages.getString("XML2JavaAnalyzer.ConnectQDlgTitle"), //$NON-NLS-1$ - Messages.getString("XML2JavaAnalyzer.ConnectQDlgContent")); //$NON-NLS-1$ + Messages + .getString("XML2JavaAnalyzer.ConnectQDlgTitle"), //$NON-NLS-1$ + Messages + .getString("XML2JavaAnalyzer.ConnectQDlgContent")); //$NON-NLS-1$ if (connectAuto) { // connect root model LineConnectionModel connectionModel = new LineConnectionModel();

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11834 - trunk/i18n.

by jbosstools-commits＠lists.jboss.org

Author: sflanigan Date: 2008-11-16 23:10:06 -0500 (Sun, 16 Nov 2008) New Revision: 11834 Modified: trunk/i18n/build.xml trunk/i18n/pom.xml Log: Changed prop2pot task to use filename mappers; added P2 metadata generation step. Modified: trunk/i18n/build.xml =================================================================== --- trunk/i18n/build.xml 2008-11-16 22:24:49 UTC (rev 11833) +++ trunk/i18n/build.xml 2008-11-17 04:10:06 UTC (rev 11834) @@ -2,8 +2,7 @@ <project name="org.jboss.tools.translations" default="debug" basedir="." xmlns:artifact="urn:maven-artifact-ant"> - <path id="jbtdir" path=".."> - </path> + <path id="jbtdir" path=".." /> <property name="jbt.srcdir" value="${toString:jbtdir}" /> <property file="i18n.properties" /> @@ -54,6 +53,10 @@  <taskdef resource="net/uworks/andariel/andariel.properties" classpathref="dependency.classpath" /> + + <taskdef name="groovy" + classname="org.codehaus.groovy.ant.Groovy" + classpathref="dependency.classpath"/>  <taskdef name="prop2pot" classname="org.fedorahosted.tennera.antgettext.Prop2PotTask" classpathref="dependency.classpath" /> @@ -86,31 +89,59 @@ <delete dir="${zipdir}" /> <delete dir="${target.dir}" includes="*.tmp" /> </target> - - <target name="prop2pot" description="Extract translation templates (POT) from the JBoss Tools English properties files" depends="init"> - <delete dir="${potdir}" /> + + + paths under jbt.srcdir look like: ${module}/plugins/${plugin}/{src,main,...} <dirset dir="${jbt.srcdir}" includes="*/plugins/*/*" excludes="${srcexcludes}" /> </path> <sequential> -  - <propertyregex override="true" property="relativesrcdir" - input="@{srcdir}" regexp="^${jbt.srcdir}${file.separator}(.*)" select="\1" /> - <checkprop propname="relativesrcdir"/> - <propertyregex override="true" property="plugin" - input="@{srcdir}" - regexp="^${jbt.srcdir}${file.separator}[^/\\]+${file.separator}plugins${file.separator}([^/\\]+)${file.separator}.*" - select="\1" /> - <checkprop propname="plugin"/> - <echo level="verbose" message="extracting strings from @{srcdir} -> ${potdir}/${relativesrcdir}"/> - <prop2pot srcDir="@{srcdir}" dstDir="${potdir}/${relativesrcdir}" /> + <echo level="verbose" message="Extracting strings from @{srcdir}"/> + <prop2pot srcDir="@{srcdir}" dstDir="${potdir}"> + <packagemapper from="*.properties" to="*.pot" /> + </prop2pot> </sequential> </for> </target> +--> + + <target name="prop2pot" depends="init" + description="Extract translation templates (POT) from the JBoss Tools English properties files"> + <mkdir dir="${potdir}" /> +  + <prop2pot srcDir="${jbt.srcdir}" dstDir="${potdir}" includes="*/plugins/*/src/**/*.properties"> + <chainedmapper> +  + <regexpmapper from="^.*/plugins/(.*)/src/(.*)" to="\1-\2" /> +  + <packagemapper from="*.properties" to="*.pot" /> +  +  + +  + </chainedmapper> + </prop2pot> + </target>  <target name="en" depends="init" description="Generate English PO files from POT files"> @@ -160,18 +191,18 @@ </macrodef>  - <macrodef name="processplugins"> + <macrodef name="processlocaleplugins"> <attribute name="rootdir" /> <attribute name="task" /> <sequential> <for param="plugindir"> <path> - <dirset dir="@{rootdir}" includes="*/*/plugins/*"> - </dirset> + <dirset dir="@{rootdir}" includes="*/*/plugins/*" /> </path> <sequential> +  <propertyregex override="true" property="locale" input="@{plugindir}" regexp="^(a){rootdir}${file.separator}([^/\\]+)${file.separator}.*" @@ -190,6 +221,7 @@ <propertycopy override="true" property="localename" from="NAME_${locale}"/> <echo level="verbose" message="@{plugindir} contains ${locale} props for plugin ${plugin} in module ${module}"/> <antcall target="@{task}"> + <param name="plugin" value="@{plugin}"/> <param name="plugindir" value="@{plugindir}"/> </antcall> </sequential> @@ -201,11 +233,11 @@ generating manifests --> <target name="manifests" depends="init" description="Generate fragment plugin manifests for langpack plugins"> <delete dir="${propdir}" includes="*/*/plugins/*/META-INF/MANIFEST.MF"/> - <processplugins rootdir="${propdir}" task="manifest" /> + <processlocaleplugins rootdir="${propdir}" task="manifest" /> </target> -  +  <target name="manifest">  @@ -230,10 +262,10 @@ <target name="fragments" depends="init" description="Generate fragment plugin jars to contain translations" > <delete dir="${jardir}" /> <mkdir dir="${jardir}/plugins" /> - <processplugins rootdir="${propdir}" task="fragment" /> + <processlocaleplugins rootdir="${propdir}" task="fragment" /> </target> -  +  <target name="fragment">  @@ -288,6 +320,7 @@ <fileset dir="${jbt.srcdir}" includes="*/features/*/feature.xml"/> </path> <sequential> +  <propertyregex override="true" property="module" input="@{featurexml}" regexp="^${jbt.srcdir}${file.separator}([^/\\]+).*" @@ -395,6 +428,38 @@ </copy> </target> + <target name="p2"> +  + + <exec executable="eclipse"> + <arg value="-application" /> + <arg value="org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" /> + <arg value="-updateSite" /> + <arg value="${jardir}" /> + <arg value="-site" /> + <arg value="file://${jardir}/site.xml" /> + <arg value="-metadataRepository" /> + <arg value="file://${jardir}" /> + <arg value="-metadataRepositoryName" /> + <arg value="JBoss Tools Localization Update Site" /> + <arg value="-artifactRepository" /> + <arg value="file://${jardir}" /> + <arg value="-artifactRepositoryName" /> + <arg value="JBoss Tools Localization Artifacts" /> + <arg value="-compress" /> + <arg value="-append" /> + <arg value="-reusePack200Files" /> + <arg value="-noDefaultIUs" /> + <arg value="--launcher.suppressErrors" /> + <arg value="-nosplash" /> + <arg value="-consoleLog" /> + <arg value="-vmargs" /> + <arg value="-Xmx256m" /> + </exec> + </target> + <target name="zips" depends="init" description="Generate zip files containing langpacks, one zip per locale"> <delete dir="${zipdir}" /> <mkdir dir="${zipdir}" /> @@ -412,7 +477,7 @@ </for> </target> - <target name="all" depends="clean, prop2pot, en, qps, en_AA, po2prop, manifests, fragments, features, zips" + <target name="all" depends="clean, prop2pot, en, qps, en_AA, po2prop, manifests, fragments, features, p2, zips" description="Runs all targets in an appropriate order"/> Modified: trunk/i18n/pom.xml =================================================================== --- trunk/i18n/pom.xml 2008-11-16 22:24:49 UTC (rev 11833) +++ trunk/i18n/pom.xml 2008-11-17 04:10:06 UTC (rev 11834) @@ -27,7 +27,7 @@ <dependency> <groupId>org.fedorahosted.tennera</groupId> <artifactId>ant-gettext</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </dependency> <dependency> <groupId>ant-contrib</groupId> @@ -40,5 +40,10 @@ <artifactId>andariel</artifactId> <version>1.2.3</version> </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.5.6</version> + </dependency> </dependencies> </project>

17 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11833 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2008-11-16 17:24:49 -0500 (Sun, 16 Nov 2008) New Revision: 11833 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartEventAcceptsIncomingConnectionStrategy.java Removed: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java Log: use the bpmn related names Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java 2008-11-16 22:24:15 UTC (rev 11832) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/ProcessAcceptsElementStrategy.java 2008-11-16 22:24:49 UTC (rev 11833) @@ -3,7 +3,7 @@ import org.jboss.tools.flow.common.model.Container; import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy; import org.jboss.tools.flow.jpdl4.model.Process; -import org.jboss.tools.flow.jpdl4.model.StartState; +import org.jboss.tools.flow.jpdl4.model.StartEvent; public class ProcessAcceptsElementStrategy implements AcceptsElementStrategy { @@ -12,7 +12,7 @@ public boolean acceptsElement(Object element) { if (process == null) { return false; - } else if (element instanceof StartState) { + } else if (element instanceof StartEvent) { return process.getStartState() == null; } else { return true; Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartEventAcceptsIncomingConnectionStrategy.java (from rev 10811, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java) =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartEventAcceptsIncomingConnectionStrategy.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartEventAcceptsIncomingConnectionStrategy.java 2008-11-16 22:24:49 UTC (rev 11833) @@ -0,0 +1,16 @@ +package org.jboss.tools.flow.jpdl4.strategy; + +import org.jboss.tools.flow.common.model.Connection; +import org.jboss.tools.flow.common.model.Node; +import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy; + +public class StartEventAcceptsIncomingConnectionStrategy implements AcceptsIncomingConnectionStrategy { + + public boolean acceptsIncomingConnection(Connection connection, Node source) { + return false; + } + + public void setNode(Node node) { + } + +} Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartEventAcceptsIncomingConnectionStrategy.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java 2008-11-16 22:24:15 UTC (rev 11832) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/StartStateAcceptsIncomingConnectionStrategy.java 2008-11-16 22:24:49 UTC (rev 11833) @@ -1,16 +0,0 @@ -package org.jboss.tools.flow.jpdl4.strategy; - -import org.jboss.tools.flow.common.model.Connection; -import org.jboss.tools.flow.common.model.Node; -import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy; - -public class StartStateAcceptsIncomingConnectionStrategy implements AcceptsIncomingConnectionStrategy { - - public boolean acceptsIncomingConnection(Connection connection, Node source) { - return false; - } - - public void setNode(Node node) { - } - -}

17 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2008