JBoss Tools SVN: r10409 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/el and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-23 10:01:49 -0400 (Tue, 23 Sep 2008)
New Revision: 10409
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELOperandResolveStatus.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/Var.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
Log:
JBIDE-1497
Classes Var and SeamELOperandResolveStatus are moved to separate files.
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-09-23 14:00:46 UTC (rev 10408)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/META-INF/MANIFEST.MF 2008-09-23 14:01:49 UTC (rev 10409)
@@ -14,6 +14,7 @@
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
org.jboss.tools.common.model,
+ org.jboss.tools.common.el.core,
org.eclipse.wst.common.frameworks.ui,
org.eclipse.wst.common.project.facet.core,
org.eclipse.jst.jsf.core,
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java 2008-09-23 14:00:46 UTC (rev 10408)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ElVarSearcher.java 2008-09-23 14:01:49 UTC (rev 10409)
@@ -284,141 +284,4 @@
return null;
}
- /**
- * Represents "var"/"value" attributes.
- * @author Alexey Kazakov
- */
- public static class Var {
- String name;
- String value;
- ELToken elToken;
- String resolvedValue;
- ELToken resolvedElToken;
- int declOffset;
- int declLength;
-
- /**
- * Constructor
- * @param name - value of "var" attribute.
- * @param value - value of "value" attribute.
- */
- public Var(String name, String value, int declOffset, int declLength) {
- super();
- this.name = name;
- this.value = value;
- elToken = parseEl(value);
- this.declOffset = declOffset;
- this.declLength = declLength;
- }
-
- /**
- * Constructor
- * @param name - value of "var" attribute.
- * @param value - value of "value" attribute.
- */
- public Var(String name, String value) {
- this(name, value, 0, 0);
- }
-
- private ELToken parseEl(String el) {
- if(el.length()>3 && el.startsWith("#{") && el.endsWith("}")) {
- String elBody = el.substring(0, el.length()-1).substring(2);
- SeamELTokenizer elTokenizer = new SeamELTokenizer(elBody);
- List<ELToken> tokens = elTokenizer.getTokens();
- for (ELToken token : tokens) {
- if(token.getType()==ELToken.EL_VARIABLE_TOKEN) {
- return token;
- }
- }
- }
- return null;
- }
-
- /**
- * Sets value to new resolved EL which we got as result of parsing value.
- * For example:
- * <h:datatable value="#{list}" var="item">
- * <h:dataTable value="#{item.anotherList}" var="innerItem">
- * ...
- * </h:dataTable>
- * </h:dataTable>
- * Original El is #{item.anotherList}
- * Resolved El is #{list.iterator().next().anotherList}
- * It's very useful for nested vars.
- * @param newEl
- */
- public void resolveValue(String newEl) {
- resolvedValue = newEl;
- resolvedElToken = parseEl(newEl);
- }
-
- /**
- * @return parsed EL from "value" attribute. Returns null if EL is not valid.
- */
- public ELToken getElToken() {
- return elToken;
- }
-
- /**
- * @return parsed resolved EL from "value" attribute. May be null.
- */
- public ELToken getResolvedElToken() {
- return resolvedElToken;
- }
-
- /**
- * @return name of variable.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return value of variable. It's EL.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * @return resolved value of variable. It's EL. May be null.
- */
- public String getResolvedValue() {
- return resolvedValue;
- }
-
- /**
- * @return offset of the var declaration
- */
- public int getDeclarationOffset() {
- return declOffset;
- }
-
- /**
- * @return length of the var declaration
- */
- public int getDeclarationLength() {
- return declLength;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof Var) {
- Var compare = (Var)obj;
- String str = getName();
- if (str != null) {
- if (!str.equals(compare.getName()))
- return false;
- } else {
- if (compare.getName() != null)
- return false;
- }
- str = getValue();
- return (str != null ?
- str.equals(compare.getValue()) :
- compare.getValue() == null);
- }
- return false;
- }
- }
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-09-23 14:00:46 UTC (rev 10408)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-09-23 14:01:49 UTC (rev 10409)
@@ -36,7 +36,6 @@
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
import org.jboss.tools.seam.internal.core.el.SeamExpressionResolver.MessagesInfo;
/**
@@ -105,169 +104,6 @@
return completions;
}
- /**
- * Status of EL resolving.
- * @author Jeremy
- */
- public static class SeamELOperandResolveStatus {
- private List<ELOperandToken> tokens;
- public List<ISeamContextVariable> usedVariables;
- Map<String, TypeInfoCollector.MethodInfo> unpairedGettersOrSetters;
- Set<String> proposals;
- private ELOperandToken lastResolvedToken;
- private boolean isMapOrCollectionOrBundleAmoungTheTokens = false;
- private TypeInfoCollector.MemberInfo memberOfResolvedOperand;
-
- /**
- * @return MemberInfo of last segment of EL operand. Null if El is not resolved.
- */
- public TypeInfoCollector.MemberInfo getMemberOfResolvedOperand() {
- return memberOfResolvedOperand;
- }
-
- /**
- * Sets MemberInfo for last segment of EL operand.
- * @param lastResolvedMember
- */
- public void setMemberOfResolvedOperand(
- TypeInfoCollector.MemberInfo lastResolvedMember) {
- this.memberOfResolvedOperand = lastResolvedMember;
- }
-
- /**
- * Constructor
- * @param tokens Tokens of EL
- */
- public SeamELOperandResolveStatus(List<ELOperandToken> tokens) {
- this.tokens = tokens;
- }
-
- /**
- * @return true if EL contains any not parametrized Collection or ResourceBundle.
- */
- public boolean isMapOrCollectionOrBundleAmoungTheTokens() {
- return this.isMapOrCollectionOrBundleAmoungTheTokens;
- }
-
- public void setMapOrCollectionOrBundleAmoungTheTokens() {
- this.isMapOrCollectionOrBundleAmoungTheTokens = true;
- }
-
- /**
- * @return true if EL is resolved.
- */
- public boolean isOK() {
- return !getProposals().isEmpty() || isMapOrCollectionOrBundleAmoungTheTokens();
- }
-
- /**
- * @return false if El is not resolved.
- */
- public boolean isError() {
- return !isOK();
- }
-
- /**
- * @return List of resolved tokens of EL. Includes separators "."
- */
- public List<ELOperandToken> getResolvedTokens() {
- List<ELOperandToken> resolvedTokens = new ArrayList<ELOperandToken>();
- int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
- for (int i = 0; i < tokens.size() && i <= index; i++) {
- resolvedTokens.add(tokens.get(i));
- }
- return resolvedTokens;
- }
-
- /**
- * @return List of unresolved tokens of EL.
- */
- public List<ELOperandToken> getUnresolvedTokens() {
- List<ELOperandToken> unresolvedTokens = new ArrayList<ELOperandToken>();
- int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
- for (int i = index + 1; i < tokens.size(); i++) {
- unresolvedTokens.add(tokens.get(i));
- }
- return unresolvedTokens;
- }
-
- /**
- * @return Last resolved token of EL. Can be separator "."
- */
- public ELOperandToken getLastResolvedToken() {
- return lastResolvedToken;
- }
-
- /**
- * @param lastResolvedToken Last resolved token of EL. Can be separator "."
- */
- public void setLastResolvedToken(ELOperandToken lastResolvedToken) {
- this.lastResolvedToken = lastResolvedToken;
- }
-
- /**
- * @return Tokens of EL.
- */
- public List<ELOperandToken> getTokens() {
- return tokens;
- }
-
- /**
- * @param tokens Tokens of EL.
- */
- public void setTokens(List<ELOperandToken> tokens) {
- this.tokens = tokens;
- }
-
- /**
- * @return Set of proposals for EL.
- */
- public Set<String> getProposals() {
- return proposals == null ? new TreeSet<String>() : proposals;
- }
-
- /**
- * @param proposals Set of proposals.
- */
- public void setProposals(Set<String> proposals) {
- this.proposals = proposals;
- }
-
- /**
- * @return List of Seam Context Variables used in EL.
- */
- public List<ISeamContextVariable> getUsedVariables() {
- return (usedVariables == null ? new ArrayList<ISeamContextVariable>() : usedVariables);
- }
-
- /**
- * @param usedVariables List of Seam Context Variables used in EL.
- */
- public void setUsedVariables(List<ISeamContextVariable> usedVariables) {
- this.usedVariables = usedVariables;
- }
-
- /**
- * @return Map of unpaired getters and setters (getters/setters without proper setters/getters).
- * of all properties used in EL.
- * Key - name of property.
- * Value - MethodInfo of existed getter/setter.
- */
- public Map<String, TypeInfoCollector.MethodInfo> getUnpairedGettersOrSetters() {
- if (unpairedGettersOrSetters == null) {
- unpairedGettersOrSetters = new HashMap<String, TypeInfoCollector.MethodInfo>();
- }
- return unpairedGettersOrSetters;
- }
-
- /**
- * Clear Map of unpaired getters and setters.
- */
- public void clearUnpairedGettersOrSetters() {
- getUnpairedGettersOrSetters().clear();
- }
- }
-
private static final String collectionAdditionForCollectionDataModel = ".iterator().next()";
private static final String collectionAdditionForMapDataModel = ".entrySet().iterator().next()";
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELOperandResolveStatus.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELOperandResolveStatus.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELOperandResolveStatus.java 2008-09-23 14:01:49 UTC (rev 10409)
@@ -0,0 +1,175 @@
+package org.jboss.tools.seam.internal.core.el;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.jboss.tools.common.model.util.TypeInfoCollector;
+import org.jboss.tools.seam.core.ISeamContextVariable;
+
+/**
+ * Status of EL resolving.
+ * @author Jeremy
+ */
+public class SeamELOperandResolveStatus {
+ private List<ELOperandToken> tokens;
+ public List<ISeamContextVariable> usedVariables;
+ Map<String, TypeInfoCollector.MethodInfo> unpairedGettersOrSetters;
+ Set<String> proposals;
+ private ELOperandToken lastResolvedToken;
+ private boolean isMapOrCollectionOrBundleAmoungTheTokens = false;
+ private TypeInfoCollector.MemberInfo memberOfResolvedOperand;
+
+ /**
+ * @return MemberInfo of last segment of EL operand. Null if El is not resolved.
+ */
+ public TypeInfoCollector.MemberInfo getMemberOfResolvedOperand() {
+ return memberOfResolvedOperand;
+ }
+
+ /**
+ * Sets MemberInfo for last segment of EL operand.
+ * @param lastResolvedMember
+ */
+ public void setMemberOfResolvedOperand(
+ TypeInfoCollector.MemberInfo lastResolvedMember) {
+ this.memberOfResolvedOperand = lastResolvedMember;
+ }
+
+ /**
+ * Constructor
+ * @param tokens Tokens of EL
+ */
+ public SeamELOperandResolveStatus(List<ELOperandToken> tokens) {
+ this.tokens = tokens;
+ }
+
+ /**
+ * @return true if EL contains any not parametrized Collection or ResourceBundle.
+ */
+ public boolean isMapOrCollectionOrBundleAmoungTheTokens() {
+ return this.isMapOrCollectionOrBundleAmoungTheTokens;
+ }
+
+ public void setMapOrCollectionOrBundleAmoungTheTokens() {
+ this.isMapOrCollectionOrBundleAmoungTheTokens = true;
+ }
+
+ /**
+ * @return true if EL is resolved.
+ */
+ public boolean isOK() {
+ return !getProposals().isEmpty() || isMapOrCollectionOrBundleAmoungTheTokens();
+ }
+
+ /**
+ * @return false if El is not resolved.
+ */
+ public boolean isError() {
+ return !isOK();
+ }
+
+ /**
+ * @return List of resolved tokens of EL. Includes separators "."
+ */
+ public List<ELOperandToken> getResolvedTokens() {
+ List<ELOperandToken> resolvedTokens = new ArrayList<ELOperandToken>();
+ int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
+ for (int i = 0; i < tokens.size() && i <= index; i++) {
+ resolvedTokens.add(tokens.get(i));
+ }
+ return resolvedTokens;
+ }
+
+ /**
+ * @return List of unresolved tokens of EL.
+ */
+ public List<ELOperandToken> getUnresolvedTokens() {
+ List<ELOperandToken> unresolvedTokens = new ArrayList<ELOperandToken>();
+ int index = tokens.indexOf(lastResolvedToken); // index == -1 means that no tokens are resolved
+ for (int i = index + 1; i < tokens.size(); i++) {
+ unresolvedTokens.add(tokens.get(i));
+ }
+ return unresolvedTokens;
+ }
+
+ /**
+ * @return Last resolved token of EL. Can be separator "."
+ */
+ public ELOperandToken getLastResolvedToken() {
+ return lastResolvedToken;
+ }
+
+ /**
+ * @param lastResolvedToken Last resolved token of EL. Can be separator "."
+ */
+ public void setLastResolvedToken(ELOperandToken lastResolvedToken) {
+ this.lastResolvedToken = lastResolvedToken;
+ }
+
+ /**
+ * @return Tokens of EL.
+ */
+ public List<ELOperandToken> getTokens() {
+ return tokens;
+ }
+
+ /**
+ * @param tokens Tokens of EL.
+ */
+ public void setTokens(List<ELOperandToken> tokens) {
+ this.tokens = tokens;
+ }
+
+ /**
+ * @return Set of proposals for EL.
+ */
+ public Set<String> getProposals() {
+ return proposals == null ? new TreeSet<String>() : proposals;
+ }
+
+ /**
+ * @param proposals Set of proposals.
+ */
+ public void setProposals(Set<String> proposals) {
+ this.proposals = proposals;
+ }
+
+ /**
+ * @return List of Seam Context Variables used in EL.
+ */
+ public List<ISeamContextVariable> getUsedVariables() {
+ return (usedVariables == null ? new ArrayList<ISeamContextVariable>() : usedVariables);
+ }
+
+ /**
+ * @param usedVariables List of Seam Context Variables used in EL.
+ */
+ public void setUsedVariables(List<ISeamContextVariable> usedVariables) {
+ this.usedVariables = usedVariables;
+ }
+
+ /**
+ * @return Map of unpaired getters and setters (getters/setters without proper setters/getters).
+ * of all properties used in EL.
+ * Key - name of property.
+ * Value - MethodInfo of existed getter/setter.
+ */
+ public Map<String, TypeInfoCollector.MethodInfo> getUnpairedGettersOrSetters() {
+ if (unpairedGettersOrSetters == null) {
+ unpairedGettersOrSetters = new HashMap<String, TypeInfoCollector.MethodInfo>();
+ }
+ return unpairedGettersOrSetters;
+ }
+
+ /**
+ * Clear Map of unpaired getters and setters.
+ */
+ public void clearUnpairedGettersOrSetters() {
+ getUnpairedGettersOrSetters().clear();
+ }
+
+}
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/Var.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/Var.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/Var.java 2008-09-23 14:01:49 UTC (rev 10409)
@@ -0,0 +1,142 @@
+package org.jboss.tools.seam.internal.core.el;
+
+import java.util.List;
+
+/**
+ * Represents "var"/"value" attributes.
+ * @author Alexey Kazakov
+ */
+public class Var {
+ String name;
+ String value;
+ ELToken elToken;
+ String resolvedValue;
+ ELToken resolvedElToken;
+ int declOffset;
+ int declLength;
+
+ /**
+ * Constructor
+ * @param name - value of "var" attribute.
+ * @param value - value of "value" attribute.
+ */
+ public Var(String name, String value, int declOffset, int declLength) {
+ super();
+ this.name = name;
+ this.value = value;
+ elToken = parseEl(value);
+ this.declOffset = declOffset;
+ this.declLength = declLength;
+ }
+
+ /**
+ * Constructor
+ * @param name - value of "var" attribute.
+ * @param value - value of "value" attribute.
+ */
+ public Var(String name, String value) {
+ this(name, value, 0, 0);
+ }
+
+ ELToken parseEl(String el) {
+ if(el.length()>3 && el.startsWith("#{") && el.endsWith("}")) {
+ String elBody = el.substring(0, el.length()-1).substring(2);
+ SeamELTokenizer elTokenizer = new SeamELTokenizer(elBody);
+ List<ELToken> tokens = elTokenizer.getTokens();
+ for (ELToken token : tokens) {
+ if(token.getType()==ELToken.EL_VARIABLE_TOKEN) {
+ return token;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Sets value to new resolved EL which we got as result of parsing value.
+ * For example:
+ * <h:datatable value="#{list}" var="item">
+ * <h:dataTable value="#{item.anotherList}" var="innerItem">
+ * ...
+ * </h:dataTable>
+ * </h:dataTable>
+ * Original El is #{item.anotherList}
+ * Resolved El is #{list.iterator().next().anotherList}
+ * It's very useful for nested vars.
+ * @param newEl
+ */
+ public void resolveValue(String newEl) {
+ resolvedValue = newEl;
+ resolvedElToken = parseEl(newEl);
+ }
+
+ /**
+ * @return parsed EL from "value" attribute. Returns null if EL is not valid.
+ */
+ public ELToken getElToken() {
+ return elToken;
+ }
+
+ /**
+ * @return parsed resolved EL from "value" attribute. May be null.
+ */
+ public ELToken getResolvedElToken() {
+ return resolvedElToken;
+ }
+
+ /**
+ * @return name of variable.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return value of variable. It's EL.
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * @return resolved value of variable. It's EL. May be null.
+ */
+ public String getResolvedValue() {
+ return resolvedValue;
+ }
+
+ /**
+ * @return offset of the var declaration
+ */
+ public int getDeclarationOffset() {
+ return declOffset;
+ }
+
+ /**
+ * @return length of the var declaration
+ */
+ public int getDeclarationLength() {
+ return declLength;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof Var) {
+ Var compare = (Var)obj;
+ String str = getName();
+ if (str != null) {
+ if (!str.equals(compare.getName()))
+ return false;
+ } else {
+ if (compare.getName() != null)
+ return false;
+ }
+ str = getValue();
+ return (str != null ?
+ str.equals(compare.getValue()) :
+ compare.getValue() == null);
+ }
+ return false;
+ }
+
+}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-09-23 14:00:46 UTC (rev 10408)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-09-23 14:01:49 UTC (rev 10409)
@@ -53,9 +53,10 @@
import org.jboss.tools.seam.internal.core.el.ELToken;
import org.jboss.tools.seam.internal.core.el.ElVarSearcher;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
+import org.jboss.tools.seam.internal.core.el.SeamELOperandResolveStatus;
import org.jboss.tools.seam.internal.core.el.SeamELStringTokenizer;
import org.jboss.tools.seam.internal.core.el.SeamELTokenizer;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
+import org.jboss.tools.seam.internal.core.el.Var;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -289,7 +290,7 @@
position = 0;
}
- SeamELCompletionEngine.SeamELOperandResolveStatus status =
+ SeamELOperandResolveStatus status =
engine.resolveSeamELOperand(project, file, operand, prefix, position, true, varListForCurentValidatedNode, elVarSearcher);
if(status.getUsedVariables().size()==0 && status.isError()) {
15 years, 9 months
JBoss Tools SVN: r10408 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-23 10:00:46 -0400 (Tue, 23 Sep 2008)
New Revision: 10408
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
Log:
JBIDE-1497
Classes Var and SeamELOperandResolveStatus are moved to separate files.
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2008-09-23 13:59:05 UTC (rev 10407)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2008-09-23 14:00:46 UTC (rev 10408)
@@ -31,7 +31,7 @@
import org.jboss.tools.seam.internal.core.el.ELOperandToken;
import org.jboss.tools.seam.internal.core.el.ElVarSearcher;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
+import org.jboss.tools.seam.internal.core.el.Var;
import org.jboss.tools.seam.text.ext.SeamExtPlugin;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
15 years, 9 months
JBoss Tools SVN: r10407 - in trunk/seam/plugins/org.jboss.tools.seam.ui: src/org/jboss/tools/seam/ui/search and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-09-23 09:59:05 -0400 (Tue, 23 Sep 2008)
New Revision: 10407
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
JBIDE-1497
Classes Var and SeamELOperandResolveStatus are moved to separate files.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath 2008-09-23 12:30:18 UTC (rev 10406)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/.classpath 2008-09-23 13:59:05 UTC (rev 10407)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2008-09-23 12:30:18 UTC (rev 10406)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java 2008-09-23 13:59:05 UTC (rev 10407)
@@ -42,7 +42,7 @@
import org.jboss.tools.seam.internal.core.el.ELOperandToken;
import org.jboss.tools.seam.internal.core.el.ElVarSearcher;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
+import org.jboss.tools.seam.internal.core.el.Var;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.jboss.tools.seam.ui.SeamUIMessages;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2008-09-23 12:30:18 UTC (rev 10406)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2008-09-23 13:59:05 UTC (rev 10407)
@@ -39,7 +39,6 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.el.ELOperandToken;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
import org.jboss.tools.seam.ui.SeamUIMessages;
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2008-09-23 12:30:18 UTC (rev 10406)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java 2008-09-23 13:59:05 UTC (rev 10407)
@@ -115,7 +115,7 @@
import org.jboss.tools.seam.internal.core.el.SeamELOperandTokenizerForward;
import org.jboss.tools.seam.internal.core.el.SeamELStringTokenizer;
import org.jboss.tools.seam.internal.core.el.SeamELTokenizer;
-import org.jboss.tools.seam.internal.core.el.ElVarSearcher.Var;
+import org.jboss.tools.seam.internal.core.el.Var;
import org.jboss.tools.seam.internal.core.scanner.ScannerException;
import org.jboss.tools.seam.internal.core.scanner.java.AnnotatedASTNode;
import org.jboss.tools.seam.internal.core.scanner.java.ResolvedAnnotation;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-09-23 12:30:18 UTC (rev 10406)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-09-23 13:59:05 UTC (rev 10407)
@@ -57,6 +57,7 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.el.ElVarSearcher;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
+import org.jboss.tools.seam.internal.core.el.Var;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.w3c.dom.Node;
@@ -324,7 +325,7 @@
proposalSufix = "}";
}
- List<ElVarSearcher.Var> vars = ElVarSearcher.findAllVars(viewer, offset);
+ List<Var> vars = ElVarSearcher.findAllVars(viewer, offset);
List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars);
List<String> uniqueSuggestions = fEngine.makeUnique(suggestions);
15 years, 9 months
JBoss Tools SVN: r10406 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: edit and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-09-23 08:30:18 -0400 (Tue, 23 Sep 2008)
New Revision: 10406
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2611
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-09-23 10:18:14 UTC (rev 10405)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-09-23 12:30:18 UTC (rev 10406)
@@ -539,7 +539,7 @@
private ModelSelectionProvider modelSelectionProvider = new ModelSelectionProvider();
- class ModelSelectionProvider extends AbstractSelectionProvider implements
+ public class ModelSelectionProvider extends AbstractSelectionProvider implements
ISelectionChangedListener {
public void selectionChanged(SelectionChangedEvent event) {
fireSelectionChanged();
@@ -588,7 +588,7 @@
vp.setViewLocation(origin);
}
- protected void setSelectedModelObject(XModelObject object) {
+ public void setSelectedModelObject(XModelObject object) {
if(object == null) return;
// Make projection to diagram XML if necessary.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-09-23 10:18:14 UTC (rev 10405)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-09-23 12:30:18 UTC (rev 10406)
@@ -44,8 +44,10 @@
child = new ParamListEditPart();
else if (model instanceof Param)
child = new ParamEditPart();
- else if (model instanceof Link)
+ else if (model instanceof Link){
child = new LinkEditPart();
+ ((LinkEditPart)child).setEditor(editor);
+ }
if (child != null)
child.setModel(model);
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-09-23 10:18:14 UTC (rev 10405)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-09-23 12:30:18 UTC (rev 10406)
@@ -14,6 +14,7 @@
import java.beans.PropertyChangeListener;
import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.FreeformViewport;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.PointList;
@@ -24,16 +25,24 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartListener;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.SelectionManager;
import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.gef.edit.GEFRootEditPart;
import org.jboss.tools.common.gef.figures.GEFLabel;
import org.jboss.tools.common.gef.figures.xpl.CustomLocator;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.seam.ui.pages.editor.PagesEditor;
+import org.jboss.tools.seam.ui.pages.editor.PagesEditor.ModelSelectionProvider;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
import org.jboss.tools.seam.ui.pages.editor.figures.ConnectionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.FigureFactory;
@@ -43,6 +52,8 @@
PagesEditor.class, "icons/shortcut.gif").createImage();
AccessibleEditPart acc;
+
+ PagesEditor editor;
private boolean shortcut;
@@ -55,6 +66,10 @@
private GEFLabel pathLabel;
private PageEditPart pagePart = null;
+
+ public void setEditor(PagesEditor editor){
+ this.editor = editor;
+ }
public void activate() {
if (!isActive()) {
@@ -198,6 +213,30 @@
*/
protected void refreshVisuals() {
}
+
+ public void performRequest(Request req) {
+ if (RequestConstants.REQ_OPEN.equals(req.getType())) {
+ if(getLink().isShortcut()){
+ PagesElement element = getLink().getToElement();
+ if(element == null) return;
+
+ PagesEditPart part = (PagesEditPart)editor.getScrollingGraphicalViewer().getEditPartRegistry().get(element);
+ if(part == null) return;
+
+ Object[] sel = new Object[1];
+ sel[0] = part;
+ StructuredSelection newSelection = new StructuredSelection(sel);
+
+ editor.getScrollingGraphicalViewer().setSelection(newSelection);
+
+ PagesDiagramEditPart diagram = (PagesDiagramEditPart) editor.getScrollingGraphicalViewer()
+ .getRootEditPart().getChildren().get(0);
+ FreeformViewport vp = diagram.getFreeformViewport();
+
+ ((ModelSelectionProvider)editor.getModelSelectionProvider()).scroll(vp, part.getNodeFigure());
+ }
+ }
+ }
public void setModel(Object model) {
super.setModel(model);
15 years, 9 months
JBoss Tools SVN: r10405 - trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-23 06:18:14 -0400 (Tue, 23 Sep 2008)
New Revision: 10405
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
add parse function for XML2Java analyzer
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-23 09:51:51 UTC (rev 10404)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-23 10:18:14 UTC (rev 10405)
@@ -15,6 +15,7 @@
import javax.swing.text.html.HTMLDocument.HTMLReader.TagAction;
+import org.eclipse.emf.ecore.xml.type.AnyType;
import org.jboss.tools.smooks.analyzer.AbstractAnalyzer;
import org.jboss.tools.smooks.analyzer.MappingModel;
import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
@@ -214,22 +215,17 @@
ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType);
String selector = rootResourceConfig.getSelector();
AbstractXMLObject source = findXMLObjectBySelector(selector, sourceRoot);
- if(source == null) return MappingResourceConfigList.createEmptyList();
-
+ if (source == null)
+ return MappingResourceConfigList.createEmptyList();
+
MappingResourceConfigList rcl = new MappingResourceConfigList();
- MappingModel mapping = new MappingModel(source,sourceTarget);
+ MappingModel mapping = new MappingModel(source, sourceTarget);
rcl.getMappingModelList().add(mapping);
rcl.addResourceConfig(rootResourceConfig);
return null;
}
- protected void createMappingResourceConfigList(ResourceConfigType config,
- AbstractXMLObject sourceRoot, JavaBeanModel targetRoot) {
- String selector = config.getSelector();
- AbstractXMLObject source = findXMLObjectBySelector(selector, sourceRoot);
- }
-
private AbstractXMLObject findXMLObjectBySelector(String selector,
AbstractXMLObject root) {
if (selector == null)
@@ -260,8 +256,42 @@
protected void createMappingResourceConfigList(
MappingResourceConfigList configList, SmooksResourceListType list,
- AbstractXMLObject sourceRoot, JavaBeanModel targetRoot) {
+ ResourceConfigType config, AbstractXMLObject sourceRoot,
+ JavaBeanModel targetRoot) {
+ String selector = config.getSelector();
+ String beanID = SmooksModelUtils.getParmaText(
+ SmooksModelConstants.BEAN_ID, config);
+ String beanClass = SmooksModelUtils.getParmaText(
+ SmooksModelConstants.BEAN_CLASS, config);
+ List<ParamType> paramList = config.getParam();
+ ParamType bindingParam = null;
+ for (Iterator iterator = paramList.iterator(); iterator.hasNext();) {
+ ParamType paramType = (ParamType) iterator.next();
+ String name = paramType.getName();
+ if (SmooksModelConstants.BINDINGS.equals(name)) {
+ bindingParam = paramType;
+ break;
+ }
+ }
+ if (bindingParam != null) {
+ List bindings = (List) bindingParam.getMixed().get(
+ SmooksModelUtils.ELEMENT_BINDING, true);
+ if (bindings != null) {
+ for (Iterator iterator = bindings.iterator(); iterator
+ .hasNext();) {
+ String property = SmooksModelUtils
+ .getAttributeValueFromAnyType((AnyType) iterator
+ .next(),
+ SmooksModelUtils.ATTRIBUTE_PROPERTY);
+ String selectorStr = SmooksModelUtils
+ .getAttributeValueFromAnyType((AnyType) iterator
+ .next(),
+ SmooksModelUtils.ATTRIBUTE_SELECTOR);
+ }
+ }
+ }
+ AbstractXMLObject source = findXMLObjectBySelector(selector, sourceRoot);
}
private ResourceConfigType findFirstMappingResourceConfig(
15 years, 9 months
JBoss Tools SVN: r10404 - in trunk/smooks/plugins: org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-23 05:51:51 -0400 (Tue, 23 Sep 2008)
New Revision: 10404
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
add parse function for XML2Java analyzer
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java 2008-09-23 08:56:08 UTC (rev 10403)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java 2008-09-23 09:51:51 UTC (rev 10404)
@@ -13,24 +13,24 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Properties;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-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.Path;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.graphical.GraphicalFactory;
import org.jboss.tools.smooks.graphical.MappingDataType;
+import org.jboss.tools.smooks.graphical.Param;
+import org.jboss.tools.smooks.graphical.Params;
import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
/**
@@ -99,12 +99,28 @@
}
if (graph != null) {
initMappingTypes(graph, sourceID, targetID);
+ Params params = GraphicalFactory.eINSTANCE.createParams();
+ graph.setParams(params);
+ initParams(params,context);
}
graphicalFileResource.save(Collections.EMPTY_MAP);
}
}
+ private void initParams(Params params,
+ SmooksConfigurationFileGenerateContext context) {
+ Properties pros = context.getProperties();
+ Enumeration<Object> keys = pros.keys();
+ while(keys.hasMoreElements()){
+ String key = (String) keys.nextElement();
+ Param param = GraphicalFactory.eINSTANCE.createParam();
+ param.setName(key);
+ param.setValue(pros.getProperty(key));
+ params.getParam().add(param);
+ }
+ }
+
protected void initMappingTypes(GraphInformations infor, String sourceID,
String targetID) {
MappingDataType mapping = infor.getMappingType();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-23 08:56:08 UTC (rev 10403)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-23 09:51:51 UTC (rev 10404)
@@ -699,6 +699,7 @@
context.setTargetDataTypeID(this.targetDataTypeID);
context.setSmooksType(SmooksModelConstants.SAX);
context.setDataMappingRootModel(this.rootModel);
+ context.setSmooksConfigFile(((IFileEditorInput)getEditorInput()).getFile());
}
protected Composite createUISectionContainer(Composite parent, int columns) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-23 08:56:08 UTC (rev 10403)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-09-23 09:51:51 UTC (rev 10404)
@@ -12,7 +12,9 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
+import org.eclipse.core.resources.IFile;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.jboss.tools.smooks.graphical.Param;
import org.jboss.tools.smooks.model.SmooksResourceListType;
@@ -30,7 +32,8 @@
protected GraphRootModel dataMappingRootModel;
protected SmooksResourceListType smooksResourceListModel;
protected List generatorResourceList = new ArrayList();
-
+ private Properties properties = new Properties();
+ protected IFile smooksConfigFile = null;
protected EditingDomain domain;
protected String smooksType = null;
@@ -110,4 +113,25 @@
this.generatorResourceList = generatorResourceList;
}
+ public void putProperty(String paramName,String paramValue){
+ properties.setProperty(paramName, paramValue);
+ }
+
+ public String getProperty(String paramName){
+ return properties.getProperty(paramName);
+ }
+
+ public void cleanProperties(){
+ properties.clear();
+ }
+ public IFile getSmooksConfigFile() {
+ return smooksConfigFile;
+ }
+ public void setSmooksConfigFile(IFile smooksConfigFile) {
+ this.smooksConfigFile = smooksConfigFile;
+ }
+ public Properties getProperties() {
+ return properties;
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-23 08:56:08 UTC (rev 10403)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-23 09:51:51 UTC (rev 10404)
@@ -10,15 +10,15 @@
******************************************************************************/
package org.jboss.tools.smooks.xml2java.analyzer;
-import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.resources.IFile;
+import javax.swing.text.html.HTMLDocument.HTMLReader.TagAction;
+
import org.jboss.tools.smooks.analyzer.AbstractAnalyzer;
+import org.jboss.tools.smooks.analyzer.MappingModel;
import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
-import org.jboss.tools.smooks.graphical.GraphInformations;
import org.jboss.tools.smooks.javabean.model.JavaBeanModel;
import org.jboss.tools.smooks.model.ParamType;
import org.jboss.tools.smooks.model.ResourceConfigType;
@@ -36,6 +36,7 @@
import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
import org.jboss.tools.smooks.utils.UIUtils;
import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
+import org.jboss.tools.smooks.xml.model.TagObject;
import org.jboss.tools.smooks.xml.model.TagPropertyObject;
/**
@@ -52,10 +53,11 @@
public void analyzeMappingGraphModel(
SmooksConfigurationFileGenerateContext context)
throws SmooksAnalyzerException {
-
- String filePath = context.getSmooksConfigFile().getLocation().toOSString();
+
+ String filePath = context.getSmooksConfigFile().getLocation()
+ .toOSString();
context.putProperty(XMLSourceModelAnalyzer.XML_FILE, filePath);
-
+
SmooksResourceListType listType = context.getSmooksResourceListModel();
GraphRootModel rootModel = context.getDataMappingRootModel();
List children = rootModel.getChildren();
@@ -102,7 +104,7 @@
ResourceConfigType resourceConfigType = SmooksFactory.eINSTANCE
.createResourceConfigType();
context.getGeneratorResourceList().add(resourceConfigType);
-// addResourceConfigType(listType, resourceConfigType);
+ // addResourceConfigType(listType, resourceConfigType);
// set the selector string value
resourceConfigType.setSelector(source.getName());
// create a resource and add it to resourceConfig
@@ -130,12 +132,12 @@
// add bindings param
ParamType bindingsParam = addParamTypeToResourceConfig(
resourceConfigType, SmooksModelConstants.BINDINGS, null);
- processBindingsParam(bindingsParam, target,source, context, listType);
+ processBindingsParam(bindingsParam, target, source, context, listType);
//
}
protected void processBindingsParam(ParamType bindingsParam,
- JavaBeanModel javaBean,AbstractXMLObject source,
+ JavaBeanModel javaBean, AbstractXMLObject source,
SmooksConfigurationFileGenerateContext context,
SmooksResourceListType listType) {
List properties = javaBean.getProperties();
@@ -157,8 +159,9 @@
String selector = getSelectorID(child);
if (!isComplex) {
- selector = getSelectorIDViaXMLObject((AbstractXMLObject) sourceModel
- .getReferenceEntityModel(),source);
+ selector = getSelectorIDViaXMLObject(
+ (AbstractXMLObject) sourceModel
+ .getReferenceEntityModel(), source);
}
SmooksModelUtils.addBindingTypeToParamType(bindingsParam, child
.getName(), selector, null, null);
@@ -172,15 +175,17 @@
}
}
- protected String getSelectorIDViaXMLObject(AbstractXMLObject sourceModel,AbstractXMLObject currentRoot) {
+ protected String getSelectorIDViaXMLObject(AbstractXMLObject sourceModel,
+ AbstractXMLObject currentRoot) {
String name = sourceModel.getName();
if (sourceModel instanceof TagPropertyObject) {
name = "@" + name;
}
AbstractXMLObject parent = sourceModel.getParent();
- while ( parent != null && parent.getName() != null) {
+ while (parent != null && parent.getName() != null) {
name = parent.getName() + " " + name;
- if(parent == currentRoot) break;
+ if (parent == currentRoot)
+ break;
parent = parent.getParent();
}
return name;
@@ -195,23 +200,83 @@
return target.getName();
}
- public List<LineConnectionModel> analyzeMappingSmooksModel(
- SmooksResourceListType listType) {
- // TODO Auto-generated method stub
+ public MappingResourceConfigList analyzeMappingSmooksModel(
+ SmooksResourceListType listType, Object sourceObject,
+ Object targetObject) {
+ if (!(sourceObject instanceof AbstractXMLObject)
+ || !(targetObject instanceof JavaBeanModel)) {
+ return MappingResourceConfigList.createEmptyList();
+ }
+
+ AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject;
+ JavaBeanModel sourceTarget = (JavaBeanModel) targetObject;
+
+ ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType);
+ String selector = rootResourceConfig.getSelector();
+ AbstractXMLObject source = findXMLObjectBySelector(selector, sourceRoot);
+ if(source == null) return MappingResourceConfigList.createEmptyList();
+
+ MappingResourceConfigList rcl = new MappingResourceConfigList();
+ MappingModel mapping = new MappingModel(source,sourceTarget);
+ rcl.getMappingModelList().add(mapping);
+ rcl.addResourceConfig(rootResourceConfig);
+
return null;
}
- public Object buildSourceInputObjects(GraphInformations graphInfo,
- SmooksResourceListType listType, IFile sourceFile)
- throws InvocationTargetException {
- // TODO Auto-generated method stub
+ protected void createMappingResourceConfigList(ResourceConfigType config,
+ AbstractXMLObject sourceRoot, JavaBeanModel targetRoot) {
+ String selector = config.getSelector();
+ AbstractXMLObject source = findXMLObjectBySelector(selector, sourceRoot);
+ }
+
+ private AbstractXMLObject findXMLObjectBySelector(String selector,
+ AbstractXMLObject root) {
+ if (selector == null)
+ return null;
+ if (selector.equals(root.getName())) {
+ return root;
+ }
+ if (root instanceof TagObject) {
+ List properties = ((TagObject) root).getProperties();
+ for (Iterator iterator = properties.iterator(); iterator.hasNext();) {
+ TagPropertyObject pro = (TagPropertyObject) iterator.next();
+ if (selector.equals(pro.getName()))
+ return pro;
+ }
+ List<AbstractXMLObject> tags = ((TagObject) root).getChildren();
+ for (Iterator iterator = tags.iterator(); iterator.hasNext();) {
+ AbstractXMLObject tagChild = (AbstractXMLObject) iterator
+ .next();
+ AbstractXMLObject result = findXMLObjectBySelector(selector,
+ tagChild);
+ if (result != null)
+ return result;
+ }
+ }
return null;
+
}
- public MappingResourceConfigList analyzeMappingSmooksModel(
- SmooksResourceListType listType, Object sourceObject,
- Object targetObject) {
- // TODO Auto-generated method stub
+ protected void createMappingResourceConfigList(
+ MappingResourceConfigList configList, SmooksResourceListType list,
+ AbstractXMLObject sourceRoot, JavaBeanModel targetRoot) {
+
+ }
+
+ private ResourceConfigType findFirstMappingResourceConfig(
+ SmooksResourceListType listType) {
+ List list = listType.getAbstractResourceConfig();
+ for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+ ResourceConfigType resource = (ResourceConfigType) iterator.next();
+ ResourceType rt = resource.getResource();
+ if (rt == null)
+ continue;
+ String value = rt.getValue();
+ if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) {
+ return resource;
+ }
+ }
return null;
}
15 years, 9 months
JBoss Tools SVN: r10403 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-09-23 04:56:08 -0400 (Tue, 23 Sep 2008)
New Revision: 10403
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-420 - correcting the note.
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml 2008-09-23 07:50:56 UTC (rev 10402)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/getting_started.xml 2008-09-23 08:56:08 UTC (rev 10403)
@@ -67,12 +67,16 @@
export PATH=$PATH:$JAVA_HOME/bin]]></programlisting>
</listitem>
</itemizedlist>
+
<note>
<title>Note:</title>
- <para>When you add $JAVA_HOME/bin to $PATH, you should add it <emphasis role="bold"
- >before</emphasis> the old $PATH not after it. This way, the machine will pick up the new JVM
- first. You only need to run "alternative" as a safe guard for the right
- JVM.</para>
+
+ <para>If you have JDK already installed and added in your system path, you should add
+ <emphasis>$JAVA_HOME/bin</emphasis> before the old <emphasis>$PATH</emphasis> (not after it) so that the new
+ version of JDK can be found first, i. e. <para>
+ <emphasis>export PATH=$JAVA_HOME/bin:$PATH</emphasis>
+ </para> This way, the machine will pick up the new JVM first. You only need to run
+ "alternative" as a safe guard for the right JVM. </para>
</note>
<para>Set this variable for your account doing the installation and also for the user account
@@ -386,13 +390,14 @@
</listitem>
</itemizedlist>
- <para>Some of our newer plugins, like TPTP and BIRT, need additional drivers. On the left side of the download page
- you can find all of the required drivers for chosen build and their versions.</para>
+ <para>Some of our newer plugins, like TPTP and BIRT, need additional drivers. On the left side
+ of the download page you can find all of the required drivers for chosen build and their
+ versions.</para>
<para>Instead of downloading the nightly build version manually, it's also possible to
get the latest release of <property>JBoss Tools</property> from one of our update sites: <itemizedlist>
<listitem>
<para>Stable Updates: <ulink url="http://download.jboss.org/jbosstools/updates/stable"
- >http://download.jboss.org/jbosstools/updates/stable</ulink></para>
+ >http://download.jboss.org/jbosstools/updates/stable</ulink></para>
</listitem>
<listitem>
<para> Development Updates: <ulink
15 years, 9 months
JBoss Tools SVN: r10402 - in trunk/smooks/plugins/org.jboss.tools.smooks.xml2java: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-23 03:50:56 -0400 (Tue, 23 Sep 2008)
New Revision: 10402
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/lib/
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/lib/dom4j-1.6.1.jar
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties
Log:
add new jar for parsing
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath 2008-09-23 07:47:20 UTC (rev 10401)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath 2008-09-23 07:50:56 UTC (rev 10402)
@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF 2008-09-23 07:47:20 UTC (rev 10401)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF 2008-09-23 07:50:56 UTC (rev 10402)
@@ -18,5 +18,5 @@
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.smooks.xml2java,
org.jboss.tools.smooks.xml2java.analyzer
-Bundle-ClassPath: libs/dom4j-1.6.1.jar,
- .
+Bundle-ClassPath: .,
+ lib/dom4j-1.6.1.jar
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties 2008-09-23 07:47:20 UTC (rev 10401)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties 2008-09-23 07:50:56 UTC (rev 10402)
@@ -3,4 +3,4 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- libs/dom4j-1.6.1.jar
+ lib/dom4j-1.6.1.jar
Added: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/lib/dom4j-1.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/lib/dom4j-1.6.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 9 months
JBoss Tools SVN: r10401 - in trunk/smooks/plugins/org.jboss.tools.smooks.xml2java: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-23 03:47:20 -0400 (Tue, 23 Sep 2008)
New Revision: 10401
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/plugin.xml
trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
Log:
Add a xml source data analyzer
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath 2008-09-22 19:38:23 UTC (rev 10400)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/.classpath 2008-09-23 07:47:20 UTC (rev 10401)
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF 2008-09-22 19:38:23 UTC (rev 10400)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/META-INF/MANIFEST.MF 2008-09-23 07:47:20 UTC (rev 10401)
@@ -18,3 +18,5 @@
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.smooks.xml2java,
org.jboss.tools.smooks.xml2java.analyzer
+Bundle-ClassPath: libs/dom4j-1.6.1.jar,
+ .
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties 2008-09-22 19:38:23 UTC (rev 10400)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/build.properties 2008-09-23 07:47:20 UTC (rev 10401)
@@ -2,4 +2,5 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ libs/dom4j-1.6.1.jar
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/plugin.xml 2008-09-22 19:38:23 UTC (rev 10400)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/plugin.xml 2008-09-23 07:47:20 UTC (rev 10401)
@@ -12,6 +12,11 @@
name="JavaBean">
</targetSourceType>
</mappingAnalyzer>
+ <sourceModelAnalyzer
+ class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer"
+ name="XML"
+ typeID="org.jboss.tools.smooks.xml.viewerInitor.xml">
+ </sourceModelAnalyzer>
</extension>
</plugin>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-22 19:38:23 UTC (rev 10400)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-09-23 07:47:20 UTC (rev 10401)
@@ -52,6 +52,10 @@
public void analyzeMappingGraphModel(
SmooksConfigurationFileGenerateContext context)
throws SmooksAnalyzerException {
+
+ String filePath = context.getSmooksConfigFile().getLocation().toOSString();
+ context.putProperty(XMLSourceModelAnalyzer.XML_FILE, filePath);
+
SmooksResourceListType listType = context.getSmooksResourceListModel();
GraphRootModel rootModel = context.getDataMappingRootModel();
List children = rootModel.getChildren();
@@ -97,7 +101,8 @@
.getReferenceEntityModel();
ResourceConfigType resourceConfigType = SmooksFactory.eINSTANCE
.createResourceConfigType();
- addResourceConfigType(listType, resourceConfigType);
+ context.getGeneratorResourceList().add(resourceConfigType);
+// addResourceConfigType(listType, resourceConfigType);
// set the selector string value
resourceConfigType.setSelector(source.getName());
// create a resource and add it to resourceConfig
Added: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-09-23 07:47:20 UTC (rev 10401)
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * 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.xml2java.analyzer;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.dom4j.DocumentException;
+import org.eclipse.core.resources.IFile;
+import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.graphical.Param;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
+import org.jboss.tools.smooks.xml.model.DocumentObject;
+import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer;
+
+/**
+ * @author Dart Peng<br>
+ * Date : Sep 23, 2008
+ */
+public class XMLSourceModelAnalyzer implements ISourceModelAnalyzer {
+
+ public static final String XML_FILE = "xmlFile";
+
+ public Object buildSourceInputObjects(GraphInformations graphInfo,
+ SmooksResourceListType listType, IFile sourceFile)
+ throws InvocationTargetException {
+ List<Param> paramList = graphInfo.getParams().getParam();
+ String path = null;
+ for (Iterator<Param> iterator = paramList.iterator(); iterator
+ .hasNext();) {
+ Param param = (Param) iterator.next();
+ if (param.getName().equals(XML_FILE)) {
+ path = param.getValue();
+ break;
+ }
+ }
+ if (path == null) {
+ throw new InvocationTargetException(new Exception(
+ "xml file path can't find in the graphInfo file"));
+ }
+ XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer();
+ try {
+ FileInputStream stream = new FileInputStream(path);
+ DocumentObject document = objectBuilder.analyze(stream);
+ return document.getRootTag();
+ } catch (FileNotFoundException e) {
+ throw new InvocationTargetException(e);
+ } catch (DocumentException e) {
+ throw new InvocationTargetException(e);
+ }
+ }
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
JBoss Tools SVN: r10400 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-22 15:38:23 -0400 (Mon, 22 Sep 2008)
New Revision: 10400
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
Log:
JBIDE-2235 - ui for selecting ports in server editor
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2008-09-22 19:21:00 UTC (rev 10399)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2008-09-22 19:38:23 UTC (rev 10400)
@@ -42,12 +42,12 @@
import org.jboss.ide.eclipse.as.ui.dialogs.ChangePortDialog.ChangePortDialogInfo;
/**
- *
+ *
* @author rob Stryker (rob.stryker(a)redhat.com)
*
*/
public class PortSection extends ServerEditorSection {
-
+
/* Load the various port editor pieces */
private static ArrayList<IPortEditorExtension> sectionList = new ArrayList<IPortEditorExtension>();
static {
@@ -61,15 +61,15 @@
} catch( CoreException ce) { /* ignore */ }
}
}
-
-
+
+
protected ServerAttributeHelper helper;
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
helper = new ServerAttributeHelper(server.getOriginal(), server);
}
-
+
public void createSection(Composite parent) {
super.createSection(parent);
createUI(parent);
@@ -80,15 +80,15 @@
public void setSection(ServerEditorSection section);
public Control createControl(Composite parent);
}
-
+
public static class JNDIPortEditorExtension extends PortEditorExtension {
public JNDIPortEditorExtension() {
- super(Messages.EditorJNDIPort, IJBossServerConstants.JNDI_PORT_DETECT_XPATH,
- IJBossServerConstants.JNDI_PORT_DETECT,
+ super(Messages.EditorJNDIPort, IJBossServerConstants.JNDI_PORT_DETECT_XPATH,
+ IJBossServerConstants.JNDI_PORT_DETECT,
IJBossServerConstants.JNDI_PORT_DEFAULT_XPATH);
}
public ServerCommand getCommand() {
- return new SetPortCommand(helper.getWorkingCopy(), helper, Messages.EditorChangeJNDICommandName,
+ return new SetPortCommand(helper.getWorkingCopy(), helper, Messages.EditorChangeJNDICommandName,
IJBossServerConstants.JNDI_PORT, IJBossServerConstants.JNDI_PORT_DETECT,
IJBossServerConstants.JNDI_PORT_DETECT_XPATH, IJBossServerConstants.JNDI_PORT_DEFAULT_XPATH,
text, detect, currentXPath, listener);
@@ -105,13 +105,13 @@
public static class WebPortEditorExtension extends PortEditorExtension {
public WebPortEditorExtension() {
- super(Messages.EditorWebPort, IJBossServerConstants.WEB_PORT_DETECT_XPATH,
- IJBossServerConstants.WEB_PORT_DETECT,
+ super(Messages.EditorWebPort, IJBossServerConstants.WEB_PORT_DETECT_XPATH,
+ IJBossServerConstants.WEB_PORT_DETECT,
IJBossServerConstants.WEB_PORT_DEFAULT_XPATH);
}
public ServerCommand getCommand() {
- return new SetPortCommand(helper.getWorkingCopy(), helper, Messages.EditorChangeWebCommandName,
+ return new SetPortCommand(helper.getWorkingCopy(), helper, Messages.EditorChangeWebCommandName,
IJBossServerConstants.WEB_PORT, IJBossServerConstants.WEB_PORT_DETECT,
IJBossServerConstants.WEB_PORT_DETECT_XPATH, IJBossServerConstants.WEB_PORT_DEFAULT_XPATH,
text, detect, currentXPath, listener);
@@ -154,21 +154,21 @@
addListeners();
return c;
}
-
+
protected Control createUI(Composite parent) {
Composite child = new Composite(parent, SWT.NONE);
child.setLayout(new FormLayout());
label = new Label(child, SWT.NONE);
text = new Text(child, SWT.DEFAULT);
detect = new Button(child, SWT.CHECK);
- link = new Link(child, SWT.DEFAULT);
-
+ link = new Link(child, SWT.NONE);
+
FormData data;
data = new FormData();
data.top = new FormAttachment(0,8);
data.right = new FormAttachment(100,-5);
link.setLayoutData(data);
-
+
data = new FormData();
data.right = new FormAttachment(link, -5);
data.top = new FormAttachment(0,5);
@@ -184,7 +184,7 @@
data.right = new FormAttachment(text,-5);
data.top = new FormAttachment(0,8);
label.setLayoutData(data);
-
+
label.setText(labelText);
detect.setText(Messages.EditorAutomaticallyDetectPort);
link.setText("<a href=\"\">" + Messages.Customize + "</a>");
@@ -211,7 +211,7 @@
detect.addListener(SWT.Selection, listener);
link.addListener(SWT.Selection, createLinkListener());
}
-
+
protected Listener createLinkListener() {
return new Listener() {
public void handleEvent(Event event) {
@@ -229,7 +229,7 @@
return new ChangePortDialog(section.getShell(), getDialogInfo());
}
protected abstract ChangePortDialogInfo getDialogInfo();
-
+
protected String findPort(IPath path) {
XPathQuery query = XPathModel.getDefault().getQuery(helper.getServer(), path);
if(query!=null) {
@@ -244,14 +244,14 @@
return null;
}
}
-
+
protected void createUI(Composite parent) {
-
+
FormToolkit toolkit = new FormToolkit(parent.getDisplay());
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
section.setText(Messages.EditorServerPorts);
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
-
+
Composite composite = toolkit.createComposite(section);
composite.setLayout(new FormLayout());
Label description = new Label(composite, SWT.NONE);
@@ -265,10 +265,10 @@
toolkit.paintBordersFor(composite);
section.setClient(composite);
}
-
+
private void addUIAdditions(Composite parent, Control top) {
IPortEditorExtension[] extensions = (IPortEditorExtension[]) sectionList.toArray(new IPortEditorExtension[sectionList.size()]);
-
+
FormData data;
Control c;
Composite wrapper = new Composite(parent, SWT.NONE);
@@ -278,7 +278,7 @@
data.left = new FormAttachment(0,0);
wrapper.setLayoutData(data);
top = null;
- for( int i = 0; i < extensions.length; i++ ) {
+ for( int i = 0; i < extensions.length; i++ ) {
extensions[i].setServerAttributeHelper(helper);
extensions[i].setSection(this);
c = extensions[i].createControl(wrapper);
@@ -293,7 +293,7 @@
top = c;
}
}
-
+
protected String[] getXPathStrings() {
ArrayList<String> list = new ArrayList<String>();
XPathCategory[] categories = XPathModel.getDefault().getCategories(server.getOriginal());
@@ -305,7 +305,7 @@
}
return (String[]) list.toArray(new String[list.size()]);
}
-
+
public static class SetPortCommand extends ServerCommand {
ServerAttributeHelper helper;
String textAttribute, overrideAttribute, overridePathAttribute;
@@ -315,7 +315,7 @@
Button button;
Listener listener;
String xpath;
- public SetPortCommand(IServerWorkingCopy server, ServerAttributeHelper helper, String name,
+ public SetPortCommand(IServerWorkingCopy server, ServerAttributeHelper helper, String name,
String textAttribute, String overrideAttribute, String overridePathAttribute,
String pathDefault, Text text, Button button, String xpath, Listener listener) {
super(server, name);
@@ -339,7 +339,7 @@
helper.setAttribute(textAttribute, text.getText());
helper.setAttribute(overrideAttribute, button.getSelection());
helper.setAttribute(overridePathAttribute, xpath);
-
+
text.setEnabled(!button.getSelection());
text.setEditable(!button.getSelection());
if( button.getSelection() ) {
@@ -348,7 +348,7 @@
text.addListener(SWT.Modify, listener);
}
}
-
+
public void undo() {
// set new values
helper.setAttribute(textAttribute, preText);
@@ -364,9 +364,9 @@
text.setEnabled(!preOverride);
text.setEditable(!preOverride);
button.addListener(SWT.Selection, listener);
- text.addListener(SWT.Modify, listener);
+ text.addListener(SWT.Modify, listener);
}
-
+
protected String findPort(IPath path) {
XPathQuery query = XPathModel.getDefault().getQuery(helper.getServer(), path);
if(query!=null) {
15 years, 9 months