JBoss Tools SVN: r33214 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-26 17:58:09 -0400 (Tue, 26 Jul 2011)
New Revision: 33214
Modified:
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
Log:
updated for brew
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-07-26 21:48:24 UTC (rev 33213)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-07-26 21:58:09 UTC (rev 33214)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
-<pubsnumber>4</pubsnumber>
+<pubsnumber>5</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
14 years, 5 months
JBoss Tools SVN: r33213 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-26 17:48:24 -0400 (Tue, 26 Jul 2011)
New Revision: 33213
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
Log:
https://issues.jboss.org/browse/JBIDE-9390
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java 2011-07-26 21:21:08 UTC (rev 33212)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/MultipleHyperlinkPresenter.java 2011-07-26 21:48:24 UTC (rev 33213)
@@ -369,6 +369,15 @@
private Display fDisplay;
private IInformationControl fControl;
private Rectangle fSubjectArea;
+ private long startTime;
+
+ public Closer(){
+ startTime = System.currentTimeMillis();
+ }
+
+ private boolean isItTime(){
+ return System.currentTimeMillis() - startTime > 500;
+ }
/*
* @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setInformationControl(org.eclipse.jface.text.IInformationControl)
@@ -419,7 +428,7 @@
public void handleEvent(Event event) {
switch (event.type) {
case SWT.FocusOut:
- if (!fControl.isFocusControl())
+ if (isItTime() && !fControl.isFocusControl())
disposeInformationControl();
break;
case SWT.MouseMove:
14 years, 5 months
JBoss Tools SVN: r33212 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 17:21:08 -0400 (Tue, 26 Jul 2011)
New Revision: 33212
Modified:
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-26 21:20:37 UTC (rev 33211)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-26 21:21:08 UTC (rev 33212)
@@ -90,16 +90,7 @@
}
if(segment instanceof JavaMemberELSegment){
- try {
- if(JavaUI.openInEditor(((JavaMemberELSegment) segment).getJavaElement()) == null){
- openFileFailed();
- }
- } catch (PartInitException e) {
- JSTExtensionsPlugin.getDefault().logError(e);
- } catch (JavaModelException e) {
- JSTExtensionsPlugin.getDefault().logError(e);
- }
- return;
+ //should not be here, Java case implements getOpenable().
}else if(segment instanceof MessagePropertyELSegment){
IFile file = ((MessagePropertyELSegment)segment).getMessageBundleResource();
if(file == null)
14 years, 5 months
JBoss Tools SVN: r33211 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 17:20:37 -0400 (Tue, 26 Jul 2011)
New Revision: 33211
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-26 19:15:35 UTC (rev 33210)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-26 21:20:37 UTC (rev 33211)
@@ -17,6 +17,10 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.PartInitException;
+import org.jboss.tools.common.CommonPlugin;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.parser.LexicalToken;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
@@ -158,4 +162,35 @@
public void clearUnpairedGettersOrSetters() {
getUnpairedGettersOrSetters().clear();
}
+
+ public IOpenableReference[] getOpenable() {
+ if(getJavaElement() != null && getJavaElement().exists()) {
+ IOpenableReference openable = new IOpenableReference() {
+ @Override
+ public boolean open() {
+ try {
+ return JavaUI.openInEditor(getJavaElement()) != null;
+ } catch (PartInitException e) {
+ CommonPlugin.getDefault().logError(e);
+ } catch (JavaModelException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
+ return false;
+ }
+
+ @Override
+ public String getLabel() {
+ return getJavaElement().getElementName();
+ }
+
+ @Override
+ public Image getImage() {
+ return null;
+ }
+ };
+ return new IOpenableReference[]{openable};
+ }
+ return new IOpenableReference[0];
+ }
+
}
\ No newline at end of file
14 years, 5 months
JBoss Tools SVN: r33210 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 15:15:35 -0400 (Tue, 26 Jul 2011)
New Revision: 33210
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java 2011-07-26 19:14:07 UTC (rev 33209)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java 2011-07-26 19:15:35 UTC (rev 33210)
@@ -227,10 +227,12 @@
public void selectModelObject(XModelObject object) {
String text = getText();
- String name = object.getAttributeValue("dirtyname"); //$NON-NLS-1$
+ String name = object.getAttributeValue("name"); //$NON-NLS-1$
+ String dname = object.getAttributeValue("dirtyname"); //$NON-NLS-1$
String nvs = object.getAttributeValue("name-value-separator"); //$NON-NLS-1$
- int i = text.indexOf(name + nvs);
+ int i = text.indexOf(dname + nvs);
if(i < 0) return;
+ i = text.indexOf(name, i);
int j = text.indexOf('\n', i);
if(j < 0) j = text.length();
selectAndReveal(i, j - i);
14 years, 5 months
JBoss Tools SVN: r33209 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 15:14:07 -0400 (Tue, 26 Jul 2011)
New Revision: 33209
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java 2011-07-26 18:54:11 UTC (rev 33208)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/PositionSearcher.java 2011-07-26 19:14:07 UTC (rev 33209)
@@ -15,6 +15,7 @@
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.loaders.XObjectLoader;
+import org.jboss.tools.common.model.loaders.impl.PropertiesLoader;
import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader;
/**
@@ -39,6 +40,7 @@
int endPosition;
boolean selectAttributeName = false;
XModelObjectLoaderUtil util;
+ PropertiesLoader propertiesLoader = null;
public PositionSearcher() {}
@@ -60,6 +62,8 @@
SimpleWebFileLoader fileLoader = (SimpleWebFileLoader)loader;
fileLoader.createRootElement(f); // initializes namespaces if available.
util = fileLoader.getUtil();
+ } else if(loader instanceof PropertiesLoader) {
+ propertiesLoader = (PropertiesLoader)loader;
}
}
@@ -69,13 +73,26 @@
startPosition = -1;
endPosition = -1;
if(text == null || object == null) return;
- TagIterator it = new TagIterator();
- it.selectObject(object);
- if(it.startPos < 0 || it.endPos < it.startPos) return;
- startPosition = it.startPos;
- endPosition = it.endPos;
+ if(propertiesLoader != null) {
+ String name = object.getAttributeValue("name"); //$NON-NLS-1$
+ String dname = object.getAttributeValue("dirtyname"); //$NON-NLS-1$
+ String nvs = object.getAttributeValue("name-value-separator"); //$NON-NLS-1$
+ int i = text.indexOf(dname + nvs);
+ if(i >= 0) {
+ i = text.indexOf(name, i);
+ startPosition = i;
+ endPosition = i + name.length();
+ }
+
+ } else {
+ TagIterator it = new TagIterator();
+ it.selectObject(object);
+ if(it.startPos < 0 || it.endPos < it.startPos) return;
+ startPosition = it.startPos;
+ endPosition = it.endPos;
/// findTagEnd();
- selectAttribute();
+ selectAttribute();
+ }
}
private void selectAttribute() {
14 years, 5 months
JBoss Tools SVN: r33208 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 14:54:11 -0400 (Tue, 26 Jul 2011)
New Revision: 33208
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java 2011-07-26 18:41:11 UTC (rev 33207)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/PropertiesTextEditorComponent.java 2011-07-26 18:54:11 UTC (rev 33208)
@@ -227,7 +227,7 @@
public void selectModelObject(XModelObject object) {
String text = getText();
- String name = object.getAttributeValue("name"); //$NON-NLS-1$
+ String name = object.getAttributeValue("dirtyname"); //$NON-NLS-1$
String nvs = object.getAttributeValue("name-value-separator"); //$NON-NLS-1$
int i = text.indexOf(name + nvs);
if(i < 0) return;
14 years, 5 months
JBoss Tools SVN: r33207 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 14:41:11 -0400 (Tue, 26 Jul 2011)
New Revision: 33207
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java
Log:
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java 2011-07-26 18:40:50 UTC (rev 33206)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java 2011-07-26 18:41:11 UTC (rev 33207)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.core.international.impl;
-import org.eclipse.swt.internal.gtk.XClientMessageEvent;
import org.jboss.tools.cdi.seam.core.international.ILocalizedValue;
import org.jboss.tools.common.model.XModelObject;
14 years, 5 months
JBoss Tools SVN: r33206 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international: impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 14:40:50 -0400 (Tue, 26 Jul 2011)
New Revision: 33206
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/impl/BundleImpl.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/PropertyImpl.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
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-07-26 18:40:34 UTC (rev 33205)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2011-07-26 18:40:50 UTC (rev 33206)
@@ -21,7 +21,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
@@ -32,7 +31,9 @@
import org.jboss.tools.cdi.seam.core.international.IBundle;
import org.jboss.tools.cdi.seam.core.international.IBundleModel;
import org.jboss.tools.cdi.seam.core.international.IProperty;
+import org.jboss.tools.cdi.seam.core.international.impl.BundleImpl;
import org.jboss.tools.cdi.seam.core.international.impl.LocalizedValue;
+import org.jboss.tools.cdi.seam.core.international.impl.PropertyImpl;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
import org.jboss.tools.common.el.core.model.ELExpression;
@@ -54,8 +55,8 @@
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.common.util.FileUtil;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.IResourceBundle;
import org.jboss.tools.jst.web.kb.internal.ResourceBundle;
@@ -492,6 +493,15 @@
return;
segment.setBaseName(variable.basename);
segment.setBundleOnlySegment(true);
+
+ IBundle bundle = bundleModel.getBundle(variable.basename);
+ if(bundle == null)
+ continue;
+ Map<String, XModelObject> os = ((BundleImpl)bundle).getObjects();
+ for (XModelObject o: os.values()) {
+ segment.addObject(o);
+ }
+
}
}
}
@@ -523,30 +533,24 @@
if(bundle == null)
return;
- Set<String> properties = bundle.getPropertyNames();
+ String propertyName = segment.getToken().getText();
- for (String propertyName : properties) {
- IProperty prop = bundle.getProperty(propertyName);
- if(prop == null) continue;
-
- LocalizedValue value = (LocalizedValue)prop.getValue();
+ IProperty prop = bundle.getProperty(propertyName);
+ if(prop == null) continue;
+ Map<String, LocalizedValue> values = ((PropertyImpl)prop).getValues();
+ for (LocalizedValue value: values.values()) {
XModelObject p = value.getObject();
+ segment.addObject(p);
+ segment.setBaseName(variable.basename);
+ PositionHolder h = PositionHolder.getPosition(p, null);
+ h.update();
+ segment.setMessagePropertySourceReference(h.getStart(), prop.getName().length());
+
IFile propFile = (IFile)p.getAdapter(IFile.class);
if(propFile == null)
continue;
segment.setMessageBundleResource(propFile);
- XModelObject property = p;
- if(property != null){
- try {
- String content = FileUtil.readStream(propFile);
- if(findPropertyLocation(property, content, segment)){
- segment.setBaseName(variable.basename);
- }
- } catch (CoreException e) {
- log(e);
- }
- }
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/BundleImpl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/BundleImpl.java 2011-07-26 18:40:34 UTC (rev 33205)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/BundleImpl.java 2011-07-26 18:40:50 UTC (rev 33206)
@@ -14,6 +14,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import org.jboss.tools.cdi.seam.core.international.IBundle;
import org.jboss.tools.cdi.seam.core.international.IProperty;
@@ -26,7 +27,7 @@
*/
public class BundleImpl implements IBundle {
String name = "";
- Set<XModelObject> objects = new HashSet<XModelObject>();
+ Map<String, XModelObject> objects = new TreeMap<String, XModelObject>();
Map<String, PropertyImpl> properties = null;
public BundleImpl() {}
@@ -49,7 +50,7 @@
public void initProperties() {
if(properties == null) {
Map<String, PropertyImpl> ps = new HashMap<String, PropertyImpl>();
- for (XModelObject o: objects) {
+ for (XModelObject o: objects.values()) {
XModelObject[] os = o.getChildren();
for (XModelObject p: os) {
String name = p.getAttributeValue("name");
@@ -62,7 +63,7 @@
}
public void addObject(XModelObject o) {
- objects.add(o);
+ objects.put(LocalizedValue.getLocale(o), o);
}
public IProperty getProperty(String name) {
@@ -81,4 +82,11 @@
return p;
}
+ /*
+ * Returns file objects sorted by locales.
+ */
+ public Map<String, XModelObject> getObjects() {
+ return objects;
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java 2011-07-26 18:40:34 UTC (rev 33205)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/LocalizedValue.java 2011-07-26 18:40:50 UTC (rev 33206)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.core.international.impl;
+import org.eclipse.swt.internal.gtk.XClientMessageEvent;
import org.jboss.tools.cdi.seam.core.international.ILocalizedValue;
import org.jboss.tools.common.model.XModelObject;
@@ -34,13 +35,22 @@
public void setObject(XModelObject object) {
this.object = object;
- String n = object.getParent().getAttributeValue("name");
- int i = n.indexOf('_');
- if(i >= 0) locale = n.substring(i + 1);
+ locale = getLocale(object);
}
public XModelObject getObject() {
return object;
}
+ public static String getLocale(XModelObject object) {
+ XModelObject p = object;
+ while(p != null && p.getFileType() < XModelObject.FILE) p = p.getParent();
+ if(p != null) {
+ String n = p.getAttributeValue("name");
+ int i = n.indexOf('_');
+ if(i >= 0) return n.substring(i + 1);
+ }
+ return "";
+ }
+
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/PropertyImpl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/PropertyImpl.java 2011-07-26 18:40:34 UTC (rev 33205)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/impl/PropertyImpl.java 2011-07-26 18:40:50 UTC (rev 33206)
@@ -12,6 +12,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.TreeMap;
import org.jboss.tools.cdi.seam.core.international.IBundle;
import org.jboss.tools.cdi.seam.core.international.ILocalizedValue;
@@ -26,7 +27,7 @@
public class PropertyImpl implements IProperty {
String name;
BundleImpl bundle;
- Map<String, LocalizedValue> values = new HashMap<String, LocalizedValue>();
+ Map<String, LocalizedValue> values = new TreeMap<String, LocalizedValue>();
@Override
public IBundle getBundle() {
@@ -60,6 +61,10 @@
return values.get(locale);
}
+ public Map<String, LocalizedValue> getValues() {
+ return values;
+ }
+
public void addObject(XModelObject o) {
LocalizedValue value = new LocalizedValue();
value.setObject(o);
14 years, 5 months
JBoss Tools SVN: r33205 - trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-26 14:40:34 -0400 (Tue, 26 Jul 2011)
New Revision: 33205
Modified:
trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
Log:
JBIDE-9087
https://issues.jboss.org/browse/JBIDE-9087
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-26 17:41:35 UTC (rev 33204)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-26 18:40:34 UTC (rev 33205)
@@ -82,7 +82,9 @@
IOpenableReference[] openables = segment.getOpenable();
if(openables.length > 0) {
- openables[0].open();
+ if(!openables[0].open()) {
+ openFileFailed();
+ }
//If openables.length > 1 - show menu.
return;
}
14 years, 5 months