JBoss Tools SVN: r12680 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:16:30 -0500 (Thu, 18 Dec 2008)
New Revision: 12680
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java 2008-12-18 15:14:44 UTC (rev 12679)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamMessagesBeanHyperlink.java 2008-12-18 15:16:30 UTC (rev 12680)
@@ -11,22 +11,17 @@
package org.jboss.tools.seam.text.ext.hyperlink;
import java.text.MessageFormat;
-import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.IEditorPart;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
-import org.jboss.tools.seam.internal.core.SeamMessagesComponent;
+import org.jboss.tools.seam.core.ISeamMessages;
/**
* @author Jeremy
@@ -38,7 +33,7 @@
* @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion)
*/
protected void doHyperlink(IRegion region) {
- Map <String, SeamMessagesComponent> messages = SeamBeanHyperlinkPartitioner.findMessagesComponents(getDocument(), region);
+ Map <String, ISeamMessages> messages = SeamBeanHyperlinkPartitioner.findMessagesComponents(getDocument(), region);
if (messages == null || messages.size() == 0) {
// Nothing to open
openFileFailed();
@@ -46,7 +41,7 @@
}
for (String property : messages.keySet()) {
- SeamMessagesComponent messagesComponent = messages.get(property);
+ ISeamMessages messagesComponent = messages.get(property);
Map <String, IResource> resources = messagesComponent.getResourcesMap();
if (resources == null || resources.size() == 0)
continue;
17 years
JBoss Tools SVN: r12679 - branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:14:44 -0500 (Thu, 18 Dec 2008)
New Revision: 12679
Modified:
branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
Modified: branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2008-12-18 15:13:12 UTC (rev 12678)
+++ branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2008-12-18 15:14:44 UTC (rev 12679)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2008 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,
@@ -17,24 +17,17 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
import org.jboss.tools.common.el.core.model.ELExpression;
-import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
-import org.jboss.tools.common.el.core.model.ELModel;
-import org.jboss.tools.common.el.core.model.ELObjectType;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
-import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
-import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus;
import org.jboss.tools.common.el.core.resolver.ElVarSearcher;
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
@@ -43,18 +36,14 @@
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecognizer;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
-import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.seam.core.ISeamContextVariable;
-import org.jboss.tools.seam.core.ISeamElement;
+import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.SeamMessagesComponent;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.el.SeamExpressionResolver;
import org.jboss.tools.seam.text.ext.SeamExtPlugin;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -87,7 +76,7 @@
r = getWordRegion(document, superRegion.getOffset());
if (r == null) return null;
- Map<String, SeamMessagesComponent> messages = findMessagesComponents(document, superRegion);
+ Map<String, ISeamMessages> messages = findMessagesComponents(document, superRegion);
if (messages != null && messages.size() > 0) {
String axis = getAxis(document, superRegion);
@@ -278,7 +267,7 @@
Utils.findNodeForOffset(xmlDocument, region.getOffset());
- Map<String, SeamMessagesComponent> messages = findMessagesComponents(document, region);
+ Map<String, ISeamMessages> messages = findMessagesComponents(document, region);
if (messages != null && messages.size() > 0) {
return true;
}
@@ -382,7 +371,7 @@
}
}
- public static Map<String, SeamMessagesComponent> findMessagesComponents(IDocument document, IRegion region) {
+ public static Map<String, ISeamMessages> findMessagesComponents(IDocument document, IRegion region) {
StructuredModelWrapper smw = new StructuredModelWrapper();
try {
smw.init(document);
@@ -424,7 +413,6 @@
} else if (exp instanceof ELArgumentInvocation) {
propertyName = Utils.trimQuotes(
((ELArgumentInvocation)exp).getArgument().getArgument().getText());
-
}
if (propertyName == null)
@@ -449,44 +437,19 @@
}
}
-
// At the moment map contains the resolved EL parts mapped to their vars
// And now we need to extract SeamXmlFactory vars to the real ones
// and filter out all non-SeamMessagesComponent vars
// Next we need to map the SeamMessagesComponent vars to properties
- Map<String, SeamMessagesComponent> messages = new HashMap<String, SeamMessagesComponent>();
+ Map<String, ISeamMessages> messages = new HashMap<String, ISeamMessages>();
if (map != null && !map.isEmpty()) {
for (ELInvocationExpression l : map.keySet()) {
List<ISeamContextVariable> variables = map.get(l);
for (ISeamContextVariable variable : variables) {
- if (variable instanceof SeamMessagesComponent) {
- messages.put(propertyName, (SeamMessagesComponent)variable);
- } else if (variable instanceof ISeamXmlFactory) {
- ISeamXmlFactory factory = (ISeamXmlFactory)variable;
- String value = factory.getValue();
- if (value != null && value.length() > 0) {
- if (value.startsWith("#{") || value.startsWith("${")) //$NON-NLS-1$ //$NON-NLS-2$
- value = value.substring(2);
- if (value.endsWith("}")) //$NON-NLS-1$
- value = value.substring(0, value.length() - 1);
- }
- if (value != null && value.length() > 0) {
- // TODO: Need to make sure that it's correct way to get the project and
- // the scope from the factory
- ISeamProject p = ((ISeamElement)factory).getSeamProject();
- if (p != null) {
- List<ISeamContextVariable> resolvedValues = SeamExpressionResolver.resolveVariables(p, null, value, true);
- for (ISeamContextVariable var : resolvedValues) {
- if (var.getName().equals(value)) {
- if (var instanceof SeamMessagesComponent) {
- messages.put(propertyName,(SeamMessagesComponent)var);
- }
- }
- }
- }
- }
+ ISeamMessages messagesVariable = SeamELCompletionEngine.getSeamMessagesComponentVariable(variable);
+ if (messagesVariable != null) {
+ messages.put(propertyName, messagesVariable);
}
-
}
}
}
17 years
JBoss Tools SVN: r12678 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:13:12 -0500 (Thu, 18 Dec 2008)
New Revision: 12678
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
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-12-18 15:10:25 UTC (rev 12677)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlinkPartitioner.java 2008-12-18 15:13:12 UTC (rev 12678)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2008 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,
@@ -17,24 +17,17 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
import org.jboss.tools.common.el.core.model.ELExpression;
-import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
-import org.jboss.tools.common.el.core.model.ELModel;
-import org.jboss.tools.common.el.core.model.ELObjectType;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
-import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
-import org.jboss.tools.common.el.core.resolver.ELOperandResolveStatus;
import org.jboss.tools.common.el.core.resolver.ElVarSearcher;
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner;
@@ -43,18 +36,14 @@
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecognizer;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner;
-import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
import org.jboss.tools.seam.core.ISeamContextVariable;
-import org.jboss.tools.seam.core.ISeamElement;
+import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.SeamMessagesComponent;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.internal.core.el.SeamExpressionResolver;
import org.jboss.tools.seam.text.ext.SeamExtPlugin;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -87,7 +76,7 @@
r = getWordRegion(document, superRegion.getOffset());
if (r == null) return null;
- Map<String, SeamMessagesComponent> messages = findMessagesComponents(document, superRegion);
+ Map<String, ISeamMessages> messages = findMessagesComponents(document, superRegion);
if (messages != null && messages.size() > 0) {
String axis = getAxis(document, superRegion);
@@ -278,7 +267,7 @@
Utils.findNodeForOffset(xmlDocument, region.getOffset());
- Map<String, SeamMessagesComponent> messages = findMessagesComponents(document, region);
+ Map<String, ISeamMessages> messages = findMessagesComponents(document, region);
if (messages != null && messages.size() > 0) {
return true;
}
@@ -382,7 +371,7 @@
}
}
- public static Map<String, SeamMessagesComponent> findMessagesComponents(IDocument document, IRegion region) {
+ public static Map<String, ISeamMessages> findMessagesComponents(IDocument document, IRegion region) {
StructuredModelWrapper smw = new StructuredModelWrapper();
try {
smw.init(document);
@@ -424,7 +413,6 @@
} else if (exp instanceof ELArgumentInvocation) {
propertyName = Utils.trimQuotes(
((ELArgumentInvocation)exp).getArgument().getArgument().getText());
-
}
if (propertyName == null)
@@ -449,44 +437,19 @@
}
}
-
// At the moment map contains the resolved EL parts mapped to their vars
// And now we need to extract SeamXmlFactory vars to the real ones
// and filter out all non-SeamMessagesComponent vars
// Next we need to map the SeamMessagesComponent vars to properties
- Map<String, SeamMessagesComponent> messages = new HashMap<String, SeamMessagesComponent>();
+ Map<String, ISeamMessages> messages = new HashMap<String, ISeamMessages>();
if (map != null && !map.isEmpty()) {
for (ELInvocationExpression l : map.keySet()) {
List<ISeamContextVariable> variables = map.get(l);
for (ISeamContextVariable variable : variables) {
- if (variable instanceof SeamMessagesComponent) {
- messages.put(propertyName, (SeamMessagesComponent)variable);
- } else if (variable instanceof ISeamXmlFactory) {
- ISeamXmlFactory factory = (ISeamXmlFactory)variable;
- String value = factory.getValue();
- if (value != null && value.length() > 0) {
- if (value.startsWith("#{") || value.startsWith("${")) //$NON-NLS-1$ //$NON-NLS-2$
- value = value.substring(2);
- if (value.endsWith("}")) //$NON-NLS-1$
- value = value.substring(0, value.length() - 1);
- }
- if (value != null && value.length() > 0) {
- // TODO: Need to make sure that it's correct way to get the project and
- // the scope from the factory
- ISeamProject p = ((ISeamElement)factory).getSeamProject();
- if (p != null) {
- List<ISeamContextVariable> resolvedValues = SeamExpressionResolver.resolveVariables(p, null, value, true);
- for (ISeamContextVariable var : resolvedValues) {
- if (var.getName().equals(value)) {
- if (var instanceof SeamMessagesComponent) {
- messages.put(propertyName,(SeamMessagesComponent)var);
- }
- }
- }
- }
- }
+ ISeamMessages messagesVariable = SeamELCompletionEngine.getSeamMessagesComponentVariable(variable);
+ if (messagesVariable != null) {
+ messages.put(propertyName, messagesVariable);
}
-
}
}
}
17 years
JBoss Tools SVN: r12677 - branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:10:25 -0500 (Thu, 18 Dec 2008)
New Revision: 12677
Modified:
branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
Modified: branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-18 15:09:01 UTC (rev 12676)
+++ branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-18 15:10:25 UTC (rev 12677)
@@ -53,11 +53,9 @@
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.ISeamScope;
import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.SeamMessagesComponent;
import org.jboss.tools.seam.internal.core.el.SeamExpressionResolver.MessagesInfo;
/**
@@ -929,9 +927,9 @@
return content.length();
}
- public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) {
+ public static ISeamMessages getSeamMessagesComponentVariable(ISeamContextVariable variable) {
if (variable instanceof ISeamMessages) {
- return true;
+ return (ISeamMessages)variable;
} else if (variable instanceof ISeamXmlFactory) {
ISeamXmlFactory factory = (ISeamXmlFactory)variable;
String value = factory.getValue();
@@ -948,7 +946,7 @@
for (ISeamContextVariable var : resolvedValues) {
if (var.getName().equals(value)) {
if (var instanceof ISeamMessages) {
- return true;
+ return (ISeamMessages)var;
}
}
}
@@ -956,9 +954,13 @@
}
} else if(variable instanceof ISeamContextShortVariable) {
ISeamContextShortVariable sv = (ISeamContextShortVariable)variable;
- return isSeamMessagesComponentVariable(sv.getOriginal());
+ return getSeamMessagesComponentVariable(sv.getOriginal());
}
- return false;
+ return null;
}
+
+ public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) {
+ return (null != getSeamMessagesComponentVariable(variable));
+ }
}
17 years
JBoss Tools SVN: r12676 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:09:01 -0500 (Thu, 18 Dec 2008)
New Revision: 12676
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
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-12-18 15:06:37 UTC (rev 12675)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-12-18 15:09:01 UTC (rev 12676)
@@ -53,11 +53,9 @@
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.ISeamScope;
import org.jboss.tools.seam.core.ISeamXmlFactory;
import org.jboss.tools.seam.core.ScopeType;
import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.internal.core.SeamMessagesComponent;
import org.jboss.tools.seam.internal.core.el.SeamExpressionResolver.MessagesInfo;
/**
@@ -929,9 +927,9 @@
return content.length();
}
- public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) {
+ public static ISeamMessages getSeamMessagesComponentVariable(ISeamContextVariable variable) {
if (variable instanceof ISeamMessages) {
- return true;
+ return (ISeamMessages)variable;
} else if (variable instanceof ISeamXmlFactory) {
ISeamXmlFactory factory = (ISeamXmlFactory)variable;
String value = factory.getValue();
@@ -948,7 +946,7 @@
for (ISeamContextVariable var : resolvedValues) {
if (var.getName().equals(value)) {
if (var instanceof ISeamMessages) {
- return true;
+ return (ISeamMessages)var;
}
}
}
@@ -956,9 +954,13 @@
}
} else if(variable instanceof ISeamContextShortVariable) {
ISeamContextShortVariable sv = (ISeamContextShortVariable)variable;
- return isSeamMessagesComponentVariable(sv.getOriginal());
+ return getSeamMessagesComponentVariable(sv.getOriginal());
}
- return false;
+ return null;
}
+
+ public static boolean isSeamMessagesComponentVariable(ISeamContextVariable variable) {
+ return (null != getSeamMessagesComponentVariable(variable));
+ }
}
17 years
JBoss Tools SVN: r12675 - branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:06:37 -0500 (Thu, 18 Dec 2008)
New Revision: 12675
Modified:
branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
Modified: branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2008-12-18 15:04:09 UTC (rev 12674)
+++ branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2008-12-18 15:06:37 UTC (rev 12675)
@@ -12,8 +12,10 @@
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
+import org.eclipse.core.resources.IResource;
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProperty;
@@ -40,6 +42,10 @@
return messagesLoader.getPropertyNames();
}
+ public Map<String, IResource> getResourcesMap() {
+ return messagesLoader.getResources();
+ }
+
public SeamMessages clone() throws CloneNotSupportedException {
SeamMessages c = (SeamMessages)super.clone();
return c;
17 years
JBoss Tools SVN: r12674 - branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 10:04:09 -0500 (Thu, 18 Dec 2008)
New Revision: 12674
Modified:
branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
Modified: branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2008-12-18 14:58:22 UTC (rev 12673)
+++ branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2008-12-18 15:04:09 UTC (rev 12674)
@@ -11,7 +11,10 @@
package org.jboss.tools.seam.core;
import java.util.Collection;
+import java.util.Map;
+import org.eclipse.core.resources.IResource;
+
/**
* @author Viacheslav Kabanovich
*/
@@ -29,4 +32,10 @@
*/
public Collection<ISeamProperty> getProperties();
+ /**
+ *
+ * @return map of properties and corresponding resources
+ */
+ public Map<String, IResource> getResourcesMap();
+
}
17 years
JBoss Tools SVN: r12673 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-18 09:58:22 -0500 (Thu, 18 Dec 2008)
New Revision: 12673
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
Log:
JBIDE-1975 OpenOn for #{messages.***} in Seam EL.
Issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2008-12-18 14:40:20 UTC (rev 12672)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2008-12-18 14:58:22 UTC (rev 12673)
@@ -32,6 +32,10 @@
*/
public Collection<ISeamProperty> getProperties();
+ /**
+ *
+ * @return map of properties and corresponding resources
+ */
public Map<String, IResource> getResourcesMap();
}
17 years
JBoss Tools SVN: r12672 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-12-18 09:40:20 -0500 (Thu, 18 Dec 2008)
New Revision: 12672
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
Log:
JBIDE-1975
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2008-12-18 14:18:44 UTC (rev 12671)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/ISeamMessages.java 2008-12-18 14:40:20 UTC (rev 12672)
@@ -11,7 +11,10 @@
package org.jboss.tools.seam.core;
import java.util.Collection;
+import java.util.Map;
+import org.eclipse.core.resources.IResource;
+
/**
* @author Viacheslav Kabanovich
*/
@@ -29,4 +32,6 @@
*/
public Collection<ISeamProperty> getProperties();
+ public Map<String, IResource> getResourcesMap();
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2008-12-18 14:18:44 UTC (rev 12671)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamMessages.java 2008-12-18 14:40:20 UTC (rev 12672)
@@ -12,8 +12,10 @@
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
+import org.eclipse.core.resources.IResource;
import org.jboss.tools.seam.core.ISeamElement;
import org.jboss.tools.seam.core.ISeamMessages;
import org.jboss.tools.seam.core.ISeamProperty;
@@ -40,6 +42,10 @@
return messagesLoader.getPropertyNames();
}
+ public Map<String, IResource> getResourcesMap() {
+ return messagesLoader.getResources();
+ }
+
public SeamMessages clone() throws CloneNotSupportedException {
SeamMessages c = (SeamMessages)super.clone();
return c;
17 years
JBoss Tools SVN: r12671 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-12-18 09:18:44 -0500 (Thu, 18 Dec 2008)
New Revision: 12671
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/ViewIdsTree.java
Log:
JBIDE-3145
Fixed for case, when pages.xml is opened from a project that has no Seam support: null object was included into tree, and it failed.
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/ViewIdsTree.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/ViewIdsTree.java 2008-12-18 13:11:10 UTC (rev 12670)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/ViewIdsTree.java 2008-12-18 14:18:44 UTC (rev 12671)
@@ -3,8 +3,10 @@
import java.util.Map;
import java.util.TreeMap;
+import org.eclipse.ui.IViewReference;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.jst.web.model.tree.WebPagesTree;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
@@ -41,7 +43,24 @@
}
public XModelObject[] getChildren(XModelObject object) {
- if(object == root) return new XModelObject[]{webRoot, pages};
+ if(object == root) {
+ if(webRoot == null) {
+ XModelObject[] rs = super.getChildren(object);
+ if(pages == null) {
+ return rs;
+ } else {
+ XModelObject[] rs1 = new XModelObject[rs.length + 1];
+ System.arraycopy(rs, 0, rs1, 0, rs.length);
+ rs1[rs.length] = pages;
+ return rs1;
+ }
+ }
+ if(pages == null) {
+ return new XModelObject[]{webRoot};
+ } else {
+ return new XModelObject[]{webRoot, pages};
+ }
+ }
if(object == pages) return pageMap.values().toArray(new XModelObject[0]);
return super.getChildren(object);
}
17 years