JBoss Tools SVN: r20058 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-02-01 12:08:23 -0500 (Mon, 01 Feb 2010)
New Revision: 20058
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3125
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-02-01 17:07:39 UTC (rev 20057)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-02-01 17:08:23 UTC (rev 20058)
@@ -20,4 +20,6 @@
}
public static String INJECTION_POINT_LABEL_PROVIDER;
+ public static String CDI_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL;
+ public static String CDI_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-02-01 17:07:39 UTC (rev 20057)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-02-01 17:08:23 UTC (rev 20058)
@@ -9,4 +9,6 @@
### Red Hat, Inc. - initial API and implementation
##################################################################################
-INJECTION_POINT_LABEL_PROVIDER=Injected class
\ No newline at end of file
+INJECTION_POINT_LABEL_PROVIDER=Injected class
+CDI_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=Base url for image registry cannot be null.
+CDI_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL=Image name cannot be null.
\ No newline at end of file
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java 2010-02-01 17:08:23 UTC (rev 20058)
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+
+public class CDIUiImages {
+
+ private static CDIUiImages INSTANCE;
+
+ static {
+ try {
+ INSTANCE = new CDIUiImages(new URL(CDIUIPlugin.getDefault().getBundle().getEntry("/"), "icons/")); //$NON-NLS-1$ //$NON-NLS-2$
+ } catch (MalformedURLException e) {
+ CDIUIPlugin.getDefault().logError(e);
+ }
+ }
+
+ public static final Image CDI_BEAN_IMAGE = getImage("search/cdi_bean.gif"); //$NON-NLS-1$
+ public static final Image WELD_IMAGE = getImage("search/weld_icon_16x.gif"); //$NON-NLS-1$
+
+
+
+ public static Image getImage(String key) {
+ return INSTANCE.createImageDescriptor(key).createImage();
+ }
+
+ public static ImageDescriptor getImageDescriptor(String key) {
+ return INSTANCE.createImageDescriptor(key);
+ }
+
+ public static void setImageDescriptors(IAction action, String iconName) {
+ action.setImageDescriptor(INSTANCE.createImageDescriptor(iconName));
+ }
+
+ public static CDIUiImages getInstance() {
+ return INSTANCE;
+ }
+
+ private URL baseUrl;
+ private CDIUiImages parentRegistry;
+
+ protected CDIUiImages(URL registryUrl, CDIUiImages parent){
+
+ if(registryUrl == null) throw new IllegalArgumentException(CDIUIMessages.CDI_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL);
+ baseUrl = registryUrl;
+ parentRegistry = parent;
+ }
+
+ protected CDIUiImages(URL url){
+ this(url,null);
+ }
+
+ public Image getImageByFileName(String key) {
+ return createImageDescriptor(key).createImage();
+ }
+
+ public ImageDescriptor createImageDescriptor(String key) {
+ try {
+ return ImageDescriptor.createFromURL(makeIconFileURL(key));
+ } catch (MalformedURLException e) {
+ if(parentRegistry == null) {
+ return ImageDescriptor.getMissingImageDescriptor();
+ } else {
+ return parentRegistry.createImageDescriptor(key);
+ }
+
+ }
+ }
+
+ private URL makeIconFileURL(String name) throws MalformedURLException {
+ if (name == null) throw new MalformedURLException(CDIUIMessages.CDI_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL);
+ return new URL(baseUrl, name);
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2010-02-01 17:07:39 UTC (rev 20057)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2010-02-01 17:08:23 UTC (rev 20058)
@@ -10,18 +10,18 @@
******************************************************************************/
package org.jboss.tools.cdi.ui.search;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.ui.CDIUIMessages;
+import org.jboss.tools.cdi.ui.CDIUiImages;
public class InjectionPointLabelProvider implements ILabelProvider {
public Image getImage(Object element) {
- return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
+ //return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
+ return CDIUiImages.WELD_IMAGE;
}
public String getText(Object element) {
14 years, 3 months
JBoss Tools SVN: r20057 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons: search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-02-01 12:07:39 -0500 (Mon, 01 Feb 2010)
New Revision: 20057
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/cdi_bean.gif
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/weld_icon_16x.gif
Log:
https://jira.jboss.org/jira/browse/JBIDE-3125
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/cdi_bean.gif
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/cdi_bean.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/weld_icon_16x.gif
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/search/weld_icon_16x.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 3 months
JBoss Tools SVN: r20056 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-02-01 11:41:06 -0500 (Mon, 01 Feb 2010)
New Revision: 20056
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java
Log:
Fixed junit 3280 failure.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java 2010-02-01 16:24:38 UTC (rev 20055)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesChecker.java 2010-02-01 16:41:06 UTC (rev 20056)
@@ -77,7 +77,6 @@
return;
}
addProject(project);
- KbProject.checkKBBuilderInstalled(project);
boolean isJSFCheck = true;
boolean isNaturesCheck = true;
updateProjectPersistentProperties(project);
@@ -89,6 +88,7 @@
if (isNaturesCheck) {
String[] missingNatures = getMissingNatures(project);
if (missingNatures != null) {
+ KbProject.checkKBBuilderInstalled(project);
ProjectNaturesInfoDialog dialog = new ProjectNaturesInfoDialog(
missingNatures, project);
dialog.open();
@@ -196,5 +196,5 @@
}
}
}
-
+
}
14 years, 3 months
JBoss Tools SVN: r20055 - in trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools: smooks/model/freemarker/impl and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-02-01 11:24:38 -0500 (Mon, 01 Feb 2010)
New Revision: 20055
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
Log:
OPEN - issue JBIDE-5774: Externalize strings in org.jboss.tools.smooks.core and .ui
https://jira.jboss.org/jira/browse/JBIDE-5774
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/calc/impl/CalcFactoryImpl.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -129,7 +129,7 @@
*/
public CountDirection createCountDirectionFromString(EDataType eDataType, String initialValue) {
CountDirection result = CountDirection.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.CalcFactoryImpl_Error_Invalid_Enumerator + initialValue + Messages.CalcFactoryImpl_Error_Invalid_Enumerator2 + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.CalcFactoryImpl_Error_Invalid_Enumerator + initialValue + Messages.CalcFactoryImpl_Error_Invalid_Enumerator2 + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/freemarker/impl/FreemarkerFactoryImpl.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -184,7 +184,7 @@
*/
public InlineDirective createInlineDirectiveFromString(EDataType eDataType, String initialValue) {
InlineDirective result = InlineDirective.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.FreemarkerFactoryImpl_Error_Value_Not_Valid + initialValue + Messages.FreemarkerFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.FreemarkerFactoryImpl_Error_Value_Not_Valid + initialValue + Messages.FreemarkerFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting/impl/JmsroutingFactoryImpl.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -209,7 +209,7 @@
*/
public AcknowledgeMode createAcknowledgeModeFromString(EDataType eDataType, String initialValue) {
AcknowledgeMode result = AcknowledgeMode.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue + Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue + Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -229,7 +229,7 @@
*/
public DeliveryMode createDeliveryModeFromString(EDataType eDataType, String initialValue) {
DeliveryMode result = DeliveryMode.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue + Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue + Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -249,7 +249,7 @@
*/
public MessageType createMessageTypeFromString(EDataType eDataType, String initialValue) {
MessageType result = MessageType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue + Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.JmsroutingFactoryImpl_Error_Value + initialValue + Messages.JmsroutingFactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/jmsrouting12/impl/Jmsrouting12FactoryImpl.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -197,7 +197,7 @@
*/
public AcknowledgeMode createAcknowledgeModeFromString(EDataType eDataType, String initialValue) {
AcknowledgeMode result = AcknowledgeMode.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue + Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue + Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -217,7 +217,7 @@
*/
public DeliveryMode createDeliveryModeFromString(EDataType eDataType, String initialValue) {
DeliveryMode result = DeliveryMode.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue + Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue + Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -237,7 +237,7 @@
*/
public MessageType createMessageTypeFromString(EDataType eDataType, String initialValue) {
MessageType result = MessageType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue + Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.Jmsrouting12FactoryImpl_Error_Value + initialValue + Messages.Jmsrouting12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/persistence12/impl/Persistence12FactoryImpl.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -233,7 +233,7 @@
*/
public OnNoResult createOnNoResultFromString(EDataType eDataType, String initialValue) {
OnNoResult result = OnNoResult.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue + Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue + Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
@@ -253,7 +253,7 @@
*/
public ParameterType createParameterTypeFromString(EDataType eDataType, String initialValue) {
ParameterType result = ParameterType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue + Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.Persistence12FactoryImpl_Error_Value + initialValue + Messages.Persistence12FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/validation10/impl/Validation10FactoryImpl.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -126,7 +126,7 @@
*/
public OnFail createOnFailFromString(EDataType eDataType, String initialValue) {
OnFail result = OnFail.get(initialValue);
- if (result == null) throw new IllegalArgumentException(Messages.Validation10FactoryImpl_Error_Value_Not_Valid + initialValue + Messages.Validation10FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$
+ if (result == null) throw new IllegalArgumentException(Messages.Validation10FactoryImpl_Error_Value_Not_Valid + initialValue + Messages.Validation10FactoryImpl_Error_Not_Valid_Enumerator + eDataType.getName() + "'"); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
return result;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-02-01 16:15:50 UTC (rev 20054)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-02-01 16:24:38 UTC (rev 20055)
@@ -56,15 +56,15 @@
public static final String KEY_OBJECT_ID = "id"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_TYPE = "modelSrcType";
+ public static final String KEY_XML_FILE_TYPE = "modelSrcType"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_PATH = "modelSrc";
+ public static final String KEY_XML_FILE_PATH = "modelSrc"; //$NON-NLS-1$
- public static final String KEY_XML_ROOT_NAME = "rootElementName";
+ public static final String KEY_XML_ROOT_NAME = "rootElementName"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_TYPE_XSD = "XSD";
+ public static final String KEY_XML_FILE_TYPE_XSD = "XSD"; //$NON-NLS-1$
- public static final String KEY_XML_FILE_TYPE_XML = "XML";
+ public static final String KEY_XML_FILE_TYPE_XML = "XML"; //$NON-NLS-1$
public static final String KEY_CSV_SEPERATOR = "seperator"; //$NON-NLS-1$
@@ -618,7 +618,7 @@
if (typeParam != null) {
String value = typeParam.getStringValue();
if (value != null) {
- return value.equals("true");
+ return value.equals("true"); //$NON-NLS-1$
}
}
14 years, 3 months
JBoss Tools SVN: r20054 - trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-02-01 11:15:50 -0500 (Mon, 01 Feb 2010)
New Revision: 20054
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5772
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2010-02-01 16:08:20 UTC (rev 20053)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2010-02-01 16:15:50 UTC (rev 20054)
@@ -254,7 +254,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity
- ImplementationLoadingClass="org.jboss.tools.seam.xml.components.model.SeamComponentsFileLoader"
+ ImplementationLoadingClass="org.jboss.tools.cdi.xml.beans.model.CDIBeansFileLoader"
ImplementingClass="org.jboss.tools.cdi.xml.beans.model.FileCDIBeansImpl"
ObjectEditorClass="%XML%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.cdi.xml.ui.editor.form.CDIXMLFormLayoutData"
@@ -266,7 +266,7 @@
</XChildrenEntities>
<XEntityRenderer>
<ICONS>
- <ICON info="main.seam.file" type="main"/>
+ <ICON info="main.cdi.file" type="main"/>
</ICONS>
</XEntityRenderer>
<XModelAttributes>
@@ -345,7 +345,7 @@
</XActionItem>
<XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
<XActionItem BaseActionName="Delete"
- HandlerClassName="org.jboss.tools.jsf.model.handlers.DeleteFacesConfigHandler"
+ HandlerClassName="%DeleteFile%"
ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
</XActionItem>
<XActionItem ICON="action.empty" kind="list" name="Properties">
@@ -354,7 +354,7 @@
</XActionItem>
<XActionItem kind="list" name="DiscardActions">
<XActionItem HIDE="always"
- HandlerClassName="org.jboss.tools.jsf.model.handlers.DiscardConfigHandler"
+ HandlerClassName="org.jboss.tools.common.model.filesystems.impl.DiscardFileHandler"
ICON="action.delete"
PROPERTIES="significanceMessageClass=org.jboss.tools.common.model.filesystems.impl.DiscardFileSignificanceMessage"
displayName="Discard Changes" kind="action" name="Discard"/>
@@ -367,9 +367,9 @@
<XEntityRenderer/>
<XModelAttributes/>
<XActionItem kind="list">
- <XActionItemReference entity="FileSeamComponents20"
+ <XActionItemReference entity="FileCDIBeans"
name="CreateActions" path="CreateActions"/>
- <XActionItemReference entity="FileSeamComponents20" name="Properties" path="Properties"/>
+ <XActionItemReference entity="FileCDIBeans" name="Properties" path="Properties"/>
<XActionItem kind="list" name="VerifyActions">
<XActionItem kind="list" name="StaticActions"/>
</XActionItem>
14 years, 3 months
JBoss Tools SVN: r20053 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfLocales and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-02-01 11:08:20 -0500 (Mon, 01 Feb 2010)
New Revision: 20053
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.project
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_de.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_GB.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_US.properties
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LChangeRefresh.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LOneLoadBundle.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LSeveral.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/Lattr.jsp
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5218, JUnits for f:view locale were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.classpath 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_16">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/.project 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jsfLocales</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages.properties 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,3 @@
+header=Hello! (Default)
+prompt_message=Name: (Default)
+hello_message=Hello (Default)
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_de.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_de.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_de.properties 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,3 @@
+header=German Hello Demo Application
+prompt_message=German Name:
+hello_message=German Hello
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_GB.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_GB.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_GB.properties 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,3 @@
+header=Great Britain Hello!
+prompt_message=Great Britain Name:
+hello_message=Great Britain Hello
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_US.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_US.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/JavaSource/demo/Messages_en_US.properties 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,3 @@
+header=US Hello Demo Application
+prompt_message=US Name:
+hello_message=US Hello
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/META-INF/MANIFEST.MF 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/faces-config.xml 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+</faces-config>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/WEB-INF/web.xml 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jsfLocales</display-name>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LChangeRefresh.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LChangeRefresh.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LChangeRefresh.jsp 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,20 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<f:loadBundle var="Message" basename="demo.Messages"/>
+
+<html>
+<head>
+<title>
+(Locale: 3) Test change locale and refresh
+</title>
+</head>
+
+<body>
+<f:view locale="de">
+<h:outputText value="locale=de"/><br></br>
+<div id="localeText">#{Message.hello_message}</div>
+</f:view>
+</body>
+
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LOneLoadBundle.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LOneLoadBundle.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LOneLoadBundle.jsp 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,41 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<f:loadBundle var="Message" basename="demo.Messages"/>
+
+<html>
+<head>
+<title>
+(Locale: 4) Test locales with single f:loadBundle
+</title>
+</head>
+<body>
+
+<f:view>
+<h:outputText value="local=default"/><br></br>
+<div id="localeText0">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="en">
+<h:outputText value="locale=en"/><br></br>
+<div id="localeText1">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="de">
+<h:outputText value="locale=de"/><br></br>
+<div id="localeText2">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="en">
+<h:outputText value="locale=empty"/><br></br>
+<div id="localeText3">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="en_GB">
+<h:outputText value="locale=en_GB"/><br></br>
+<div id="localeText">#{Message.hello_message}</div>
+</f:view>
+
+</body>
+
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LSeveral.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LSeveral.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/LSeveral.jsp 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,44 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<f:loadBundle var="Message" basename="demo.Messages"/>
+
+<html>
+<head>
+<title>
+(Locale: 2) Test locale for several f:views
+</title>
+</head>
+<body>
+<f:view>
+<h:outputText value="local=default"/><br></br>
+<div id="localeText0">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="en">
+<f:loadBundle var="Message" basename="demo.Messages"/>
+<h:outputText value="locale=en"/><br></br>
+<div id="localeText1">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="de">
+<f:loadBundle var="Message" basename="demo.Messages"/>
+<h:outputText value="locale=de"/><br></br>
+<div id="localeText2">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="en">
+<f:loadBundle var="Message" basename="demo.Messages"/>
+<h:outputText value="locale=empty"/><br></br>
+<div id="localeText3">#{Message.hello_message}</div>
+</f:view>
+
+<f:view locale="en_GB">
+<f:loadBundle var="Message" basename="demo.Messages"/>
+<h:outputText value="locale=en_GB"/><br></br>
+<div id="localeText">#{Message.hello_message}</div>
+</f:view>
+
+</body>
+
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/Lattr.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/Lattr.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfLocales/WebContent/pages/Lattr.jsp 2010-02-01 16:08:20 UTC (rev 20053)
@@ -0,0 +1,19 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<html>
+<head>
+<title>
+(Locale: 1) Test locale attribute for f:view
+</title>
+</head>
+
+<body>
+<f:view locale="de">
+<f:loadBundle var="Message" basename="demo.Messages"/>
+<h:outputText value="locale=de"/><br></br>
+<div id="localeText">#{Message.hello_message}</div>
+</f:view>
+</body>
+
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-01 14:43:12 UTC (rev 20052)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-02-01 16:08:20 UTC (rev 20053)
@@ -112,6 +112,7 @@
public static final String IMPORT_JBIDE3247_PROJECT_NAME = "JBIDE3247"; //$NON-NLS-1$
public static final String IMPORT_I18N_PROJECT_NAME = "i18nTest"; //$NON-NLS-1$
public static final String IMPORT_NATURES_CHECKER_PROJECT = "naturesCheckTest"; //$NON-NLS-1$
+ public static final String IMPORT_JSF_LOCALES_PROJECT_NAME = "jsfLocales"; //$NON-NLS-1$
public static Test suite() {
@@ -234,6 +235,11 @@
naturesCheckTestProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
projectToImport.add(naturesCheckTestProject);
+ ImportBean jsfLocalesProject = new ImportBean();
+ jsfLocalesProject.setImportProjectName(JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME);
+ jsfLocalesProject.setImportProjectPath(JsfTestPlugin.getPluginResourcePath());
+ projectToImport.add(jsfLocalesProject);
+
return new VpeTestSetup(suite, projectToImport);
}
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-01 14:43:12 UTC (rev 20052)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-01 16:08:20 UTC (rev 20053)
@@ -31,6 +31,10 @@
private static final String LOCALE_ATTRIBUTE_PAGE = "JBIDE/5218/localeAttribute.xhtml"; //$NON-NLS-1$
private static final String SEVERAL_FVIEWS_PAGE = "JBIDE/5218/severalFViews.xhtml"; //$NON-NLS-1$
private static final String CHANGE_LOCALE_AND_REFRESH_PAGE = "JBIDE/5218/changeLocaleAndRefresh.xhtml"; //$NON-NLS-1$
+ private static final String NO_DEFLOC_ATTRIBUTE_PAGE = "Lattr.jsp"; //$NON-NLS-1$
+ private static final String NO_DEFLOC_SEVERAL_FVIEWS_PAGE = "LSeveral.jsp"; //$NON-NLS-1$
+ private static final String NO_DEFLOC_CHANGE_REFRESH_PAGE = "LChangeRefresh.jsp"; //$NON-NLS-1$
+ private static final String NO_DEFLOC_ONE_LOAD_BUNDLE_PAGE = "LOneLoadBundle.jsp"; //$NON-NLS-1$
private static final String HELLO_DE = "Guten Tag!"; //$NON-NLS-1$
private static final String HELLO2_DE = "German Hello"; //$NON-NLS-1$
@@ -42,6 +46,7 @@
private static final String LOCALE_TEXT0_ID = "localeText0"; //$NON-NLS-1$
private static final String LOCALE_TEXT1_ID = "localeText1"; //$NON-NLS-1$
private static final String LOCALE_TEXT2_ID = "localeText2"; //$NON-NLS-1$
+ private static final String LOCALE_TEXT3_ID = "localeText3"; //$NON-NLS-1$
private static final String FVIEW_ID = "fviewid"; //$NON-NLS-1$
@@ -167,7 +172,103 @@
assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
closeEditors();
}
+
+ public void testNoDefaultLocaleForLocaleAttribute() throws Throwable {
+ VpeController controller = openInVpe(
+ JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME,
+ NO_DEFLOC_ATTRIBUTE_PAGE);
+ nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
+ nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT_ID);
+ String localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ closeEditors();
+ }
+
+ public void testNoDefaultLocaleForSeveralFViews() throws Throwable {
+ VpeController controller = openInVpe(
+ JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME, NO_DEFLOC_SEVERAL_FVIEWS_PAGE);
+ nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
+
+ nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT0_ID);
+ String localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ localeText = doc.getElementById(LOCALE_TEXT1_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT2_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT3_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ closeEditors();
+ }
+
+ public void _testNoDefaultLocaleForChangeAndRefresh() throws Throwable {
+ VpeController controller = openInVpe(
+ JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME,
+ NO_DEFLOC_CHANGE_REFRESH_PAGE);
+ nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
+ nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT_ID);
+ String localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ /*
+ * Change the locale
+ */
+ Element fViewElement = controller.getSourceBuilder().getSourceDocument().getElementById(FVIEW_ID);
+ assertTrue("Previous locale should be 'de'", "de".equalsIgnoreCase(fViewElement.getAttribute("locale"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ fViewElement.setAttribute("locale", "en_GB"); //$NON-NLS-1$ //$NON-NLS-2$
+ /*
+ * Wait until new value is applied and children are refreshed.
+ */
+ TestUtil.waitForIdle();
+ assertTrue("Current locale should be 'en_GB'", "en_GB".equalsIgnoreCase(fViewElement.getAttribute("locale"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ doc = controller.getXulRunnerEditor().getDOMDocument();
+ localeText = doc.getElementById(LOCALE_TEXT_ID);
+ localizedText = getLocalizedText(localeText);
+ /*
+ * Check the new localized message.
+ */
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ closeEditors();
+ }
+
+ public void testNoDefaultLocaleForSingleFLoadBundle() throws Throwable {
+ VpeController controller = openInVpe(
+ JsfAllTests.IMPORT_JSF_LOCALES_PROJECT_NAME, NO_DEFLOC_ONE_LOAD_BUNDLE_PAGE);
+ nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
+
+ nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT0_ID);
+ String localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT1_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT2_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT3_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ localeText = doc.getElementById(LOCALE_TEXT_ID);
+ localizedText = getLocalizedText(localeText);
+ assertTrue("Text is '"+localizedText+"', but should be in 'default' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+
+ closeEditors();
+ }
+
/**
* Gets the text value from the container.
* Container should be a simple tag like div or span.
@@ -179,9 +280,12 @@
*/
private String getLocalizedText(nsIDOMElement textContainer) {
String text = ""; //$NON-NLS-1$
- if ((textContainer.getFirstChild() != null) && (textContainer.getFirstChild().getFirstChild() != null)
- && HTML.TAG_SPAN.equalsIgnoreCase(textContainer.getFirstChild().getNodeName())) {
- text = textContainer.getFirstChild().getFirstChild().getNodeValue();
+ if ((textContainer != null) && (textContainer.getFirstChild() != null)
+ && (textContainer.getFirstChild().getFirstChild() != null)
+ && HTML.TAG_SPAN.equalsIgnoreCase(textContainer.getFirstChild()
+ .getNodeName())) {
+ text = textContainer.getFirstChild().getFirstChild().getNodeValue()
+ .trim();
}
return text;
}
14 years, 3 months
JBoss Tools SVN: r20052 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-02-01 09:43:12 -0500 (Mon, 01 Feb 2010)
New Revision: 20052
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5762 - caption was changed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-02-01 14:33:46 UTC (rev 20051)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-02-01 14:43:12 UTC (rev 20052)
@@ -19,7 +19,7 @@
static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$
static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$
static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR = "Ask for confirmation when closing Selection Bar"; //$NON-NLS-1$
- static final String IGNORE_VPE_WARNINGS = "Ignore Visual Editor warnings"; //$NON-NLS-1$
+ static final String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE = "Inform when a project might not be configured properly for Visual Page Editor"; //$NON-NLS-1$
static final String DEFAULT_VPE_TAB = "Default VPE Tab"; //$NON-NLS-1$
static final String VISUAL_SOURCE_EDITORS_SPLITTING = "Visual/Source Editors Splitting"; //$NON-NLS-1$
static final String VISUAL_SOURCE_EDITORS_WEIGHTS = "Size of Visual Editor Pane 0-100%"; //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-02-01 14:33:46 UTC (rev 20051)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-02-01 14:43:12 UTC (rev 20052)
@@ -29,7 +29,7 @@
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false);
defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true);
defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, true);
- defaultPreferences.putBoolean(IVpePreferencesPage.IGNORE_VPE_WARNINGS, false);
+ defaultPreferences.putBoolean(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, true);
defaultPreferences.put(IVpePreferencesPage.DEFAULT_VPE_TAB, IVpePreferencesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE);
defaultPreferences.put(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE);
defaultPreferences.putInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS, IVpePreferencesPage.DEFAULT_VISUAL_SOURCE_EDITORS_WEIGHTS);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-01 14:33:46 UTC (rev 20051)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-01 14:43:12 UTC (rev 20052)
@@ -1009,8 +1009,8 @@
}
public void partOpened(IWorkbenchPart part) {
- if (!JspEditorPlugin.getDefault().getPreferenceStore().
- getBoolean(IVpePreferencesPage.IGNORE_VPE_WARNINGS)) {
+ if (JspEditorPlugin.getDefault().getPreferenceStore().
+ getBoolean(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE)) {
try {
checkNaturesFromPart(part);
} catch (CoreException e) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-02-01 14:33:46 UTC (rev 20051)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-02-01 14:43:12 UTC (rev 20052)
@@ -150,8 +150,9 @@
ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR,
VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR,
confirmationGroup));
- addField(new BooleanFieldEditor(IGNORE_VPE_WARNINGS,
- VpeUIMessages.IGNORE_VPE_WARNINGS, confirmationGroup));
+ addField(new BooleanFieldEditor(INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE,
+ VpeUIMessages.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE,
+ confirmationGroup));
addField(new VpeComboFieldEditor(DEFAULT_VPE_TAB,
VpeUIMessages.DEFAULT_VPE_TAB,
DEFAULT_VPE_TAB_COMBO_BOX_VALUES, tabsGroup));
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-02-01 14:33:46 UTC (rev 20051)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-02-01 14:43:12 UTC (rev 20052)
@@ -129,7 +129,7 @@
public static String SHOW_BUNDLES_AS_MESSAGES;
public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT;
public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR;
- public static String IGNORE_VPE_WARNINGS;
+ public static String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE;
public static String DEFAULT_VPE_TAB;
public static String VISUAL_SOURCE_EDITORS_SPLITTING;
public static String VISUAL_SOURCE_EDITORS_WEIGHTS;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-02-01 14:33:46 UTC (rev 20051)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-02-01 14:43:12 UTC (rev 20052)
@@ -112,7 +112,7 @@
SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly
ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert
ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar
-IGNORE_VPE_WARNINGS=Ignore Visual Editor warnings
+INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE=Inform when a project might not be configured properly for Visual Page Editor
DEFAULT_VPE_TAB=Select the default active editor's tab
VISUAL_SOURCE_EDITORS_SPLITTING=Visual/Source editors splitting
VISUAL_SOURCE_EDITORS_WEIGHTS=Size of the Visual Editor pane (0-100%)
14 years, 3 months
JBoss Tools SVN: r20051 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-02-01 09:33:46 -0500 (Mon, 01 Feb 2010)
New Revision: 20051
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LoadedDeclarations.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5764
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java 2010-02-01 14:32:51 UTC (rev 20050)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LibraryScanner.java 2010-02-01 14:33:46 UTC (rev 20051)
@@ -89,10 +89,41 @@
}
}
}
+ XModelObject[] ps = o.getChildren();
+ for (int i = 0; i < ps.length; i++) {
+ if(ps[i] == metaInf || ps[i].getFileType() != XModelObject.FOLDER) continue;
+ LoadedDeclarations ds1 = parseInPackages(ps[i], path, sp);
+ if(ds1 != null) ds.add(ds1);
+ }
return ds;
}
+ public LoadedDeclarations parseInPackages(XModelObject o, IPath path, IKbProject sp) throws ScannerException {
+ LoadedDeclarations ds = new LoadedDeclarations();
+ XModelObject[] tlds = o.getChildren();
+ for (XModelObject tld: tlds) {
+ if(isFaceletTaglibFile(tld)) {
+ XMLScanner s = new XMLScanner();
+ LoadedDeclarations ds1 = s.parse(tld, path, sp);
+ ds = add(ds, ds1);
+ if(ds1 != null && !ds1.isEmpty()) {
+ System.out.println(tld.getPath() + ":" + ds1.getLibraries().get(0).getURI());
+ }
+ } else if(tld.getFileType() == XModelObject.FOLDER) {
+ LoadedDeclarations ds1 = parseInPackages(tld, path, sp);
+ ds = add(ds, ds1);
+ }
+ }
+ return ds;
+ }
+ private LoadedDeclarations add(LoadedDeclarations total, LoadedDeclarations addition) {
+ if(addition == null || addition.isEmpty()) return total;
+ if(total == null) total = new LoadedDeclarations();
+ total.add(addition);
+ return total;
+ }
+
public static boolean isTLDFile(XModelObject o) {
if(o == null) return false;
String entity = o.getModelEntity().getName();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LoadedDeclarations.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LoadedDeclarations.java 2010-02-01 14:32:51 UTC (rev 20050)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/LoadedDeclarations.java 2010-02-01 14:33:46 UTC (rev 20051)
@@ -32,4 +32,8 @@
libraries.addAll(ds.libraries);
}
+ public boolean isEmpty() {
+ return libraries.isEmpty();
+ }
+
}
14 years, 3 months
JBoss Tools SVN: r20050 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/model/helpers/converter and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-02-01 09:32:51 -0500 (Mon, 01 Feb 2010)
New Revision: 20050
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenTagLib.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5764
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-02-01 14:31:49 UTC (rev 20049)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-02-01 14:32:51 UTC (rev 20050)
@@ -512,6 +512,9 @@
<XModelAttribute default="tag" loader="ElementType" name="element type">
<Editor name="Uneditable"/>
</XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
<XModelAttribute PROPERTIES="save=always;id=true;category=general"
name="tag-name" xmlname="tag-name.#text"/>
<XModelAttribute TRIM="no" name="comment" xmlname="#comment">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenTagLib.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenTagLib.java 2010-02-01 14:31:49 UTC (rev 20049)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/helpers/converter/OpenTagLib.java 2010-02-01 14:32:51 UTC (rev 20050)
@@ -10,12 +10,18 @@
******************************************************************************/
package org.jboss.tools.jsf.model.helpers.converter;
+import org.eclipse.core.resources.IProject;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.FindObjectHelper;
import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.pv.*;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.internal.KbObject;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.jst.web.model.pv.*;
public class OpenTagLib {
@@ -23,7 +29,7 @@
public String run(XModel model, String uri, String tag, String attribute) {
if(model == null || uri == null) return null;
if(uri.length() == 0) return JSFUIMessages.URI_ISNOT_SPECIFIED;
- XModelObject t = findTagLib(model, uri);
+ XModelObject t = findTagLib(model, uri, tag, attribute);
if(t == null) return NLS.bind(JSFUIMessages.CANNOT_FIND_TAG_LIBRARY, uri);
FindObjectHelper.findModelObject(t, FindObjectHelper.IN_EDITOR_ONLY);
if(tag != null) {
@@ -41,17 +47,53 @@
return null;
}
- private XModelObject findTagLib(XModel model, String uri) {
+ private XModelObject findTagLib(XModel model, String uri, String tag, String attribute) {
+ XModelObject some = null;
JSFProjectsRoot root = JSFProjectsTree.getProjectsRoot(model);
if(root == null) return null;
WebProjectNode n = (WebProjectNode)root.getChildByPath("Tag Libraries");
if(n == null) return null;
XModelObject[] os = n.getTreeChildren();
for (int i = 0; i < os.length; i++) {
- if(uri.equals(os[i].getAttributeValue("uri"))) return os[i];
+ if(uri.equals(os[i].getAttributeValue("uri"))) {
+ if(isOk(os[i], tag, attribute)) {
+ return os[i];
+ } else {
+ some = os[i];
+ }
+ }
}
- return null;
+
+ IProject project = EclipseResourceUtil.getProject(root);
+ if(project != null) {
+ IKbProject kb = KbProjectFactory.getKbProject(project, true);
+ if(kb != null) {
+ ITagLibrary[] ls = kb.getTagLibraries(uri);
+ for (int i = 0; i < ls.length; i++) {
+ Object id = ((KbObject)ls[i]).getId();
+ if(id instanceof XModelObject) {
+ XModelObject lib = (XModelObject)id;
+ if(isOk(lib, tag, attribute)) {
+ return lib;
+ }
+ }
+ }
+ }
+ }
+ return some;
}
+
+ private boolean isOk(XModelObject lib, String tag, String attribute) {
+ if(tag != null) {
+ XModelObject t = findTag(lib, tag);
+ if(t == null) return false;
+ if(t != null && attribute != null) {
+ XModelObject a = findAttribute(t, attribute);
+ if(a == null) return false;
+ }
+ }
+ return true;
+ }
private XModelObject findTag(XModelObject taglib, String name) {
return taglib.getChildByPath(name);
14 years, 3 months
JBoss Tools SVN: r20049 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-02-01 09:31:49 -0500 (Mon, 01 Feb 2010)
New Revision: 20049
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5471
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2010-02-01 13:42:37 UTC (rev 20048)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2010-02-01 14:31:49 UTC (rev 20049)
@@ -325,7 +325,9 @@
++k;
}
o.addChild(co);
- } else if(o.isActive()) try {
+ } else if(o.isActive()
+ || (entity.getChild(en) != null
+ && entity.getChild(en).isRequired())) try {
XModelObject q = o.getChildByPath(co.getPathPart());
if(q != null) EnginesLoader.merge(q, co, false);
} catch (XModelException exc) {
14 years, 3 months