Author: DartPeng Date: 2009-08-31 03:58:01 -0400 (Mon, 31 Aug 2009) New Revision: 17375 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java Log: JBIDE-4837 Synchroniz the M3 fix bug codes to M4 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-08-31 07:17:53 UTC (rev 17374) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-08-31 07:58:01 UTC (rev 17375) @@ -82,14 +82,14 @@ e.printStackTrace(); } -// graphicalPage = new SmooksGraphicalEditorPart(this); -// addSourceSynchronizeListener(graphicalPage); -// try { -// int index = this.addPage(graphicalPage, getEditorInput()); -// setPageText(index, "Graph"); -// } catch (PartInitException e) { -// e.printStackTrace(); -// } + graphicalPage = new SmooksGraphicalEditorPart(this); + addSourceSynchronizeListener(graphicalPage); + try { + int index = this.addPage(graphicalPage, getEditorInput()); + setPageText(index, "Graph"); + } catch (PartInitException e) { + e.printStackTrace(); + } super.addPages(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-31 07:17:53 UTC (rev 17374) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-08-31 07:58:01 UTC (rev 17375) @@ -2137,10 +2137,13 @@ // Content assist command String command = "org.eclipse.ui.edit.text.contentAssist.proposals"; //$NON-NLS-1$ // Set auto activation character to be a '.' - char[] autoActivationChars = new char[] { '.' }; + char[] chars = new char[allEnglishCharas.length + 1]; + System.arraycopy(allEnglishCharas, 0, chars, 0, allEnglishCharas.length); + chars[chars.length - 1] = '.'; +// char[] autoActivationChars = new char[] { '.' }; // Create the adapter ContentAssistCommandAdapter adapter = new ContentAssistCommandAdapter(text, textContentAdapter, - proposalProvider, command, autoActivationChars); + proposalProvider, command, chars); // Configure the adapter // Add label provider ILabelProvider labelProvider = new TypeProposalLabelProvider(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-08-31 07:17:53 UTC (rev 17374) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-08-31 07:58:01 UTC (rev 17375) @@ -104,7 +104,7 @@ IXMLStructuredObject model = null; model = SmooksUIUtils.localXMLNodeWithPath(selector, root, "/", false); if (model == null) { - SmooksUIUtils.localXMLNodeWithPath(selector, root, " ", false); + model = SmooksUIUtils.localXMLNodeWithPath(selector, root, " ", false); } if(model == null) return null; IXMLStructuredObject p = model;