Author: dgolovin Date: 2011-09-09 17:13:37 -0400 (Fri, 09 Sep 2011) New Revision: 34618 Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/MessagePropertyELSegmentImpl.java Removed: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNatureExtension.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/.classpath trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF Log: refactored dependencies for dommon.el.core and common.resref.core Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -52,13 +52,13 @@ import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.IVariable; -import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegmentImpl; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.PositionHolder; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.IResourceBundle; +import org.jboss.tools.jst.web.kb.el.MessagePropertyELSegmentImpl; import org.jboss.tools.jst.web.kb.internal.ResourceBundle; /** @@ -217,7 +217,7 @@ true); // is Final and equal names are because of // we have no more to resolve the parts of expression, // but we have to resolve arguments of probably a message component - if (resolvedVariables != null && !resolvedVariables.isEmpty()) { + if (!resolvedVariables.isEmpty()) { resolution.setLastResolvedToken(left); ELSegmentImpl segment = new MessagePropertyELSegmentImpl(combineLexicalTokensForExpression(left)); Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2011-09-09 21:13:37 UTC (rev 34618) @@ -20,9 +20,12 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="3.7.0", org.eclipse.wst.sse.core;bundle-version="1.1.600", org.eclipse.wst.sse.ui;bundle-version="1.3.0", - org.jboss.tools.common.model, org.jboss.tools.common.resref.core;visibility:=reexport, org.eclipse.ui;bundle-version="3.7.0", - org.eclipse.jdt.ui;bundle-version="3.7.0" + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.jboss.tools.common;bundle-version="3.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -1,139 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010-2011 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.common.el.core.resolver; - -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.swt.graphics.Image; -import org.jboss.tools.common.el.core.ElCoreMessages; -import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine; -import org.jboss.tools.common.el.core.parser.LexicalToken; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.util.FindObjectHelper; -import org.jboss.tools.common.text.ITextSourceReference; - -/** - * @author Daniel Azarov - */ -public class MessagePropertyELSegmentImpl extends ELSegmentImpl implements - MessagePropertyELSegment { - - private IFile messageBundleResource = null; - private ITextSourceReference messagePropertySourceReference = null; - private int propertyStart=0, propertyLength=0; - private String baseName=null; - private boolean isBundle = false; - - private List<XModelObject> objects = new ArrayList<XModelObject>(); - - public MessagePropertyELSegmentImpl(LexicalToken token) { - super(token); - } - - public IFile getMessageBundleResource() { - return messageBundleResource; - } - - public void setMessageBundleResource(IFile resource){ - messageBundleResource = resource; - setResource(resource); - } - - public void setBundleOnlySegment(boolean set) { - isBundle = set; - } - - public boolean isBundle() { - return isBundle; - } - - public boolean isProperty() { - return !isBundle && (messagePropertySourceReference != null); - } - - public ITextSourceReference getMessagePropertySourceReference() { - if(messagePropertySourceReference==null) { - messagePropertySourceReference = new ITextSourceReference() { - public int getStartPosition() { - return propertyStart; - } - public int getLength() { - return propertyLength; - } - public IResource getResource() { - return resource; - } - }; - } - return messagePropertySourceReference; - } - - public void setMessagePropertySourceReference(int start, int lenght) { - propertyStart = start; - propertyLength = lenght; - } - - public String getBaseName(){ - return baseName; - } - - public void setBaseName(String name){ - baseName = name; - } - - public void addObject(XModelObject object) { - objects.add(object); - } - - public IOpenableReference[] getOpenable() { - if(objects != null) { - IOpenableReference[] result = new IOpenableReference[objects.size()]; - for (int i = 0; i < objects.size(); i++) { - final XModelObject o = objects.get(i); - result[i] = new IOpenableReference() { - @Override - public boolean open() { - int q = FindObjectHelper.findModelObject(o, FindObjectHelper.IN_EDITOR_ONLY); - return q < 1; - } - - @Override - public String getLabel() { - XModelObject p = o; - while(p != null && p.getFileType() < XModelObject.FILE) p = p.getParent(); - - // Improve label - add a locale for a resource bundle - String baseName = getBaseName(); - String propertyName = isBundle() ? null : AbstractELCompletionEngine.trimQuotes(getToken().getText()); - if (propertyName == null) - return MessageFormat.format(ElCoreMessages.OpenBundle, baseName); - - return MessageFormat.format(ElCoreMessages.OpenBundleProperty, propertyName, baseName); - - //improve label - now it returns file name, with locale -// return p.getAttributeValue("name"); - } - - @Override - public Image getImage() { - return null; - } - }; - } - return result; - } - return super.getOpenable(); - } -} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -36,7 +36,7 @@ import org.jboss.tools.common.el.core.ELCorePlugin; import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; -import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.common.util.EclipseJavaUtil; import org.jboss.tools.common.util.BeanUtil; /** Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNatureExtension.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNatureExtension.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNatureExtension.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -17,6 +17,14 @@ public ModelNatureExtension() {} + public ModelNatureExtension(String name, String displayName, String pathEncoder, String watcherContributor) { + super(); + this.name = name; + this.displayName = displayName; + this.pathEncoder = pathEncoder; + this.watcherContributor = watcherContributor; + } + public String getName() { return name; } @@ -33,21 +41,24 @@ return watcherContributor; } - static ModelNatureExtension[] INSTANCES; + private static final ModelNatureExtension[] INSTANCES; - public static ModelNatureExtension[] getInstances() { - if(INSTANCES != null) return INSTANCES; + static { List<ModelNatureExtension> list = new ArrayList<ModelNatureExtension>(); IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT); IConfigurationElement[] es = point.getConfigurationElements(); for (IConfigurationElement e: es) { - ModelNatureExtension n = new ModelNatureExtension(); - n.name = e.getAttribute("name"); //$NON-NLS-1$ - n.displayName = e.getAttribute("displayName"); //$NON-NLS-1$ - n.pathEncoder = e.getAttribute("pathEncoder"); //$NON-NLS-1$ - n.watcherContributor = e.getAttribute("watcherContributor"); //$NON-NLS-1$ + ModelNatureExtension n = new ModelNatureExtension( + e.getAttribute("name"), //$NON-NLS-1$ + e.getAttribute("displayName"), //$NON-NLS-1$ + e.getAttribute("pathEncoder"), //$NON-NLS-1$ + e.getAttribute("watcherContributor")); //$NON-NLS-1$ list.add(n); } - return INSTANCES = list.toArray(new ModelNatureExtension[0]); + INSTANCES = list.toArray(new ModelNatureExtension[0]); } + + public static ModelNatureExtension[] getInstances() { + return INSTANCES; + } } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -221,7 +221,7 @@ } } - private static String[] MODEL_NATURES = new String[0]; + private static final String[] MODEL_NATURES; static { ModelNatureExtension[] es = ModelNatureExtension.getInstances(); @@ -1071,7 +1071,6 @@ } public static boolean isJar(String path) { - if(path == null) return false; path = path.toLowerCase(); return path.endsWith(".jar") || path.endsWith(".zip"); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/META-INF/MANIFEST.MF 2011-09-09 21:13:37 UTC (rev 34618) @@ -6,7 +6,8 @@ Bundle-Activator: org.jboss.tools.common.resref.core.ResourceReferencePlugin Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", - org.jboss.tools.common.model + org.jboss.tools.common;bundle-version="3.3.0", + org.eclipse.core.resources;bundle-version="3.7.100" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.common.resref.core Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferenceList.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -20,8 +20,6 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.core.runtime.preferences.InstanceScope; -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.XModelObjectUtil; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; @@ -151,11 +149,11 @@ //Fix for JBIDE-2979 private static String[] decodeResourceString(String resource) { - String[] results = XModelObjectUtil.asStringArray(resource); + String[] results = resource.split("[,;]"); String[] returnValues = new String [results.length]; try { for (int i=0;i<results.length;i++) { - returnValues[i] = URLDecoder.decode(results[i], CODING); + returnValues[i] = URLDecoder.decode(results[i].trim(), CODING); } } catch (UnsupportedEncodingException e) { ResourceReferencePlugin.getPluginLog().logError(e); @@ -165,7 +163,6 @@ return returnValues; } - public void setAllResources(IFile file, ResourceReference[] entries) { IResource changed = null; boolean b = setDeclaredResources(file, entries, ResourceReference.FILE_SCOPE, 0); @@ -266,8 +263,7 @@ * https://jira.jboss.org/jira/browse/JBIDE-3211 * Reading global preferences from instance scope. */ - IScopeContext instanceContext = new InstanceScope(); - Preferences root = instanceContext.getNode(ModelPlugin.PLUGIN_ID); + Preferences root = InstanceScope.INSTANCE.getNode(ResourceReferencePlugin.PREFERENCES_QUALIFIER); if (null != root) { Preferences node = root.node(ResourceReferencePlugin.PLUGIN_ID); s = node.get(getPropertyName().getLocalName(), ""); //$NON-NLS-1$ @@ -284,7 +280,7 @@ */ String old = null; try { - old = ModelPlugin.getWorkspace().getRoot() + old =ResourcesPlugin.getWorkspace().getRoot() .getPersistentProperty(getPropertyName()); } catch (CoreException e) { /* @@ -330,8 +326,8 @@ * ${workspace}\.metadata\.plugins\org.eclipse.core.runtime\ * .settings\org.jboss.tools.common.model.prefs */ - IScopeContext instanceContext = new InstanceScope(); - Preferences root = instanceContext.getNode(ModelPlugin.PLUGIN_ID); + + Preferences root = InstanceScope.INSTANCE.getNode(ResourceReferencePlugin.PREFERENCES_QUALIFIER); if (null != root) { Preferences node = root.node(ResourceReferencePlugin.PLUGIN_ID); node.put(getPropertyName().getLocalName(), sb.toString()); Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -11,6 +11,7 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.common.resref.core"; //$NON-NLS-1$ + public static final String PREFERENCES_QUALIFIER = "org.jboss.tools.common.model"; //$NON-NLS-1$ // The shared instance private static ResourceReferencePlugin plugin; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -40,7 +40,6 @@ import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.IVariable; -import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegmentImpl; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; @@ -55,6 +54,7 @@ import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.IResourceBundle; import org.jboss.tools.jst.web.kb.PageContextFactory; +import org.jboss.tools.jst.web.kb.el.MessagePropertyELSegmentImpl; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.w3c.dom.Attr; import org.w3c.dom.Document; Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/refactoring/MessagePropertyRefactoringTest.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -8,9 +8,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.common.el.core.parser.LexicalToken; -import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegmentImpl; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jsf.el.refactoring.RenameMessagePropertyProcessor; +import org.jboss.tools.jst.web.kb.el.MessagePropertyELSegmentImpl; import org.jboss.tools.test.util.ProjectImportTestSetup; import org.jboss.tools.tests.AbstractRefactorTest; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/.classpath =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/.classpath 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/.classpath 2011-09-09 21:13:37 UTC (rev 34618) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="resources"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="resources"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs 2011-09-09 21:13:37 UTC (rev 34618) @@ -1,9 +1,9 @@ -#Fri May 15 15:20:06 MSD 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.source=1.5 +#Thu Sep 08 16:44:25 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-09-09 20:47:09 UTC (rev 34617) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2011-09-09 21:13:37 UTC (rev 34618) @@ -30,7 +30,7 @@ org.eclipse.jst.j2ee;bundle-version="1.1.500", org.jboss.tools.common.validation Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %providerName Export-Package: org.jboss.tools.jst.web.kb, org.jboss.tools.jst.web.kb.action, Copied: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/MessagePropertyELSegmentImpl.java (from rev 34585, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java) =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/MessagePropertyELSegmentImpl.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/MessagePropertyELSegmentImpl.java 2011-09-09 21:13:37 UTC (rev 34618) @@ -0,0 +1,142 @@ +/******************************************************************************* + * Copyright (c) 2010-2011 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.jst.web.kb.el; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.common.el.core.ElCoreMessages; +import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine; +import org.jboss.tools.common.el.core.parser.LexicalToken; +import org.jboss.tools.common.el.core.resolver.ELSegmentImpl; +import org.jboss.tools.common.el.core.resolver.IOpenableReference; +import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.FindObjectHelper; +import org.jboss.tools.common.text.ITextSourceReference; + +/** + * @author Daniel Azarov + */ +public class MessagePropertyELSegmentImpl extends ELSegmentImpl implements + MessagePropertyELSegment { + + private IFile messageBundleResource = null; + private ITextSourceReference messagePropertySourceReference = null; + private int propertyStart=0, propertyLength=0; + private String baseName=null; + private boolean isBundle = false; + + private List<XModelObject> objects = new ArrayList<XModelObject>(); + + public MessagePropertyELSegmentImpl(LexicalToken token) { + super(token); + } + + public IFile getMessageBundleResource() { + return messageBundleResource; + } + + public void setMessageBundleResource(IFile resource){ + messageBundleResource = resource; + setResource(resource); + } + + public void setBundleOnlySegment(boolean set) { + isBundle = set; + } + + public boolean isBundle() { + return isBundle; + } + + public boolean isProperty() { + return !isBundle && (messagePropertySourceReference != null); + } + + public ITextSourceReference getMessagePropertySourceReference() { + if(messagePropertySourceReference==null) { + messagePropertySourceReference = new ITextSourceReference() { + public int getStartPosition() { + return propertyStart; + } + public int getLength() { + return propertyLength; + } + public IResource getResource() { + return resource; + } + }; + } + return messagePropertySourceReference; + } + + public void setMessagePropertySourceReference(int start, int lenght) { + propertyStart = start; + propertyLength = lenght; + } + + public String getBaseName(){ + return baseName; + } + + public void setBaseName(String name){ + baseName = name; + } + + public void addObject(XModelObject object) { + objects.add(object); + } + + public IOpenableReference[] getOpenable() { + if(objects != null) { + IOpenableReference[] result = new IOpenableReference[objects.size()]; + for (int i = 0; i < objects.size(); i++) { + final XModelObject o = objects.get(i); + result[i] = new IOpenableReference() { + @Override + public boolean open() { + int q = FindObjectHelper.findModelObject(o, FindObjectHelper.IN_EDITOR_ONLY); + return q < 1; + } + + @Override + public String getLabel() { + XModelObject p = o; + while(p != null && p.getFileType() < XModelObject.FILE) p = p.getParent(); + + // Improve label - add a locale for a resource bundle + String baseName = getBaseName(); + String propertyName = isBundle() ? null : AbstractELCompletionEngine.trimQuotes(getToken().getText()); + if (propertyName == null) + return MessageFormat.format(ElCoreMessages.OpenBundle, baseName); + + return MessageFormat.format(ElCoreMessages.OpenBundleProperty, propertyName, baseName); + + //improve label - now it returns file name, with locale +// return p.getAttributeValue("name"); + } + + @Override + public Image getImage() { + return null; + } + }; + } + return result; + } + return super.getOpenable(); + } +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/MessagePropertyELSegmentImpl.java ___________________________________________________________________ Added: svn:mime-type + text/plain