JBoss Tools SVN: r16694 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: jspeditor and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-07-21 11:03:37 -0400 (Tue, 21 Jul 2009)
New Revision: 16694
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
Dependency on old KbConnector removed from visual page editor.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java 2009-07-21 13:56:21 UTC (rev 16693)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java 2009-07-21 15:03:37 UTC (rev 16694)
@@ -12,12 +12,10 @@
import java.util.List;
-import org.jboss.tools.common.kb.wtp.WtpKbConnector;
import org.jboss.tools.jst.web.tld.TaglibData;
public interface IVisualContext {
public void refreshBundleValues();
- public WtpKbConnector getConnector();
public List<TaglibData> getIncludeTaglibs();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2009-07-21 13:56:21 UTC (rev 16693)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2009-07-21 15:03:37 UTC (rev 16694)
@@ -16,11 +16,6 @@
import java.util.List;
import org.eclipse.jface.text.IDocument;
-import org.jboss.tools.common.kb.KbConnectorFactory;
-import org.jboss.tools.common.kb.KbConnectorType;
-import org.jboss.tools.common.kb.KbException;
-import org.jboss.tools.common.kb.wtp.WtpKbConnector;
-import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.editor.IVisualContext;
import org.jboss.tools.jst.jsp.util.XmlUtil;
import org.jboss.tools.jst.web.tld.TaglibData;
@@ -43,10 +38,6 @@
private IDocument iDocument;
/**
- * Kb connector
- */
- private WtpKbConnector connector = null;
- /**
* references node
*/
private Node referenceNode = null;
@@ -69,7 +60,6 @@
public void dispose() {
clearAll();
- setConnector(null);
setReferenceNode(null);
setPageContext(null);
iDocument = null;
@@ -107,11 +97,6 @@
setTaglibs(taglibs);
}
}
- try {
- connector = (WtpKbConnector)KbConnectorFactory.getIntstance().createConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, iDocument);
- } catch (KbException e) {
- JspEditorPlugin.getPluginLog().logError(e);
- }
}
public void collectRefNodeTagLibs() {
@@ -140,11 +125,6 @@
}
// implements IVisualContext
- public WtpKbConnector getConnector() {
- return connector;
- }
-
- // implements IVisualContext
public void refreshBundleValues() {
updateTagLibs();
}
@@ -201,13 +181,6 @@
}
/**
- * @param connector the connector to set
- */
- public void setConnector(WtpKbConnector connector) {
- this.connector = connector;
- }
-
- /**
* @return the pageContext
*/
private IVisualContext getPageContext() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java 2009-07-21 13:56:21 UTC (rev 16693)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java 2009-07-21 15:03:37 UTC (rev 16694)
@@ -82,9 +82,7 @@
//ValueHelper valueHelper = (ValueHelper)context.get("valueHelper");
IPageContext pageContext = (IPageContext)context.get("pageContext"); //$NON-NLS-1$
KbQuery kbQuery = (KbQuery)context.get("kbQuery"); //$NON-NLS-1$
- IAttribute[] attrs = PageProcessor.getInstance().getAttributes(kbQuery, pageContext);
-
ValueHelper valueHelper = new ValueHelper();
root = valueHelper.getInitalInput(pageContext, kbQuery);
treeViewer.setInput(root);
16 years, 9 months
JBoss Tools SVN: r16693 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits@lists.jboss.org
Author: chukhutsina
Date: 2009-07-21 09:56:21 -0400 (Tue, 21 Jul 2009)
New Revision: 16693
Modified:
trunk/jsf/docs/userguide/en/modules/palette.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-795 - The info about the new capabilities available while adding Custom tag library was added to the Visual Web tools Guide. </p>
</body></html>
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2009-07-21 10:07:32 UTC (rev 16692)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2009-07-21 13:56:21 UTC (rev 16693)
@@ -463,7 +463,10 @@
<property>".tld"</property>
</emphasis> file or the <emphasis role="italic">
<property>".jar"</property>
- </emphasis> that includes your tag library under the lib folder in your project. </para>
+ </emphasis> that includes your tag library under the lib folder in your project.
+ Or you can just add <emphasis> <property>".tld"</property>
+ </emphasis>or <emphasis>
+ <property>".jar"</property></emphasis> file to the classpath , and the library will be added to the Tag Library List in Web Projects View.</para>
<section id="Drag_and_Drop65332">
<?dbhtml filename="DragAndDrop.html"?>
<title>Drag-and-Drop</title>
16 years, 9 months
JBoss Tools SVN: r16692 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource.
by jbosstools-commits@lists.jboss.org
Author: Grid.Qian
Date: 2009-07-21 06:07:32 -0400 (Tue, 21 Jul 2009)
New Revision: 16692
Modified:
trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
Log:
JBIDE-4637: java.lang.NullPointerException when open a bpel file that only has a correlationSet element
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java 2009-07-21 09:33:20 UTC (rev 16691)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/resource/BPELReader.java 2009-07-21 10:07:32 UTC (rev 16692)
@@ -607,6 +607,11 @@
protected void setProperties(Element element, EObject eObject, String propertyName) {
String propertyAttribute = element.getAttribute(propertyName);
+ // added by Grid.Qian
+ // we should permit user add a correlation without properties
+ if(propertyAttribute == null){
+ return;
+ }
StringTokenizer st = new StringTokenizer(propertyAttribute);
while (st.hasMoreTokens()) {
16 years, 9 months
JBoss Tools SVN: r16691 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: configuration/editors/edi and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-07-21 05:33:20 -0400 (Tue, 21 Jul 2009)
New Revision: 16691
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
Log:
JBIDE-4584
Create a new EDI parser
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java 2009-07-21 07:53:25 UTC (rev 16690)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SelectoreSelectionDialog.java 2009-07-21 09:33:20 UTC (rev 16691)
@@ -44,6 +44,7 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.editors.csv.CSVDataParser;
+import org.jboss.tools.smooks.configuration.editors.edi.EDIDataParser;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModelFactory;
import org.jboss.tools.smooks.configuration.editors.uitls.JsonInputDataParser;
@@ -254,6 +255,17 @@
String path = SmooksModelUtils.getInputPath(inputType);
if (type != null && path != null) {
path = path.trim();
+ if (SmooksModelUtils.INPUT_TYPE_EDI.equals(type)) {
+ EDIDataParser parser = new EDIDataParser();
+ try {
+ TagList tl = parser.parseEDIFile(path, inputType, smooksResourceListType);
+ if (tl != null) {
+ list.addAll(((TagList) tl).getChildren());
+ }
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
if (SmooksModelUtils.INPUT_TYPE_CSV.equals(type)) {
CSVDataParser parser = new CSVDataParser();
try {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java 2009-07-21 07:53:25 UTC (rev 16690)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java 2009-07-21 09:33:20 UTC (rev 16691)
@@ -10,14 +10,175 @@
******************************************************************************/
package org.jboss.tools.smooks.configuration.editors.edi;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.dom4j.DocumentException;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.configuration.editors.xml.TagList;
+import org.jboss.tools.smooks.configuration.editors.xml.XMLObjectAnalyzer;
+import org.jboss.tools.smooks.model.edi.EDIReader;
+import org.jboss.tools.smooks.model.graphics.ext.InputType;
+import org.jboss.tools.smooks.model.graphics.ext.ParamType;
+import org.jboss.tools.smooks.model.smooks.AbstractReader;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+import org.milyn.Smooks;
+import org.milyn.SmooksUtil;
+import org.milyn.cdr.SmooksResourceConfiguration;
+import org.milyn.smooks.edi.SmooksEDIReader;
+import org.milyn.xml.XmlUtil;
+import org.w3c.dom.Document;
+
/**
* @author Dart
- *
+ *
*/
public class EDIDataParser {
public static final String USE_AVAILABEL_READER = "use_availableReader";
-
+
public static final String ENCODING = "encoding";
public static final Object MAPPING_MODEL = "mappingModelFile";
+
+ public TagList parseEDIFile(InputStream stream, InputType inputType, SmooksResourceListType resourceList)
+ throws IOException, DocumentException {
+
+ List<ParamType> paramList = inputType.getParam();
+ String encoding = null;
+ String mappingModel = null;
+
+ for (Iterator<?> iterator = paramList.iterator(); iterator.hasNext();) {
+ ParamType paramType = (ParamType) iterator.next();
+ if (paramType.getName().equals(USE_AVAILABEL_READER)) {
+ if (paramType.getValue().equalsIgnoreCase("true") && resourceList != null) {
+ List<AbstractReader> readers = resourceList.getAbstractReader();
+ int count = 0;
+ int index = -1;
+ for (Iterator<?> iterator2 = readers.iterator(); iterator2.hasNext();) {
+ AbstractReader abstractReader = (AbstractReader) iterator2.next();
+ if (abstractReader instanceof EDIReader) {
+ count++;
+ if (index == -1) {
+ index = readers.indexOf(abstractReader);
+ }
+ }
+ }
+
+ if (count > 1) {
+ // throw new
+ // RuntimeException("The smooks config file should have only one JSON reader");
+ }
+ if (index != -1) {
+ return parseEDIFile(stream, (EDIReader) readers.get(index));
+ }
+
+ }
+ }
+ if (paramType.getName().equals(ENCODING)) {
+ encoding = paramType.getValue();
+ }
+ if (paramType.getName().equals(MAPPING_MODEL)) {
+ mappingModel = paramType.getValue();
+ }
+ }
+
+ return parseEDIFile(stream, mappingModel, encoding);
+ }
+
+ public TagList parseEDIFile(InputStream ediInputStream, EDIReader reader) throws IOException, DocumentException {
+ String encoding = reader.getEncoding();
+ String mappingModel = reader.getMappingModel();
+ return parseEDIFile(ediInputStream, mappingModel, encoding);
+ }
+
+ public TagList parseEDIFile(InputStream ediInputStream, String mappingModel, String ediFileEncoding)
+ throws IOException, DocumentException {
+ Smooks smooks = new Smooks();
+
+ SmooksResourceConfiguration readerConfig = new SmooksResourceConfiguration("org.xml.sax.driver",
+ SmooksEDIReader.class.getName());
+ File f = new File(mappingModel);
+ String modelPath = mappingModel;
+ if(f.exists()){
+ modelPath = f.toURI().toString();
+ }
+
+ readerConfig.setParameter("mapping-model", modelPath);
+ if (ediFileEncoding == null || ediFileEncoding.trim().length() == 0) {
+ ediFileEncoding = "UTF-8";
+ }
+ readerConfig.setParameter("encoding", ediFileEncoding);
+
+ SmooksUtil.registerResource(readerConfig, smooks);
+
+ // Use a DOM result to capture the message model for the supplied
+ // CSV
+ // message...
+ DOMResult domResult = new DOMResult();
+
+ // Filter the message through Smooks and capture the result as a DOM
+ // in
+ // the domResult instance...
+ // FileInputStream stream
+ smooks.filter(new StreamSource(ediInputStream), domResult);
+
+ // Get the Document object from the domResult. This is the message
+ // model!!!...
+ Document model = (Document) domResult.getNode();
+
+ // So using the model Document, you can construct a tree structure
+ // for
+ // the editor.
+
+ // We'll just print out the model DOM here so you can see it....
+ StringWriter modelWriter = new StringWriter();
+ // System.out.println(modelWriter);
+ XmlUtil.serialize(model, true, modelWriter);
+
+ XMLObjectAnalyzer analyzer = new XMLObjectAnalyzer();
+ ByteArrayInputStream byteinputStream = new ByteArrayInputStream(modelWriter.toString().getBytes());
+ TagList tagList = analyzer.analyze(byteinputStream, null);
+
+ try {
+ if (byteinputStream != null) {
+ byteinputStream.close();
+ byteinputStream = null;
+ }
+ if (modelWriter != null) {
+ modelWriter.close();
+ modelWriter = null;
+ }
+ if (smooks != null) {
+ smooks.close();
+ smooks = null;
+ }
+ if (ediInputStream != null) {
+ ediInputStream.close();
+ ediInputStream = null;
+ }
+ model = null;
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+
+ return tagList;
+ }
+
+ public TagList parseEDIFile(String path, InputType inputType, SmooksResourceListType smooksResourceListType)
+ throws InvocationTargetException, FileNotFoundException, IOException, DocumentException {
+ String filePath = SmooksUIUtils.parseFilePath(path);
+
+ return parseEDIFile(new FileInputStream(filePath), inputType, smooksResourceListType);
+ }
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java 2009-07-21 07:53:25 UTC (rev 16690)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edireader/EDIReaderUICreator.java 2009-07-21 09:33:20 UTC (rev 16691)
@@ -19,6 +19,7 @@
import org.jboss.tools.smooks.configuration.editors.PropertyUICreator;
import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.edimap.editor.EDIMapFormEditor;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.model.edi.EdiPackage;
@@ -39,15 +40,16 @@
* org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object,
* org.eclipse.emf.ecore.EAttribute)
*/
- public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model,
- EAttribute feature, ISmooksModelProvider formEditor, IEditorPart part) {
+ public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent,
+ IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature,
+ ISmooksModelProvider formEditor, IEditorPart part) {
if (feature == EdiPackage.eINSTANCE.getEDIReader_Encoding()) {
}
if (feature == EdiPackage.eINSTANCE.getEDIReader_MappingModel()) {
- return SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor, model, SmooksUIUtils.VALUE_TYPE_VALUE,
- SmooksMultiFormEditor.EDITOR_ID,null);
+ return SmooksUIUtils.createFileSelectionTextFieldEditor(null, parent, null, toolkit, propertyDescriptor,
+ model, SmooksUIUtils.VALUE_TYPE_VALUE, EDIMapFormEditor.EDITOR_ID, null);
}
- return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor,part);
+ return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part);
}
@Override
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-07-21 07:53:25 UTC (rev 16690)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-07-21 09:33:20 UTC (rev 16691)
@@ -78,7 +78,7 @@
public class AbstractSmooksFormEditor extends FormEditor implements IEditingDomainProvider,
ISmooksModelValidateListener , ISmooksModelProvider{
- public static final String EDITOR_ID = "org.jboss.tools.smooks.configuration.editors.MultiPageEditor";
+ public static final String EDITOR_ID = "org.jboss.tools.smooks.edimap.editors.MultiPageEditor";
protected StructuredTextEditor textEditor = null;
16 years, 9 months
JBoss Tools SVN: r16690 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-07-21 03:53:25 -0400 (Tue, 21 Jul 2009)
New Revision: 16690
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataPathWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIMappingDataPathWizardPage.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java
Log:
JBIDE-4584
Add new wizard to record the EDI file path and edi-mapping file path
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-07-21 06:12:30 UTC (rev 16689)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -491,7 +491,8 @@
List<org.jboss.tools.smooks.model.graphics.ext.ParamType> list = input.getParam();
if (INPUT_TYPE_JAVA.equals(input.getType()) || INPUT_TYPE_XML.equals(input.getType())
|| INPUT_TYPE_XSD.equals(input.getType()) || INPUT_TYPE_JSON.equals(input.getType())
- || INPUT_TYPE_CSV.equals(input.getType())) {
+ || INPUT_TYPE_CSV.equals(input.getType())
+ || INPUT_TYPE_EDI.equals(input.getType())) {
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
org.jboss.tools.smooks.model.graphics.ext.ParamType paramType = (org.jboss.tools.smooks.model.graphics.ext.ParamType) iterator
.next();
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors.edi;
+
+/**
+ * @author Dart
+ *
+ */
+public class EDIDataParser {
+ public static final String USE_AVAILABEL_READER = "use_availableReader";
+
+ public static final String ENCODING = "encoding";
+
+ public static final Object MAPPING_MODEL = "mappingModelFile";
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataPathWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataPathWizardPage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataPathWizardPage.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors.edi;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.jboss.tools.smooks.configuration.editors.xml.AbstractFileSelectionWizardPage;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class EDIDataPathWizardPage extends AbstractFileSelectionWizardPage {
+
+ public EDIDataPathWizardPage(String pageName, boolean multiSelect, Object[] initSelections,
+ List<ViewerFilter> filters) {
+ super(pageName, multiSelect, initSelections, filters);
+ }
+
+ public EDIDataPathWizardPage(String pageName, String[] fileExtensionNames) {
+ super(pageName, fileExtensionNames);
+ this.setTitle("EDI file selection");
+ this.setDescription("Select a EDI data file");
+ }
+
+
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.xml.AbstractFileSelectionWizardPage#loadedTheObject(java.lang.String)
+ */
+ @Override
+ protected Object loadedTheObject(String path) throws Exception {
+ return null;
+ }
+
+ @Override
+ protected void changeWizardPageStatus() {
+ super.changeWizardPageStatus();
+ }
+
+ @Override
+ public boolean canFlipToNextPage() {
+ return super.canFlipToNextPage();
+// String filePath = this.getFilePath();
+// try {
+// filePath = SmooksUIUtils.parseFilePath(filePath);
+// if(filePath == null) return false;
+// return new File(filePath).exists();
+// } catch (InvocationTargetException e) {
+// return false;
+// }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataPathWizardPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors.edi;
+
+import java.util.Properties;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
+import org.jboss.tools.smooks.configuration.editors.wizard.IStructuredDataSelectionWizard;
+import org.jboss.tools.smooks.model.edi.EDIReader;
+import org.jboss.tools.smooks.model.edi.EdiFactory;
+import org.jboss.tools.smooks.model.smooks.DocumentRoot;
+import org.jboss.tools.smooks.model.smooks.SmooksPackage;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
+
+/**
+ * @author Dart
+ *
+ */
+public class EDIDataWizard extends Wizard implements IStructuredDataSelectionWizard, INewWizard {
+
+ private EDIMappingDataPathWizardPage mappingFilePage;
+
+ private EDIDataPathWizardPage ediFilePage;
+
+ private SmooksResourceListType resourceList;
+
+ private EditingDomain editingDomain;
+
+ @Override
+ public void addPages() {
+ ediFilePage = new EDIDataPathWizardPage("EDI Data Page", new String[] {});
+ this.addPage(ediFilePage);
+
+ mappingFilePage = new EDIMappingDataPathWizardPage("EDI Config Page", null);
+ this.addPage(mappingFilePage);
+ super.addPages();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.wizard.Wizard#performFinish()
+ */
+ @Override
+ public boolean performFinish() {
+ if (mappingFilePage.isUseAvaliableReader()) {
+ return true;
+ }
+ if (mappingFilePage.isCreateNewReader()) {
+ String encoding = mappingFilePage.getEncoding();
+ String path = mappingFilePage.getFilePath();
+ EDIReader reader = EdiFactory.eINSTANCE.createEDIReader();
+ reader.setEncoding(encoding);
+ reader.setMappingModel(path);
+ Command command = AddCommand.create(editingDomain, resourceList, SmooksPackage.eINSTANCE
+ .getSmooksResourceListType_AbstractReader(), reader);
+ editingDomain.getCommandStack().execute(command);
+ }
+ return true;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.wizard.
+ * IStructuredDataSelectionWizard
+ * #complate(org.jboss.tools.smooks.configuration
+ * .editors.SmooksMultiFormEditor)
+ */
+ public void complate(SmooksMultiFormEditor formEditor) {
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.wizard.
+ * IStructuredDataSelectionWizard#getInputDataTypeID()
+ */
+ public String getInputDataTypeID() {
+ return SmooksModelUtils.INPUT_TYPE_EDI;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.wizard.
+ * IStructuredDataSelectionWizard#getProperties()
+ */
+ public Properties getProperties() {
+ Properties pros = new Properties();
+ if (mappingFilePage.isUseAvaliableReader() || mappingFilePage.isCreateNewReader()) {
+ pros.put(EDIDataParser.USE_AVAILABEL_READER, "true");
+ return pros;
+ }
+ String encoding = mappingFilePage.getEncoding();
+ pros.put(EDIDataParser.ENCODING, encoding);
+ String path = mappingFilePage.getFilePath();
+ pros.put(EDIDataParser.MAPPING_MODEL, path);
+ return pros;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.wizard.
+ * IStructuredDataSelectionWizard#getReturnData()
+ */
+ public Object getReturnData() {
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.wizard.
+ * IStructuredDataSelectionWizard#getStructuredDataSourcePath()
+ */
+ public String getStructuredDataSourcePath() {
+ if (ediFilePage.getFilePath() != null) {
+ return ediFilePage.getFilePath();
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.wizard.
+ * IStructuredDataSelectionWizard#init(org.eclipse.ui.IEditorSite,
+ * org.eclipse.ui.IEditorInput)
+ */
+ public void init(IEditorSite site, IEditorInput input) {
+ IEditorPart editorPart = site.getWorkbenchWindow().getActivePage().findEditor(input);
+ if (editorPart != null && editorPart instanceof SmooksMultiFormEditor) {
+ SmooksMultiFormEditor formEditor = (SmooksMultiFormEditor) editorPart;
+ Object smooksModel = formEditor.getSmooksModel();
+ if (smooksModel instanceof DocumentRoot) {
+ resourceList = ((DocumentRoot) smooksModel).getSmooksResourceList();
+ }
+ editingDomain = formEditor.getEditingDomain();
+ }
+ if (this.mappingFilePage != null) {
+ mappingFilePage.setSmooksResourceList(resourceList);
+ }
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
+ * org.eclipse.jface.viewers.IStructuredSelection)
+ */
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataWizard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIMappingDataPathWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIMappingDataPathWizardPage.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIMappingDataPathWizardPage.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -0,0 +1,269 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.configuration.editors.edi;
+
+import java.util.List;
+
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.smooks.configuration.editors.ClassPathFileProcessor;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.configuration.editors.xml.AbstractFileSelectionWizardPage;
+import org.jboss.tools.smooks.model.edi.EDIReader;
+import org.jboss.tools.smooks.model.edi.impl.EDIReaderImpl;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+
+/**
+ * @author Dart (dpeng(a)redhat.com)
+ *
+ */
+public class EDIMappingDataPathWizardPage extends AbstractFileSelectionWizardPage {
+
+ private boolean hasReader = false;
+
+ private boolean createNewReader = true;
+
+ private String mappingFile = null;
+
+ private Composite fileComposite = null;
+
+ private String encoding = "UTF-8";
+
+ private Button createNewReaderButton;
+
+ private boolean useAvaliableReader = false;
+
+ private SmooksResourceListType resourceList;
+
+ public EDIMappingDataPathWizardPage(String pageName, boolean multiSelect, Object[] initSelections,
+ List<ViewerFilter> filters) {
+ super(pageName, multiSelect, initSelections, filters);
+ this.setTitle("EDI Mapping file configuration");
+ this.setDescription("Select a EDI mapping config file");
+ this.setFilePathProcessor(new ClassPathFileProcessor());
+ }
+
+ public EDIMappingDataPathWizardPage(String pageName, String[] fileExtensionNames) {
+ super(pageName, fileExtensionNames);
+ this.setTitle("EDI Mapping file configuration");
+ this.setDescription("Select a EDI mapping config file");
+ this.setFilePathProcessor(new ClassPathFileProcessor());
+ }
+
+ public String getEncoding() {
+ return encoding;
+ }
+
+ public boolean isUseAvaliableReader() {
+ return useAvaliableReader;
+ }
+
+ public SmooksResourceListType getSmooksResourceList() {
+ return resourceList;
+ }
+
+ public void setSmooksResourceList(SmooksResourceListType resourceList) {
+ this.resourceList = resourceList;
+ }
+
+ private void initData() {
+ encoding = "UTF-8";
+ hasReader = false;
+ useAvaliableReader = false;
+ createNewReader = true;
+ if (SmooksUIUtils.hasReaderAlready(EDIReader.class, resourceList)
+ || SmooksUIUtils.hasReaderAlready(EDIReaderImpl.class, resourceList)) {
+ hasReader = true;
+ }
+
+ mappingFile = null;
+
+ if (hasReader) {
+ useAvaliableReader = true;
+ createNewReader = false;
+ }
+ }
+
+ public boolean isHasReader() {
+ return hasReader;
+ }
+
+ public boolean isCreateNewReader() {
+ return createNewReader;
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ initData();
+ super.createControl(parent);
+ }
+
+ public String getMappingFile() {
+ return mappingFile;
+ }
+
+ @Override
+ protected void createExtensionGUIFirst(Composite parent) {
+ Label encodingLabel = new Label(parent, SWT.NONE);
+ encodingLabel.setText("Encoding:");
+ final Text encodingText = new Text(parent, SWT.BORDER);
+ encodingText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ mappingFile = encodingText.getText();
+ }
+ });
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ encodingText.setLayoutData(gd);
+ }
+
+ @Override
+ protected Composite createFileSelectionComposite(Composite parent) {
+ Composite chooseComposite = new Composite(parent, SWT.NONE);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ chooseComposite.setLayoutData(gd);
+
+ GridLayout gl = new GridLayout();
+ gl.numColumns = 2;
+ chooseComposite.setLayout(gl);
+
+ Button newReaderButton = new Button(chooseComposite, SWT.RADIO);
+ newReaderButton.setText("Create new EDI reader configurations");
+
+ final Button useReaderButton = new Button(chooseComposite, SWT.RADIO);
+ useReaderButton.setText("Use available EDI reader configurations");
+
+ fileComposite = super.createFileSelectionComposite(parent);
+
+ createNewReaderButton = new Button(fileComposite, SWT.CHECK);
+ createNewReaderButton.setText("Create New EDI Reader");
+ createNewReaderButton.setSelection(true);
+
+ if (hasReader) {
+ createNewReaderButton.setSelection(false);
+ createNewReaderButton.setEnabled(false);
+
+ useReaderButton.setSelection(true);
+ this.setConfigCompositeStates(false);
+ } else {
+ newReaderButton.setSelection(true);
+ createNewReaderButton.setSelection(true);
+ }
+
+ createNewReaderButton.addSelectionListener(new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ createNewReader = createNewReaderButton.getSelection();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+
+ newReaderButton.addSelectionListener(new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ useAvaliableReader = useReaderButton.getSelection();
+ setConfigCompositeStates(true);
+ changeWizardPageStatus();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+ useReaderButton.addSelectionListener(new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ useAvaliableReader = useReaderButton.getSelection();
+ setConfigCompositeStates(false);
+ changeWizardPageStatus();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+ });
+ gd = new GridData();
+ gd.horizontalSpan = 2;
+ createNewReaderButton.setLayoutData(gd);
+ return fileComposite;
+ }
+
+ private void setConfigCompositeStates(boolean enabled) {
+ fileComposite.setEnabled(enabled);
+ Control[] controls = fileComposite.getChildren();
+ for (int i = 0; i < controls.length; i++) {
+ Control c = controls[i];
+ if (c == createNewReaderButton) {
+ if (hasReader) {
+ c.setEnabled(false);
+ continue;
+ }
+ }
+ if (c == fileTextComposite) {
+ Control[] cs = ((Composite) c).getChildren();
+ for (int j = 0; j < cs.length; j++) {
+ Control cc = cs[j];
+ cc.setEnabled(enabled);
+ }
+ }
+ c.setEnabled(enabled);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seeorg.jboss.tools.smooks.configuration.editors.xml.
+ * AbstractFileSelectionWizardPage#loadedTheObject(java.lang.String)
+ */
+ @Override
+ protected Object loadedTheObject(String path) throws Exception {
+ return null;
+ }
+
+ @Override
+ protected void changeWizardPageStatus() {
+ if (!useAvaliableReader) {
+ super.changeWizardPageStatus();
+ } else {
+ setErrorMessage(null);
+ setPageComplete(true);
+ }
+ }
+
+ @Override
+ public boolean canFlipToNextPage() {
+ return super.canFlipToNextPage();
+ // String filePath = this.getFilePath();
+ // try {
+ // filePath = SmooksUIUtils.parseFilePath(filePath);
+ // if(filePath == null) return false;
+ // return new File(filePath).exists();
+ // } catch (InvocationTargetException e) {
+ // return false;
+ // }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIMappingDataPathWizardPage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java 2009-07-21 06:12:30 UTC (rev 16689)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/wizard/ViewerInitorStore.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -18,6 +18,7 @@
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
import org.jboss.tools.smooks.configuration.editors.csv.CSVInputDataWizard;
+import org.jboss.tools.smooks.configuration.editors.edi.EDIDataWizard;
import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanContentProvider;
import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanStrucutredDataWizard;
import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanlabelProvider;
@@ -225,6 +226,24 @@
// jsonViewerInitor.setWizardIconPath(GraphicsConstants.IMAGE_JAVA_FILE);
map.put(typeID, csvViewerInitor);
+ // for Csv
+ BaseViewerInitor ediViewerInitor = new BaseViewerInitor();
+ name = "EDI";
+ description = "Select EDI data file as the input data.";
+ iconPath = null;
+ typeID = SmooksModelUtils.INPUT_TYPE_EDI;
+
+ ediViewerInitor.setName(name);
+ ediViewerInitor.setDescription(description);
+ ediViewerInitor.setWizardIconPath(iconPath);
+ ediViewerInitor.setTypeID(typeID);
+ ediViewerInitor.setLabelProvider(new XMLStructuredDataLabelProvider());
+ ediViewerInitor.setTreeContentProvider(new XMLStructuredDataContentProvider());
+ ediViewerInitor.setStructuredDataLoadWizard(new EDIDataWizard());
+ // jsonViewerInitor.setWizardIconPath(GraphicsConstants.IMAGE_JAVA_FILE);
+ map.put(typeID, ediViewerInitor);
+
+
return map;
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2009-07-21 06:12:30 UTC (rev 16689)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/AbstractFileSelectionWizardPage.java 2009-07-21 07:53:25 UTC (rev 16690)
@@ -267,7 +267,7 @@
xsdLayout.numColumns = 2;
xsdLayout.marginWidth = 0;
xsdComposite.setLayout(xsdLayout);
-
+ createExtensionGUIFirst(xsdComposite);
Label nfileLanel = new Label(xsdComposite, SWT.NONE);
nfileLanel.setText("File : "); //$NON-NLS-1$
// fileTextComposite = new Composite(xsdComposite, SWT.NONE);
@@ -336,6 +336,10 @@
return xsdComposite;
}
+ protected void createExtensionGUIFirst(Composite parent) {
+ // do nothing
+ }
+
abstract protected Object loadedTheObject(String path) throws Exception;
protected void initTableViewer() {
16 years, 9 months
JBoss Tools SVN: r16689 - workspace/jgraham/bpel/july-bpel-webinar.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2009-07-21 02:12:30 -0400 (Tue, 21 Jul 2009)
New Revision: 16689
Modified:
workspace/jgraham/bpel/july-bpel-webinar/bpel-webinar-plugins.zip
Log:
upate org.jboss.ide.eclipse.as.core plugin so that the jboss as runtime can support bpel module
Modified: workspace/jgraham/bpel/july-bpel-webinar/bpel-webinar-plugins.zip
===================================================================
(Binary files differ)
16 years, 9 months
JBoss Tools SVN: r16688 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: configuration/editors/uitls and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: DartPeng
Date: 2009-07-21 01:49:42 -0400 (Tue, 21 Jul 2009)
New Revision: 16688
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.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/edimap/actions/DeleteEDIModelCommand.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIFileParser.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java
Log:
JBIDE-4626
Fix a label error bug
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/DelimitersUICreator.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -26,7 +26,35 @@
* @author Dart Peng (dpeng(a)redhat.com) Date Apr 10, 2009
*/
public class DelimitersUICreator extends PropertyUICreator {
+
+ public static final String ENTER_CHAR_STRING = "<Enter>";
+ private class DelimiterChoiceModelProcsser implements IModelProcsser {
+ public Object unwrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals("\n")) {
+ return ENTER_CHAR_STRING;
+ }
+ return model.toString();
+ }
+ return null;
+ }
+
+ public Object wrapValue(Object model) {
+ if (model == null)
+ return null;
+ if (model instanceof String) {
+ if (((String) model).equals(ENTER_CHAR_STRING)) {
+ return "\n";
+ }
+ return model.toString();
+ }
+ return null;
+ }
+ }
+
/*
* (non-Javadoc)
*
@@ -42,128 +70,21 @@
if (feature == MEdiPackage.eINSTANCE.getDelimiters_Component()) {
return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
- new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
-
- public Object unwrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals("\n")) {
- return ENTER_CHAR_STRING;
- }
- return model.toString();
- }
- return null;
- }
-
- public Object wrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals(ENTER_CHAR_STRING)) {
- return "\n";
- }
- return model.toString();
- }
- return null;
- }
-
- }, false);
+ new String[] { ENTER_CHAR_STRING }, new DelimiterChoiceModelProcsser(), false);
}
if (feature == MEdiPackage.eINSTANCE.getDelimiters_Field()) {
return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
- new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
-
- public Object unwrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals("\n")) {
- return ENTER_CHAR_STRING;
- }
- return model.toString();
- }
- return null;
- }
-
- public Object wrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals(ENTER_CHAR_STRING)) {
- return "\n";
- }
- return model.toString();
- }
- return null;
- }
-
- }, false);
+ new String[] { ENTER_CHAR_STRING }, new DelimiterChoiceModelProcsser(), false);
}
if (feature == MEdiPackage.eINSTANCE.getDelimiters_Segment()) {
return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
- new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
-
- public Object unwrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals("\n")) {
- return ENTER_CHAR_STRING;
- }
- return model.toString();
- }
- return null;
- }
-
- public Object wrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals(ENTER_CHAR_STRING)) {
- return "\n";
- }
- return model.toString();
- }
- return null;
- }
-
- }, false);
+ new String[] { ENTER_CHAR_STRING }, new DelimiterChoiceModelProcsser(), false);
}
if (feature == MEdiPackage.eINSTANCE.getDelimiters_SubComponent()) {
return SmooksUIUtils.createChoiceFieldEditor(parent, toolkit, propertyDescriptor, model,
- new String[] { ENTER_CHAR_STRING }, new IModelProcsser() {
-
- public Object unwrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals("\n")) {
- return ENTER_CHAR_STRING;
- }
- return model.toString();
- }
- return null;
- }
-
- public Object wrapValue(Object model) {
- if (model == null)
- return null;
- if (model instanceof String) {
- if (((String) model).equals(ENTER_CHAR_STRING)) {
- return "\n";
- }
- return model.toString();
- }
- return null;
- }
-
- }, false);
+ new String[] { ENTER_CHAR_STRING }, new DelimiterChoiceModelProcsser(), false);
}
return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part);
}
-
- public static final String ENTER_CHAR_STRING = "<Enter>";
-
}
\ No newline at end of file
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-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -2276,6 +2276,7 @@
parentList = null;
continue;
}
+ if(parentList.isEmpty()) continue;
parentList.remove(parentList.size() - 1);
((TreeNodeEditPart) rootEditPart).expandNode();
for (int i = parentList.size() - 1; i >= 0; i--) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/DeleteEDIModelCommand.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/DeleteEDIModelCommand.java 2009-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/DeleteEDIModelCommand.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -78,7 +78,11 @@
IEditorPart editorPart = editDomain.getEditorPart();
if (editorPart instanceof EDIMapFormPage) {
List<TreeNodeModel> linkedNodes = ((EDIMapFormPage) editorPart).createLinkModel();
+ try{
SmooksUIUtils.expandGraphTree(linkedNodes, (TreeNodeEditPart) parentPart);
+ }catch(Throwable t){
+ t.printStackTrace();
+ }
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIFileParser.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIFileParser.java 2009-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIFileParser.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -35,7 +35,8 @@
throws InvocationTargetException, IOException {
TagList tl = new TagList();
path = SmooksUIUtils.parseFilePath(path);
- if(!new File(path).exists()) return new TagList();
+ if (!new File(path).exists())
+ return new TagList();
InputStream stream = new FileInputStream(path);
InputStreamReader reader = new InputStreamReader(stream);
BufferedReader br = new BufferedReader(reader);
@@ -51,34 +52,50 @@
stringBuffer = new StringBuffer();
}
}
+ if (stringBuffer != null && stringBuffer.toString().length() > 0) {
+ segmentList.add(stringBuffer.toString());
+ stringBuffer = null;
+ }
br.close();
reader.close();
stream.close();
List<String> names = new ArrayList<String>();
- char[] separators = new char[]{field,component,subcomponent};
+ char[] separators = new char[] { field, component, subcomponent };
for (Iterator<?> iterator = segmentList.iterator(); iterator.hasNext();) {
String string = (String) iterator.next();
String[] fields = string.split("\\" + new String(new char[] { field }));
TagObject tag = null;
if (fields.length != 0) {
- tag = new EDIDataContainerModel();
if (names.indexOf(fields[0]) == -1) {
+ tag = new EDIDataContainerModel();
+ ((EDIDataContainerModel) tag).setMultipe(false);
tag.setName(fields[0].trim());
names.add(tag.getName());
tl.addRootTag(tag);
+ } else {
+ List<TagObject> tagList = tl.getRootTagList();
+ for (Iterator<?> iterator2 = tagList.iterator(); iterator2.hasNext();) {
+ TagObject tagObject = (TagObject) iterator2.next();
+ if (tagObject instanceof EDIDataContainerModel) {
+ if (fields[0].equals(((EDIDataContainerModel) tagObject).getSegCode())) {
+ ((EDIDataContainerModel) tagObject).setMultipe(true);
+ break;
+ }
+ }
+ }
}
}
if (tag != null) {
- String ss = string.substring(fields[0].length() , string.length());
+ String ss = string.substring(fields[0].length(), string.length());
generateChildrenTag(tag, ss, separators, 0);
}
}
-
+
return tl;
}
-
- private String getSeparator(String s){
- if(s.equals("*") || s.equals("+") || s.equals("^")){
+
+ private String getSeparator(String s) {
+ if (s.equals("*") || s.equals("+") || s.equals("^")) {
return "\\" + s;
}
return s;
@@ -87,7 +104,8 @@
private void generateChildrenTag(TagObject parent, String content, char[] separators, int currentSeparator) {
char separator = separators[currentSeparator];
String sss = new String(new char[] { separator });
- if(content.indexOf(sss) == -1) return;
+ if (content.indexOf(sss) == -1)
+ return;
sss = getSeparator(sss);
String[] contentArray = content.split(sss);
if (contentArray == null || contentArray.length == 0) {
@@ -95,11 +113,12 @@
}
for (int i = 0; i < contentArray.length; i++) {
String con = contentArray[i];
- if(con == null || con.length() == 0) continue;
+ if (con == null || con.length() == 0)
+ continue;
TagObject child = new TagObject();
child.setName(con.trim());
parent.addChildTag(child);
- int newIndex = (currentSeparator+1);
+ int newIndex = (currentSeparator + 1);
if (newIndex <= (separators.length - 1)) {
generateChildrenTag(child, con, separators, newIndex);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java 2009-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -10,10 +10,29 @@
******************************************************************************/
package org.jboss.tools.smooks.edimap.editparts;
+import org.jboss.tools.smooks.edimap.models.EDIDataContainerModel;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+
/**
* @author Dart (dpeng(a)redhat.com)
*
*/
public class EDIDataContainerEditPart extends EDITreeContainerEditPart {
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart#getLabelText()
+ */
+ @Override
+ protected String getLabelText() {
+ String labelText = super.getLabelText();
+ TreeNodeModel obj = (TreeNodeModel) getModel();
+ if(obj.getData() instanceof EDIDataContainerModel){
+ if(((EDIDataContainerModel)obj.getData()).isMultipe()){
+ labelText += " *";
+ }
+ }
+ return labelText;
+ }
+
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerModel.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerModel.java 2009-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerModel.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -17,6 +17,23 @@
*
*/
public class EDIDataContainerModel extends TagObject {
+
+ private boolean multipe = false;
+
+ /**
+ * @return the multipe
+ */
+ public boolean isMultipe() {
+ return multipe;
+ }
+
+ /**
+ * @param multipe the multipe to set
+ */
+ public void setMultipe(boolean multipe) {
+ this.multipe = multipe;
+ }
+
public String getSegCode() {
return getName();
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java 2009-07-20 19:50:14 UTC (rev 16687)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java 2009-07-21 05:49:42 UTC (rev 16688)
@@ -34,10 +34,16 @@
protected IFigure createFigure() {
return new TreeContainerFigure((TreeContainerModel) getModel());
}
+
+ protected String getLabelText(){
+ TreeContainerModel model = (TreeContainerModel) getModel();
+ String text = model.getText();
+ return text;
+ }
protected void refreshVisuals() {
TreeContainerModel model = (TreeContainerModel) getModel();
- String text = model.getText();
+ String text = getLabelText();
if (text != null && model.isHeaderVisable() && getFigure() instanceof TreeContainerFigure) {
TreeContainerFigure figure = (TreeContainerFigure) getFigure();
figure.setText(text);
16 years, 9 months
JBoss Tools SVN: r16687 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui: icons and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-20 15:50:14 -0400 (Mon, 20 Jul 2009)
New Revision: 16687
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/jar_obj.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/prj_obj.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java
Log:
JBIDE-4320
Added support for external jars and classpath vars. also some icons
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/jar_obj.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/jar_obj.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/prj_obj.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/icons/prj_obj.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-07-20 18:55:10 UTC (rev 16686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/plugin.xml 2009-07-20 19:50:14 UTC (rev 16687)
@@ -33,21 +33,25 @@
point="org.jboss.ide.eclipse.as.wtp.override.ui.referenceWizardFragment">
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ProjectReferenceWizardFragment"
+ icon="icons/prj_obj.gif"
id="org.jboss.ide.eclipse.as.wtp.override.ui.newProjectReference"
name="Project">
</referenceFragment>
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.JarReferenceWizardFragment"
+ icon="icons/jar_obj.gif"
id="org.jboss.ide.eclipse.as.wtp.override.ui.jarReference"
name="Jar">
</referenceFragment>
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.ExternalJarReferenceWizardFragment"
+ icon="icons/jar_obj.gif"
id="org.jboss.ide.eclipse.as.wtp.override.ui.externalJarReference"
name="External Jar">
</referenceFragment>
<referenceFragment
class="org.jboss.ide.eclipse.as.wtp.override.ui.propertypage.VariableReferenceWizardFragment"
+ icon="icons/jar_obj.gif"
id="org.jboss.ide.eclipse.as.wtp.override.ui.variableReference"
name="Variable">
</referenceFragment>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-20 18:55:10 UTC (rev 16686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -179,7 +179,7 @@
protected void createPushButtons() {
// TODO add the resource button
referenceButton = createPushButton("Add Reference...");
- removeButton = createPushButton("Remove selected...");
+ removeButton = createPushButton("Remove selected");
}
protected Button createPushButton(String label) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java 2009-07-20 18:55:10 UTC (rev 16686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/DependencyPageExtensionManager.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -8,7 +8,9 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin;
@@ -76,9 +78,11 @@
}
public class ReferenceExtension {
+ private IConfigurationElement element;
private String id, name, imageLoc;
private Image image;
public ReferenceExtension(IConfigurationElement element) {
+ this.element = element;
this.id = element.getAttribute("id");
this.name = element.getAttribute("name");
this.imageLoc = element.getAttribute("icon");
@@ -86,11 +90,18 @@
public String getId() { return this.id;}
public String getName() { return this.name; }
public Image getImage() {
- return null;
+ if( image == null ) {
+ if( imageLoc != null && element.getContributor().getName() != null) {
+ ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(element.getContributor().getName(), imageLoc);
+ image = desc.createImage();
+ }
+ }
+ return image;
}
- public void dispose() {
+ public void disposeImage() {
if( image != null ) {
image.dispose();
+ image = null;
}
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -0,0 +1,78 @@
+package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
+import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.server.ui.wizard.IWizardHandle;
+import org.eclipse.wst.server.ui.wizard.WizardFragment;
+import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils;
+
+public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment {
+ public Composite createComposite(Composite parent, IWizardHandle handle) {
+ Composite c = super.createComposite(parent, handle);
+ handle.setTitle("Add an External Jar Reference");
+ handle.setDescription("Here you can reference a filesystem Jar\n"
+ + "This is not a suggested use-case, but is here for backwards compatability.");
+ return c;
+ }
+
+ protected void buttonPressed() {
+ selected = BuildPathDialogAccess
+ .chooseExternalJAREntries(browse.getShell());
+ viewer.refresh();
+ }
+
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT);
+ if (selected != null && selected.length > 0) {
+ ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>();
+ ArrayList<String> paths = new ArrayList<String>();
+ for (int i = 0; i < selected.length; i++) {
+ // IPath fullPath = project.getFile(selected[i]).getFullPath();
+ String type = VirtualArchiveComponent.LIBARCHIVETYPE
+ + IPath.SEPARATOR;
+ IVirtualComponent archive = ComponentCore
+ .createArchiveComponent(rootComponent.getProject(),
+ type + selected[i].toString());
+ compList.add(archive);
+ paths.add(selected[i].lastSegment());
+ }
+ IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]);
+ String[] paths2 = (String[]) paths.toArray(new String[paths.size()]);
+ getTaskModel().putObject(NewReferenceWizard.COMPONENT, components);
+ getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2);
+ }
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java 2009-07-20 18:55:10 UTC (rev 16686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -40,13 +40,13 @@
import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils;
public class JarReferenceWizardFragment extends WizardFragment {
- private LabelProvider labelProvider = null;
- private ITreeContentProvider contentProvider = null;
- private TreeViewer viewer;
- private Button browse;
- private IPath[] paths;
- private IWizardHandle handle;
- private IPath[] selected = new IPath[]{};
+ protected LabelProvider labelProvider = null;
+ protected ITreeContentProvider contentProvider = null;
+ protected TreeViewer viewer;
+ protected Button browse;
+ protected IPath[] paths;
+ protected IWizardHandle handle;
+ protected IPath[] selected = new IPath[]{};
public boolean hasComposite() {
return true;
}
@@ -90,7 +90,7 @@
return c;
}
- private void buttonPressed() {
+ protected void buttonPressed() {
IProject project = (IProject)getTaskModel().getObject(NewReferenceWizard.PROJECT);
selected = BuildPathDialogAccess.chooseJAREntries(
browse.getShell(),
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java 2009-07-20 18:55:10 UTC (rev 16686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/NewReferenceRootWizardFragment.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -97,6 +97,8 @@
if( labelProvider == null ) {
labelProvider = new LabelProvider() {
public Image getImage(Object element) {
+ if( element instanceof ReferenceExtension)
+ return ((ReferenceExtension)element).getImage();
return null;
}
public String getText(Object element) {
@@ -104,6 +106,14 @@
return ((ReferenceExtension)element).getName();
return element == null ? "" : element.toString();//$NON-NLS-1$
}
+ public void dispose() {
+ super.dispose();
+ if( extensions != null ) {
+ for( int i = 0; i < extensions.length; i++) {
+ extensions[i].disposeImage();
+ }
+ }
+ }
};
}
return labelProvider;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java 2009-07-20 18:55:10 UTC (rev 16686)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -111,6 +111,7 @@
if( contentProvider == null ) {
contentProvider = new ITreeContentProvider() {
public Object[] getElements(Object inputElement) {
+ IProject root = (IProject)getTaskModel().getObject(NewReferenceWizard.PROJECT);
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
ArrayList<IProject> list = new ArrayList<IProject>(Arrays.asList(projects));
Iterator<IProject> i = list.iterator();
@@ -119,6 +120,8 @@
p = i.next();
if( !p.isOpen())
i.remove();
+ else if( p.equals(root))
+ i.remove();
}
return (IProject[]) list.toArray(new IProject[list.size()]);
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/VariableReferenceWizardFragment.java 2009-07-20 19:50:14 UTC (rev 16687)
@@ -0,0 +1,56 @@
+package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.server.ui.wizard.IWizardHandle;
+
+public class VariableReferenceWizardFragment extends JarReferenceWizardFragment {
+ public Composite createComposite(Composite parent, IWizardHandle handle) {
+ Composite c = super.createComposite(parent, handle);
+ handle.setTitle("Add a Variable Reference");
+ handle.setDescription("Here you can reference a variable which maps to a single jar.\n"
+ + "This is not a suggested use-case, but is here for backwards compatability.");
+ return c;
+ }
+
+ protected void buttonPressed() {
+ selected = BuildPathDialogAccess.chooseVariableEntries(
+ browse.getShell(), new Path[0]);
+ viewer.refresh();
+ }
+
+ public void performFinish(IProgressMonitor monitor) throws CoreException {
+ IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(NewReferenceWizard.ROOT_COMPONENT);
+ if (selected != null && selected.length > 0) {
+ ArrayList<IVirtualComponent> compList = new ArrayList<IVirtualComponent>();
+ ArrayList<String> paths = new ArrayList<String>();
+ for (int i = 0; i < selected.length; i++) {
+ IPath resolvedPath = JavaCore.getResolvedVariablePath(selected[i]);
+ java.io.File file = new java.io.File(resolvedPath.toOSString());
+ if (file.isFile() && file.exists()) {
+ String type = VirtualArchiveComponent.VARARCHIVETYPE
+ + IPath.SEPARATOR;
+ IVirtualComponent archive = ComponentCore
+ .createArchiveComponent(rootComponent.getProject(),
+ type + selected[i].toString());
+ compList.add(archive);
+ paths.add(resolvedPath.lastSegment());
+ }
+ }
+ IVirtualComponent[] components = (IVirtualComponent[]) compList.toArray(new IVirtualComponent[compList.size()]);
+ String[] paths2 = (String[]) paths.toArray(new String[paths.size()]);
+ getTaskModel().putObject(NewReferenceWizard.COMPONENT, components);
+ getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, paths2);
+ }
+ }
+}
16 years, 9 months
JBoss Tools SVN: r16686 - in workspace/jgraham/bpel: july-bpel-webinar and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: john.graham(a)jboss.org
Date: 2009-07-20 14:55:10 -0400 (Mon, 20 Jul 2009)
New Revision: 16686
Added:
workspace/jgraham/bpel/july-bpel-webinar/
workspace/jgraham/bpel/july-bpel-webinar/bpel-webinar-plugins.zip
Log:
Plug-in set for July BPEL Webinar
Added: workspace/jgraham/bpel/july-bpel-webinar/bpel-webinar-plugins.zip
===================================================================
(Binary files differ)
Property changes on: workspace/jgraham/bpel/july-bpel-webinar/bpel-webinar-plugins.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Tools SVN: r16685 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: src/org/jboss/tools/jst/jsp/contentassist and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: scabanovich
Date: 2009-07-20 12:46:21 -0400 (Mon, 20 Jul 2009)
New Revision: 16685
Added:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/DefaultDropCommandRunner.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1826
Drop wizard is switched to new kb.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-07-20 16:42:31 UTC (rev 16684)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-07-20 16:46:21 UTC (rev 16685)
@@ -394,6 +394,8 @@
class="org.jboss.tools.jst.jsp.outline.JSPCellEditorProviderImpl"/>
<xclass id="org.jboss.tools.jst.jsp.outline.VpeProperties"
class="org.jboss.tools.jst.jsp.outline.VpeProperties"/>
+ <xclass id="org.jboss.tools.jst.jsp.outline.DefaultDropCommandRunner"
+ class="org.jboss.tools.jst.jsp.outline.DefaultDropCommandRunner"/>
</extension>
<extension
@@ -438,7 +440,6 @@
</contenttype>
</contentAssistProcessor>
- <!--
<contentAssistProcessor
class="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor"
id="org.jboss.tools.jst.jsp.contentassist.JspContentAssistProcessor">
@@ -453,6 +454,7 @@
</contenttype>
</contentAssistProcessor>
+ <!--
<contentAssistProcessor
class="org.jboss.tools.jst.jsp.contentassist.XmlContentAssistProcessor"
id="org.jboss.tools.jst.jsp.contentassist.XmlContentAssistProcessor">
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-20 16:42:31 UTC (rev 16684)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-20 16:46:21 UTC (rev 16685)
@@ -72,9 +72,14 @@
if(valueHelper == null) {
valueHelper = new ValueHelper();
}
-// pageContext = (IPageContext)context.get("pageContext");
- processor = valueHelper.createContentAssistProcessor();
- pageContext = valueHelper.createPageContext(processor, offset);
+ pageContext = (IPageContext)context.get("pageContext");
+ processor = (JspContentAssistProcessor)context.get("processor");
+ if(processor == null) {
+ processor = valueHelper.createContentAssistProcessor();
+ }
+ if(pageContext == null) {
+ pageContext = valueHelper.createPageContext(processor, offset);
+ }
context.put("pageContext", pageContext); //$NON-NLS-1$
context.put("kbQuery", createKbQuery(Type.ATTRIBUTE_VALUE, "", "", offset, false)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-20 16:42:31 UTC (rev 16684)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-20 16:46:21 UTC (rev 16685)
@@ -12,7 +12,10 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.eclipse.core.runtime.CoreException;
@@ -22,6 +25,7 @@
import org.eclipse.jface.text.ITextListener;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextEvent;
import org.eclipse.jface.text.formatter.IContentFormatter;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
@@ -100,6 +104,10 @@
import org.jboss.tools.common.model.ui.editors.dnd.DropData;
import org.jboss.tools.common.model.ui.editors.dnd.IDropCommand;
import org.jboss.tools.common.model.ui.editors.dnd.JSPTagProposalFactory;
+import org.jboss.tools.common.model.ui.editors.dnd.TagProposal;
+import org.jboss.tools.common.model.ui.editors.dnd.DropUtils.AttributeDescriptorValueProvider;
+import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributesComposite;
+import org.jboss.tools.common.model.ui.editors.dnd.composite.TagAttributesComposite.AttributeDescriptorValue;
import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext;
import org.jboss.tools.common.model.ui.editors.dnd.context.InnerDragBuffer;
import org.jboss.tools.common.model.ui.texteditors.TextMerge;
@@ -121,11 +129,21 @@
import org.jboss.tools.jst.jsp.editor.IVisualController;
import org.jboss.tools.jst.jsp.outline.JSPContentOutlineConfiguration;
import org.jboss.tools.jst.jsp.outline.JSPPropertySheetConfiguration;
+import org.jboss.tools.jst.jsp.outline.ValueHelper;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.jst.jsp.text.xpl.IStructuredTextOccurrenceStructureProvider;
import org.jboss.tools.jst.jsp.text.xpl.StructuredTextOccurrenceStructureProviderRegistry;
import org.jboss.tools.jst.jsp.ui.action.ExtendedFormatAction;
import org.jboss.tools.jst.jsp.ui.action.IExtendedAction;
+import org.jboss.tools.jst.web.kb.IPageContext;
+import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.PageProcessor;
+import org.jboss.tools.jst.web.kb.KbQuery.Type;
+import org.jboss.tools.jst.web.kb.internal.JspContextImpl;
+import org.jboss.tools.jst.web.kb.taglib.IAttribute;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
+import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibComponent;
+import org.jboss.tools.jst.web.kb.taglib.INameSpace;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
import org.w3c.dom.DocumentType;
@@ -719,6 +737,8 @@
DropData dropData = new DropData(flavor, data,
getEditorInput(), getSourceViewer(),
getSelectionProvider());
+ dropData.setValueProvider(new AttributeDescriptorValueProviderImpl());
+
dropData.setAttributeName(dropContext.getAttributeName());
IDropCommand dropCommand = DropCommandFactory.getInstance()
.getDropCommand(flavor,
@@ -738,6 +758,111 @@
});
}
+ class AttributeDescriptorValueProviderImpl implements AttributeDescriptorValueProvider {
+ TagProposal proposal;
+ KbQuery query;
+ JspContentAssistProcessor processor;
+ IPageContext pageContext;
+
+ public void setProposal(TagProposal proposal) {
+ if(this.proposal == proposal) return;
+ this.proposal = proposal;
+ query = createQuery(proposal);
+ ValueHelper valueHelper = new ValueHelper();
+ processor = valueHelper.createContentAssistProcessor();
+ pageContext = valueHelper.createPageContext(processor, query.getOffset());
+ Map<String,INameSpace> ns = pageContext.getNameSpaces(query.getOffset());
+ INameSpace n = ns.get(query.getUri());
+ if(n == null && pageContext instanceof JspContextImpl) {
+ IRegion r = new Region(query.getOffset(), 0);
+ ((JspContextImpl)pageContext).addNameSpace(r, new INameSpace(){
+ public String getURI() {
+ return query.getUri();
+ }
+ public String getPrefix() {
+ return query.getPrefix();
+ }
+ });
+ }
+ }
+
+ public void initContext(Properties context) {
+ if(context != null) {
+ context.put("processor", processor);
+ context.put("pageContext", pageContext);
+ }
+ }
+ public IPageContext getPageContext() {
+ return pageContext;
+ }
+
+ public String getTag() {
+ IComponent c = findComponent(query);
+ if(c == null) return null;
+ String prefix = getPrefix(query);
+ if(prefix == null) return c.getName();
+ return prefix + ":" + c.getName();
+ }
+
+ public boolean canHaveBody() {
+ IComponent c = findComponent(query);
+ return c != null && c.canHaveBody();
+ }
+
+ public AttributeDescriptorValue[] getValues() {
+ return createDescriptors(query);
+ }
+
+ KbQuery createQuery(TagProposal proposal) {
+ KbQuery kbQuery = new KbQuery();
+ String name = proposal.getPrefix() + ":" + proposal.getName();
+ kbQuery.setPrefix(proposal.getPrefix());
+ kbQuery.setUri(proposal.getUri());
+ kbQuery.setParentTags(new String[]{name});
+ kbQuery.setParent(name);
+ kbQuery.setMask(false);
+ kbQuery.setType(Type.ATTRIBUTE_NAME);
+ kbQuery.setOffset(JSPTextEditor.this.getTextViewer().getTextWidget().getCaretOffset());
+ kbQuery.setValue("");
+ kbQuery.setStringQuery("");
+ return kbQuery;
+ }
+
+ public IComponent findComponent(KbQuery query) {
+ IComponent[] cs = PageProcessor.getInstance().getComponents(query, pageContext, true);
+ if(cs == null || cs.length == 0) return null;
+ IComponent s = null;
+ for (IComponent c: cs) {
+ if(c instanceof ICustomTagLibComponent) {
+ s = c;
+ break;
+ }
+ }
+ if(s == null) s = cs[0];
+ return s;
+ }
+
+ public String getPrefix(KbQuery query) {
+ Map<String,INameSpace> ns = pageContext.getNameSpaces(query.getOffset());
+ INameSpace n = ns.get(query.getUri());
+ return n == null ? null : n.getPrefix();
+ }
+
+ public TagAttributesComposite.AttributeDescriptorValue[] createDescriptors(KbQuery query) {
+ IComponent s = findComponent(query);
+ if(s == null) return new TagAttributesComposite.AttributeDescriptorValue[0];
+
+ List<AttributeDescriptorValue> attributesValues = new ArrayList<AttributeDescriptorValue>();
+ IAttribute[] as = s.getAttributes();
+ for (IAttribute a: as) {
+ AttributeDescriptorValue value = new AttributeDescriptorValue(a.getName(), a.isRequired(), a.isPreferable());
+ attributesValues.add(value);
+ }
+
+ return attributesValues.toArray(new AttributeDescriptorValue[attributesValues.size()]);
+ }
+ }
+
private void createDrop() {
DropTarget target = new DropTarget(getSourceViewer().getTextWidget(),
DND.DROP_MOVE | DND.DROP_COPY);
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/DefaultDropCommandRunner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/DefaultDropCommandRunner.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/DefaultDropCommandRunner.java 2009-07-20 16:46:21 UTC (rev 16685)
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.jsp.outline;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.texteditor.AbstractTextEditor;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+import org.jboss.tools.common.meta.action.SpecialWizard;
+import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory;
+import org.jboss.tools.common.model.ui.editors.dnd.DropData;
+import org.jboss.tools.common.model.ui.editors.dnd.JSPTagProposalFactory;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
+
+public class DefaultDropCommandRunner implements SpecialWizard {
+ String flavor;
+ String data;
+ ITextEditor textEditor;
+
+ public boolean runDropCommand(final String flavor, final String data, ITextEditor te) {
+ if(te instanceof JSPTextEditor) {
+ ((JSPTextEditor)te).runDropCommand(flavor, data);
+ return true;
+ }
+ //TODO create valueProvider?
+ final IEditorInput ei = te.getEditorInput();
+ final ISelectionProvider sp = te.getSelectionProvider();
+ final ISourceViewer sv = getSourceViewer(te);
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+// if(parentEditor.getVisualEditor().getController()!=null ) {
+ DropCommandFactory.getInstance()
+ .getDropCommand(flavor, JSPTagProposalFactory.getInstance())
+ .execute(
+ new DropData(
+ flavor,
+ data,
+ ei,
+ sv,
+ sp
+ )
+ );
+// }
+ }
+ });
+ return true;
+ }
+
+ ISourceViewer getSourceViewer(ITextEditor editor) {
+ if(!(editor instanceof AbstractTextEditor)) return null;
+ AbstractTextEditor ae = (AbstractTextEditor)editor;
+ try {
+ Method m = AbstractTextEditor.class.getDeclaredMethod("getSourceViewer", new Class[0]);
+ m.setAccessible(true);
+ return (ISourceViewer)m.invoke(ae, new Object[0]);
+ } catch (NoSuchMethodException e1) {
+ return null;
+ } catch (InvocationTargetException e2) {
+ return null;
+ } catch (IllegalAccessException e2) {
+ return null;
+ }
+ }
+
+ public int execute() {
+ boolean result = runDropCommand(flavor, data, textEditor);
+ return result ? 0 : 1;
+ }
+
+ public void setObject(Object object) {
+ Properties p = (Properties)object;
+ flavor = p.getProperty("flavor");
+ data = p.getProperty("data");
+ textEditor = (ITextEditor)p.get("textEditor");
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/DefaultDropCommandRunner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java 2009-07-20 16:42:31 UTC (rev 16684)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPDialogCellEditor.java 2009-07-20 16:46:21 UTC (rev 16685)
@@ -86,7 +86,6 @@
JSPDialogContentProposalProvider cpp = new JSPDialogContentProposalProvider();
cpp.setContext(context);
IContentProposal[] ps = cpp.getProposals("#{}", 2); //$NON-NLS-1$
- System.out.println(ps.length);
hasProposals = ((ps != null) && (ps.length > 0));
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2009-07-20 16:42:31 UTC (rev 16684)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java 2009-07-20 16:46:21 UTC (rev 16685)
@@ -77,6 +77,7 @@
private IPropertyDescriptor[] fDescriptors = null;
private ValueHelper valueHelper = new ValueHelper();
IPageContext pageContext;
+ JspContentAssistProcessor processor;
int offset = 0;
KbQuery kbQuery, kbQueryAttr;
private Set attributeNames = new HashSet();
@@ -103,7 +104,7 @@
fCaseSensitive = adapter.getTagNameCase() == DocumentTypeAdapter.STRICT_CASE;
offset = ((IDOMElement)fNode).getStartOffset() + ("" + fNode.getNodeType()).length(); //$NON-NLS-1$
}
- JspContentAssistProcessor processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
+ processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
processor.createContext(getTextViewer(), offset);
pageContext = processor.getContext();
kbQuery = createKbQuery(processor);
@@ -405,6 +406,7 @@
context.setProperty("attributeName", attributeName);
context.put("valueHelper", valueHelper);
context.put("pageContext", pageContext);
+ context.put("processor", processor);
JSPPropertyDescriptor descriptor = new JSPPropertyDescriptor(context, attributeName, attributeName);
descriptor.setCategory(getCategory(null));
descriptor.setDescription(attributeName);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2009-07-20 16:42:31 UTC (rev 16684)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/ValueHelper.java 2009-07-20 16:46:21 UTC (rev 16685)
@@ -10,16 +10,18 @@
******************************************************************************/
package org.jboss.tools.jst.jsp.outline;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
+import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.texteditor.AbstractTextEditor;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.jboss.tools.common.kb.TagDescriptor;
import org.jboss.tools.common.model.project.IPromptingProvider;
@@ -99,17 +101,14 @@
}
public JspContentAssistProcessor createContentAssistProcessor() {
- JSPTextEditor jspEditor = getJSPTextEditor();
- if(jspEditor == null) return null;
return isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
}
public IPageContext createPageContext(JspContentAssistProcessor processor, int offset) {
- JSPTextEditor jspEditor = getJSPTextEditor();
- if(jspEditor == null) return null;
- processor.createContext(jspEditor.getTextViewer(), offset);
+ ISourceViewer sv = getSourceViewer();
+ if(sv == null) return null;
+ processor.createContext(sv, offset);
return processor.getContext();
-
}
protected JSPTextEditor getJSPTextEditor() {
@@ -162,9 +161,7 @@
}
public IEditorInput getEditorInput() {
-
IEditorPart editor = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
return editor.getEditorInput();
}
@@ -193,19 +190,6 @@
}
}
- public IDocument getDocument() {
- IEditorPart editor = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- if(editor instanceof JSPMultiPageEditor) {
- JSPTextEditor jspEditor = ((JSPMultiPageEditor)editor).getJspEditor();
- return jspEditor.getDocumentProvider().getDocument(editor.getEditorInput());
- } else if(editor instanceof StructuredTextEditor) {
- StructuredTextEditor jspEditor = ((StructuredTextEditor)editor);
- return jspEditor.getDocumentProvider().getDocument(editor.getEditorInput());
- }
-
- return null;
- }
-
//Support of StructuredTextEditor
boolean init2() {
if(isVisualContextInitialized) return true;
@@ -229,7 +213,6 @@
List<TaglibData> list = tldManager.getTagLibs();
if(list == null) return;
isFacelets = false;
- IDocument document = getDocument();
for(int i = 0; i < list.size(); i++) {
TaglibData data = list.get(i);
isFacelets = isFacelets || data.getUri().equals(FaceletsHtmlContentAssistProcessor.faceletUri);
@@ -252,4 +235,22 @@
}
return null;
}
+
+ public ISourceViewer getSourceViewer() {
+ JSPTextEditor jspEditor = getJSPTextEditor();
+ if(jspEditor != null) return jspEditor.getTextViewer();
+ IEditorPart editor = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if (editor == null) return null;
+ if(editor instanceof AbstractTextEditor) {
+ try {
+ Method m = AbstractTextEditor.class.getDeclaredMethod("getSourceViewer", new Class[0]);
+ m.setAccessible(true);
+ return (ISourceViewer)m.invoke(editor, new Object[0]);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
}
16 years, 9 months