JBoss Tools SVN: r11536 - trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-05 13:01:24 -0500 (Wed, 05 Nov 2008)
New Revision: 11536
Modified:
trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/plugin.properties
Log:
Correcting name for provider
Modified: trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/plugin.properties
===================================================================
--- trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/plugin.properties 2008-11-05 18:01:19 UTC (rev 11535)
+++ trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/plugin.properties 2008-11-05 18:01:24 UTC (rev 11536)
@@ -1,2 +1,2 @@
BundleName=TPTP Profile On JBoss Server
-BundleVendor=RedHat, Inc.
\ No newline at end of file
+BundleVendor=JBoss, a division of Red Hat
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11535 - trunk/birt/features/org.jboss.tools.birt.feature.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-05 13:01:19 -0500 (Wed, 05 Nov 2008)
New Revision: 11535
Modified:
trunk/birt/features/org.jboss.tools.birt.feature/feature.xml
Log:
Correcting name for provider
Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2008-11-05 18:01:14 UTC (rev 11534)
+++ trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2008-11-05 18:01:19 UTC (rev 11535)
@@ -3,7 +3,7 @@
id="org.jboss.tools.birt.feature"
label="JBoss BIRT Integration"
version="1.0.0"
- provider-name="RedHat, Inc."
+ provider-name="JBoss, a division of Red Hat"
plugin="org.jboss.tools.birt.oda.ui">
<description url="http://www.example.com/description">
16 years, 2 months
JBoss Tools SVN: r11534 - trunk/examples/plugins/org.jboss.tools.project.examples/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-05 13:01:14 -0500 (Wed, 05 Nov 2008)
New Revision: 11534
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
Log:
Correcting name for provider
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2008-11-05 18:01:07 UTC (rev 11533)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2008-11-05 18:01:14 UTC (rev 11534)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.jboss.tools.project.examples;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.project.examples.ProjectExamplesActivator
-Bundle-Vendor: Red Hat, inc
+Bundle-Vendor: JBoss, a division of Red Hat
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
16 years, 2 months
JBoss Tools SVN: r11533 - trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-05 13:01:07 -0500 (Wed, 05 Nov 2008)
New Revision: 11533
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
Log:
Correcting name for provider
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2008-11-05 18:01:03 UTC (rev 11532)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2008-11-05 18:01:07 UTC (rev 11533)
@@ -5,7 +5,7 @@
Bundle-Version: 1.0.0
Bundle-ClassPath: .
Bundle-Activator: org.jboss.tools.birt.oda.Activator
-Bundle-Vendor: RedHat, Inc.
+Bundle-Vendor: JBoss, a division of Red Hat
Bundle-Localization: plugin
Export-Package: org.jboss.tools.birt.oda,
org.jboss.tools.birt.oda.impl
16 years, 2 months
JBoss Tools SVN: r11532 - trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-05 13:01:03 -0500 (Wed, 05 Nov 2008)
New Revision: 11532
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF
Log:
Correcting name for provider
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2008-11-05 17:32:59 UTC (rev 11531)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2008-11-05 18:01:03 UTC (rev 11532)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.jboss.tools.portlet.core;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.portlet.core.PortletCoreActivator
-Bundle-Vendor: Red Hat, Inc.
+Bundle-Vendor: JBoss, a division of Red Hat
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.wst.common.project.facet.core,
org.eclipse.core.resources,
16 years, 2 months
JBoss Tools SVN: r11531 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-05 12:32:59 -0500 (Wed, 05 Nov 2008)
New Revision: 11531
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.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:
JBIDE-3093, fix from izhukov
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2008-11-05 17:20:00 UTC (rev 11530)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/xpl/CustomSashForm.java 2008-11-05 17:32:59 UTC (rev 11531)
@@ -29,6 +29,7 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Sash;
+import org.jboss.tools.vpe.messages.VpeUIMessages;
/**
* A SashForm that allows move to/from max controls on sash.
@@ -64,10 +65,10 @@
NO_MAX_DOWN = NO_MAX_RIGHT; // Custom style bit for not allow max down
- private static final int NO_WEIGHT = -1;
+ private static final int NO_WEIGHT = -1;
private static final int NO_ARROW = -1;
- private final static String LAYOUT_RATIO = "layout ratio";
- private final static String WEIGHTS = "weights";
+ private final static String WEIGHTS = "weights"; //$NON-NLS-1$
+
private static class SashInfo {
public Sash sash;
public boolean enabled; // Whether this sashinfo is enabled (i.e. if there is more than one, this will be disabled).
@@ -95,7 +96,7 @@
protected boolean sashBorders[]; // Whether cooresponding control needs a sash border
protected boolean noMaxUp, noMaxDown;
- protected List customSashFormListeners = null;
+ protected List<ICustomSashFormListener> customSashFormListeners = null;
protected PropertyChangeSupport listeners = new PropertyChangeSupport(this);
protected static final int
@@ -293,11 +294,11 @@
* @see org.eclipse.swt.events.ControlAdapter#controlMoved(ControlEvent)
*/
public void controlMoved(ControlEvent e) {
- if(e.widget instanceof Sash){
- Sash s = (Sash) e.widget;
- String text = s.getToolTipText();
+// if(e.widget instanceof Sash){
+// Sash s = (Sash) e.widget;
+// String text = s.getToolTipText();
// if(text.equalsIgnoreCase(anotherString))
- }
+// }
recomputeSashInfo();
}
@@ -336,7 +337,7 @@
int loc = vertical ? x : y;
int locIndex = vertical ? X_INDEX : Y_INDEX;
int sizeIndex = vertical ? WIDTH_INDEX : HEIGHT_INDEX;
- if (locs[locIndex] <= loc && loc <= locs[locIndex]+locs[sizeIndex]) {
+ if (locs[locIndex] <= loc && loc <= locs[locIndex]+locs[sizeIndex]) {
if (currentSashInfo.cursorOver == NO_ARROW) {
currentSashInfo.sash.setCursor(Cursors.ARROW);
}
@@ -346,11 +347,13 @@
switch (locs[ARROW_TYPE_INDEX]) {
case UP_ARROW:
case DOWN_ARROW:
- currentSashInfo.sash.setToolTipText("Restore Previous Location");
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.RESTORE_PREVIOUS_LOCATION);
break;
case UP_MAX_ARROW:
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_VISUAL_PANE);
+ break;
case DOWN_MAX_ARROW:
- currentSashInfo.sash.setToolTipText("Maximize Pane");
+ currentSashInfo.sash.setToolTipText(VpeUIMessages.MAX_SOURCE_PANE);
break;
}
}
@@ -366,7 +369,7 @@
}
});
-
+
// Need to know when we leave so that we can clear the cursor feedback if set.
newSash.addMouseTrackListener(new MouseTrackAdapter() {
/**
@@ -496,7 +499,7 @@
} else {
addArrows = new int[2];
drawArrows = new int[2];
- // TODO: SashForm as changed the folllwing is a temporary kludge
+ // TODO: SashForm as changed the following is a temporary kludge
Rectangle sashBounds = currentSashInfo.sash.getBounds();
Rectangle clientArea = getClientArea();
final int DRAG_MINIMUM = 20; // TODO: kludge see SashForm.DRAG_MINIMUM
@@ -910,20 +913,21 @@
* @since 1.2.0
*/
public void addCustomSashFormListener(ICustomSashFormListener listener){
- if(customSashFormListeners==null)
- customSashFormListeners = new ArrayList();
+ if (customSashFormListeners == null) {
+ customSashFormListeners = new ArrayList<ICustomSashFormListener>();
+ }
customSashFormListeners.add(listener);
}
/**
* Removes the custom sashform listener.
- *
+ *
* @param listener
- *
+ *
* @since 1.2.0
*/
public void removeCustomSashFormListener(ICustomSashFormListener listener){
- if(customSashFormListeners!=null){
+ if (customSashFormListeners != null) {
customSashFormListeners.remove(listener);
}
}
@@ -934,7 +938,7 @@
if(weights!=null && weights.length==2){
int firstControlWeight = weights[0];
int secondControlWeight = weights[1];
- for (Iterator listenerItr = customSashFormListeners.iterator(); listenerItr.hasNext();) {
+ for (Iterator<ICustomSashFormListener> listenerItr = customSashFormListeners.iterator(); listenerItr.hasNext();) {
ICustomSashFormListener listener = (ICustomSashFormListener) listenerItr.next();
listener.dividerMoved(firstControlWeight, secondControlWeight);
}
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 2008-11-05 17:20:00 UTC (rev 11530)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-11-05 17:32:59 UTC (rev 11531)
@@ -1,103 +1,106 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.messages;
-
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.vpe.VpePlugin;
-
-public class VpeUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.jboss.tools.vpe.messages.messages";//$NON-NLS-1$
- private static ResourceBundle fResourceBundle;
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, VpeUIMessages.class);
- }
- private VpeUIMessages(){}
-
- public static ResourceBundle getResourceBundle() {
- try {
- if (fResourceBundle == null)
- fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
- }
- catch (MissingResourceException x) {
- VpePlugin.getPluginLog().logError(x);
- fResourceBundle = null;
- }
- return fResourceBundle;
- }
-
- public static String NAMESPACE_NOT_DEFINED;
- public static String PREFERENCES;
- public static String REFRESH;
- public static String PAGE_DESIGN_OPTIONS;
- public static String HIDE_SELECTIONBAR;
- public static String MOZILLA_LOADING_ERROR;
- public static String MOZILLA_LOADING_ERROR_LINK_TEXT;
- public static String MOZILLA_LOADING_ERROR_LINK;
- public static String SHOW_COMMENTS;
- public static String SHOW_BORDER_FOR_UNKNOWN_TAGS;
- public static String SHOW_BORDER_FOR_ALL_TAGS;
- public static String USE_DETAIL_BORDER;
- public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL;
- public static String USE_ABSOLUTE_POSITION;
- public static String ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT;
- public static String OPTION_LIST;
- public static String SOURCE_VISUAL_EDITORS_WEIGHTS;
- public static String GENERAL;
- public static String TEMPLATES;
- public static String TEMPLATE;
- public static String TAG_ATTRIBUTES;
- public static String TAG_NAME;
- public static String CHILDREN;
- public static String DISPLAY;
- public static String ICON;
- public static String VALUE;
- public static String VALUE_COLOR;
- public static String VALUE_BACKGROUND_COLOR;
- public static String BACKGROUND_COLOR;
- public static String BORDER;
- public static String BORDER_COLOR;
- public static String ERROR_OF_TYPE_CONVERSION;
- public static String INCORRECT_PARAMETER_ERROR;
- public static String HIDE_TOOLBAR;
- public static String SHOW_TOOLBAR;
- public static String MENU;
- public static String SET_BACKGROUND_COLOR;
- public static String SET_FOREGROUND_COLOR;
- public static String TEXT_FORMATTING;
- public static String BLOCK_FORMAT;
- public static String FONT_NAME;
- public static String FONT_SIZE;
- public static String BOLD;
- public static String ITALIC;
- public static String UNDERLINE;
- public static String FOREGROUND_COLOR;
- public static String ALIGN_LEFT;
- public static String CENTER;
- public static String ALIGN_RIGHT;
- public static String JUSTIFY;
- public static String BULLETS;
- public static String NUMBERING;
- public static String CONFIRM_SELECTION_BAR_DIALOG_TITLE;
- public static String CONFIRM_SELECTION_BAR_DIALOG_MESSAGE;
- public static String CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE;
- public static String VPE_UPDATE_JOB_TITLE;
- public static String VPE_VISUAL_REFRESH_JOB;
- public static String NON_VISUAL_TAGS;
- public static String SHOW;
- public static String HIDE;
- public static String TAG_FOR_DISPLAY;
- public static String STYLE;
-}
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.messages;
+
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.vpe.VpePlugin;
+
+public class VpeUIMessages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.tools.vpe.messages.messages";//$NON-NLS-1$
+ private static ResourceBundle fResourceBundle;
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, VpeUIMessages.class);
+ }
+ private VpeUIMessages(){}
+
+ public static ResourceBundle getResourceBundle() {
+ try {
+ if (fResourceBundle == null)
+ fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
+ }
+ catch (MissingResourceException x) {
+ VpePlugin.getPluginLog().logError(x);
+ fResourceBundle = null;
+ }
+ return fResourceBundle;
+ }
+
+ public static String NAMESPACE_NOT_DEFINED;
+ public static String PREFERENCES;
+ public static String REFRESH;
+ public static String PAGE_DESIGN_OPTIONS;
+ public static String HIDE_SELECTIONBAR;
+ public static String MOZILLA_LOADING_ERROR;
+ public static String MOZILLA_LOADING_ERROR_LINK_TEXT;
+ public static String MOZILLA_LOADING_ERROR_LINK;
+ public static String SHOW_COMMENTS;
+ public static String SHOW_BORDER_FOR_UNKNOWN_TAGS;
+ public static String SHOW_BORDER_FOR_ALL_TAGS;
+ public static String USE_DETAIL_BORDER;
+ public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL;
+ public static String USE_ABSOLUTE_POSITION;
+ public static String ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT;
+ public static String OPTION_LIST;
+ public static String SOURCE_VISUAL_EDITORS_WEIGHTS;
+ public static String GENERAL;
+ public static String TEMPLATES;
+ public static String TEMPLATE;
+ public static String TAG_ATTRIBUTES;
+ public static String TAG_NAME;
+ public static String CHILDREN;
+ public static String DISPLAY;
+ public static String ICON;
+ public static String VALUE;
+ public static String VALUE_COLOR;
+ public static String VALUE_BACKGROUND_COLOR;
+ public static String BACKGROUND_COLOR;
+ public static String BORDER;
+ public static String BORDER_COLOR;
+ public static String ERROR_OF_TYPE_CONVERSION;
+ public static String INCORRECT_PARAMETER_ERROR;
+ public static String HIDE_TOOLBAR;
+ public static String SHOW_TOOLBAR;
+ public static String MENU;
+ public static String SET_BACKGROUND_COLOR;
+ public static String SET_FOREGROUND_COLOR;
+ public static String TEXT_FORMATTING;
+ public static String BLOCK_FORMAT;
+ public static String FONT_NAME;
+ public static String FONT_SIZE;
+ public static String BOLD;
+ public static String ITALIC;
+ public static String UNDERLINE;
+ public static String FOREGROUND_COLOR;
+ public static String ALIGN_LEFT;
+ public static String CENTER;
+ public static String ALIGN_RIGHT;
+ public static String JUSTIFY;
+ public static String BULLETS;
+ public static String NUMBERING;
+ public static String CONFIRM_SELECTION_BAR_DIALOG_TITLE;
+ public static String CONFIRM_SELECTION_BAR_DIALOG_MESSAGE;
+ public static String CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE;
+ public static String VPE_UPDATE_JOB_TITLE;
+ public static String VPE_VISUAL_REFRESH_JOB;
+ public static String NON_VISUAL_TAGS;
+ public static String SHOW;
+ public static String HIDE;
+ public static String TAG_FOR_DISPLAY;
+ public static String STYLE;
+ public static String MAX_SOURCE_PANE;
+ public static String MAX_VISUAL_PANE;
+ public static String RESTORE_PREVIOUS_LOCATION;
+}
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 2008-11-05 17:20:00 UTC (rev 11530)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-11-05 17:32:59 UTC (rev 11531)
@@ -1,64 +1,66 @@
-NAMESPACE_NOT_DEFINED=Namespace not defined. Template could not be edit.
-ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder
-PREFERENCES=Preferences
-REFRESH=Refresh
-PAGE_DESIGN_OPTIONS=Page Design Options
-HIDE_SELECTIONBAR=Hide Selection Bar
-SHOW_BORDER_FOR_ALL_TAGS=show border for all tags
-MOZILLA_LOADING_ERROR=The VPE editor can't be run because your system environment needs to be changed slightly.
-MOZILLA_LOADING_ERROR_LINK_TEXT=Find out more.
-MOZILLA_LOADING_ERROR_LINK=http://labs.jboss.com/wiki/JBosstoolsVisualEditorFAQ
-SHOW_COMMENTS=show comments
-SHOW_BORDER_FOR_UNKNOWN_TAGS=show border for unknown tags
-USE_DETAIL_BORDER=use detail border
-SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=show resource bundles usage as EL expressions
-USE_ABSOLUTE_POSITION=use absolute position
-ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT=always prompt for tag attributes during tag insert
-OPTION_LIST=option list
-SOURCE_VISUAL_EDITORS_WEIGHTS=Size of Visual Editor pane 0-100%
-GENERAL=General
-TEMPLATES=Templates
-TEMPLATE=Template
-TAG_ATTRIBUTES=Tag Attributes
-TAG_NAME=Tag Name:
-CHILDREN=Children
-DISPLAY=Display
-ICON=Icon
-VALUE=Value
-VALUE_COLOR=Value Color
-VALUE_BACKGROUND_COLOR=Value Background Color
-BACKGROUND_COLOR=Background Color
-BORDER=Border
-BORDER_COLOR=Border Color
-ERROR_OF_TYPE_CONVERSION=Error of type conversion
-INCORRECT_PARAMETER_ERROR=Incorrect parameter error
-HIDE_TOOLBAR=Hide Text Formatting Toolbar
-SHOW_TOOLBAR=Show Text Formatting Toolbar
-MENU=Menu
-SET_BACKGROUND_COLOR=Set Background Color
-SET_FOREGROUND_COLOR=Set Foreground color
-TEXT_FORMATTING=Text Formatting
-BLOCK_FORMAT=Block Format
-FONT_NAME=Font Name
-FONT_SIZE=Font Size
-BOLD=Bold
-ITALIC=Italic
-UNDERLINE=Underline
-FOREGROUND_COLOR=Foreground Color
-ALIGN_LEFT=Align Left
-CENTER=Center
-ALIGN_RIGHT=Align Right
-JUSTIFY=Justify
-BULLETS=Bullets
-NUMBERING=Numbering
-CONFIRM_SELECTION_BAR_DIALOG_TITLE=Confirm hide selection bar
-CONFIRM_SELECTION_BAR_DIALOG_MESSAGE=Hide selection bar ?
-CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE=Always hide selection bar without prompt
-VPE_UPDATE_JOB_TITLE=Visual Editor View Update
-VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh
-NON_VISUAL_TAGS=Non-visual tags
-SHOW=Show
-HIDE=Hide
-TAG_FOR_DISPLAY=Tag for Display
-STYLE=Style
-
+NAMESPACE_NOT_DEFINED=Namespace not defined. Template could not be edit.
+ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder
+PREFERENCES=Preferences
+REFRESH=Refresh
+PAGE_DESIGN_OPTIONS=Page Design Options
+HIDE_SELECTIONBAR=Hide Selection Bar
+SHOW_BORDER_FOR_ALL_TAGS=show border for all tags
+MOZILLA_LOADING_ERROR=The VPE editor can't be run because your system environment needs to be changed slightly.
+MOZILLA_LOADING_ERROR_LINK_TEXT=Find out more.
+MOZILLA_LOADING_ERROR_LINK=http://labs.jboss.com/wiki/JBosstoolsVisualEditorFAQ
+SHOW_COMMENTS=show comments
+SHOW_BORDER_FOR_UNKNOWN_TAGS=show border for unknown tags
+USE_DETAIL_BORDER=use detail border
+SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=show resource bundles usage as EL expressions
+USE_ABSOLUTE_POSITION=use absolute position
+ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT=always prompt for tag attributes during tag insert
+OPTION_LIST=option list
+SOURCE_VISUAL_EDITORS_WEIGHTS=Size of Visual Editor pane 0-100%
+GENERAL=General
+TEMPLATES=Templates
+TEMPLATE=Template
+TAG_ATTRIBUTES=Tag Attributes
+TAG_NAME=Tag Name:
+CHILDREN=Children
+DISPLAY=Display
+ICON=Icon
+VALUE=Value
+VALUE_COLOR=Value Color
+VALUE_BACKGROUND_COLOR=Value Background Color
+BACKGROUND_COLOR=Background Color
+BORDER=Border
+BORDER_COLOR=Border Color
+ERROR_OF_TYPE_CONVERSION=Error of type conversion
+INCORRECT_PARAMETER_ERROR=Incorrect parameter error
+HIDE_TOOLBAR=Hide Text Formatting Toolbar
+SHOW_TOOLBAR=Show Text Formatting Toolbar
+MENU=Menu
+SET_BACKGROUND_COLOR=Set Background Color
+SET_FOREGROUND_COLOR=Set Foreground color
+TEXT_FORMATTING=Text Formatting
+BLOCK_FORMAT=Block Format
+FONT_NAME=Font Name
+FONT_SIZE=Font Size
+BOLD=Bold
+ITALIC=Italic
+UNDERLINE=Underline
+FOREGROUND_COLOR=Foreground Color
+ALIGN_LEFT=Align Left
+CENTER=Center
+ALIGN_RIGHT=Align Right
+JUSTIFY=Justify
+BULLETS=Bullets
+NUMBERING=Numbering
+CONFIRM_SELECTION_BAR_DIALOG_TITLE=Confirm hide selection bar
+CONFIRM_SELECTION_BAR_DIALOG_MESSAGE=Hide selection bar ?
+CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE=Always hide selection bar without prompt
+VPE_UPDATE_JOB_TITLE=Visual Editor View Update
+VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh
+NON_VISUAL_TAGS=Non-visual tags
+SHOW=Show
+HIDE=Hide
+TAG_FOR_DISPLAY=Tag for Display
+STYLE=Style
+MAX_SOURCE_PANE=Maximize Source Pane
+MAX_VISUAL_PANE=Maximize Visual Pane
+RESTORE_PREVIOUS_LOCATION=Restore Previous Location
16 years, 2 months
JBoss Tools SVN: r11530 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-05 12:20:00 -0500 (Wed, 05 Nov 2008)
New Revision: 11530
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSpinner/inputNumberSpinner.css
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInputNumberSpinnerTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml
Log:
JBIDE-2913 fix from izhukov
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSpinner/inputNumberSpinner.css
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSpinner/inputNumberSpinner.css 2008-11-05 17:04:43 UTC (rev 11529)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSpinner/inputNumberSpinner.css 2008-11-05 17:20:00 UTC (rev 11530)
@@ -1,47 +1,38 @@
-.ins-input {
- border: 1px;
- padding: 0px 0px 0px 3px;
- background: none transparent scroll repeat 0% 0%;
- margin-top: 1px;
- font-family: Arial, Verdana, sans-serif;
- font-size: 11px;
- line-height: 14px;
- height: 14px;
-
-
+.dr-spnr-i {
+ border: 0 none;
+ padding: 0px 0px 0px 3px;
+ background: transparent none repeat scroll 0 0;
+ margin: 0px;
+ font-family: Arial, Verdana, sans-serif;
+ font-size: 11px;
}
-.ins-dr-spnr-e{
- background-color : #ffffff;
- padding: 0px;
- margin: 0px;
- background-position: left top;
- background-repeat: repeat-x;
- border-left: #000000 1px solid;
- border-top: #000000 1px solid;
- border-bottom: #b0b0b0 1px solid;
- border-right: #b0b0b0 1px solid;
+.dr-spnr-e {
+ background-color: #ffffff;
+ padding: 0px;
+ margin: 0px;
+ background-position: left top;
+ background-repeat: repeat-x;
+ border-color: #D4CFC7;
+ border-width: 1px 0 1px 1px;
+ border-style: inset;
}
.dr-spnr-bn {
- border: 0px;
- margin-top: 0px;
- margin-bottom: 0px;
- margin-right-value: 0px;
- margin-left-value: 0px;
-
+ border-style: none;
+ display: block;
+ margin: 0 1px 1px 0;
}
.dr-spnr-b {
- width: 14px;
- border: 1px;
- background-image: url(background-arrows.jpg);
- border-style: solid;
- padding: 0px;
- margin: 0px;
- background-position: left top;
- background-repeat: repeat-x;
- font-size: 0px;
- background-color:#D4CFC7;
- border-color:#D4CFC7;
-}
+ background-image: url(background-arrows.jpg);
+ background-color: #D4CFC7;
+ border-color: #D4CFC7;
+ border-style: solid;
+ padding: 0px;
+ margin: 0px;
+ background-position: left top;
+ background-repeat: repeat-x;
+ font-size: 0px;
+ border-width: 1px;
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInputNumberSpinnerTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInputNumberSpinnerTemplate.java 2008-11-05 17:04:43 UTC (rev 11529)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInputNumberSpinnerTemplate.java 2008-11-05 17:20:00 UTC (rev 11530)
@@ -1,308 +1,329 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jsf.vpe.richfaces.template;
-
-import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
-import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
-import org.jboss.tools.vpe.editor.context.VpePageContext;
-import org.jboss.tools.vpe.editor.mapping.AttributeData;
-import org.jboss.tools.vpe.editor.mapping.NodeData;
-import org.jboss.tools.vpe.editor.mapping.VpeElementData;
-import org.jboss.tools.vpe.editor.template.VpeCreationData;
-import org.jboss.tools.vpe.editor.util.HTML;
-import org.mozilla.interfaces.nsIDOMDocument;
-import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsIDOMNodeList;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Template for input number spinner control
- */
-public class RichFacesInputNumberSpinnerTemplate extends
-/* AbstractRichFacesInputNumberTemplate */AbstractEditableRichFacesTemplate {
-
- /** CSS_FILE_NAME */
- final static private String CSS_FILE_NAME = "inputNumberSpinner/inputNumberSpinner.css"; //$NON-NLS-1$
-
- /** IMAGE_NAME_UP */
- final static private String IMAGE_NAME_UP = "/inputNumberSpinner/up.gif"; //$NON-NLS-1$
-
- /** IMAGE_NAME_DOWN */
- final static private String IMAGE_NAME_DOWN = "/inputNumberSpinner/down.gif"; //$NON-NLS-1$
-
- /** DEFAULT_INPUT_SIZE */
- final static private String DEFAULT_INPUT_SIZE = "10"; //$NON-NLS-1$
-
- /** DEFAULT_INPUT_STYLE */
- final static private String DEFAULT_INPUT_STYLE = "ins-input"; //$NON-NLS-1$
-
- final static private String ZERO_STRING = "0"; //$NON-NLS-1$
-
- /**
- * Creates a node of the visual tree on the node of the source tree. This
- * visual node should not have the parent node This visual node can have
- * child nodes.
- *
- * @param pageContext
- * Contains the information on edited page.
- * @param sourceNode
- * The current node of the source tree.
- * @param visualDocument
- * The document of the visual tree.
- * @return The information on the created node of the visual tree.
- */
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument) {
-
- // Set a css for this element
- ComponentUtil.setCSSLink(pageContext, CSS_FILE_NAME,
- "richFacesInputNumberSpinner"); //$NON-NLS-1$
-
- Element sourceElement = (Element) sourceNode;
-
- nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
- table.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
- table.setAttribute(HTML.ATTR_CELLPADDING, ZERO_STRING);
- table.setAttribute(HTML.ATTR_CELLSPACING, ZERO_STRING);
-
- VpeElementData elementData = new VpeElementData();
-
- nsIDOMElement row = visualDocument
- .createElement(HTML.TAG_TR);
-
- // create input element
- nsIDOMElement cellInput = visualDocument.createElement(HTML.TAG_TD);
- cellInput.setAttribute(HTML.ATTR_CLASS, "ins-dr-spnr-e"); //$NON-NLS-1$
- cellInput.setAttribute(HTML.ATTR_VALIGN, HTML.VALUE_ALIGN_TOP);
- cellInput.appendChild(createInputElement(visualDocument, sourceElement,
- elementData));
- row.appendChild(cellInput);
-
- // create arrows cell
- nsIDOMElement cellArrows = visualDocument.createElement(HTML.TAG_TD);
- cellArrows.setAttribute(HTML.ATTR_CLASS, "dr-spnr-b"); //$NON-NLS-1$
- cellArrows.setAttribute(HTML.ATTR_VALIGN, HTML.VALUE_ALIGN_MIDDLE);
- cellArrows.appendChild(createArrowsElement(visualDocument, sourceNode));
- row.appendChild(cellArrows);
-
- table.appendChild(row);
-
- String tmp = getAttribute(sourceElement, RichFaces.ATTR_STYLE);
- table.setAttribute(HTML.ATTR_STYLE, tmp);
-
- // Create return variable contain template
- VpeCreationData creationData = new VpeCreationData(table);
-
- creationData.setElementData(elementData);
-
- return creationData;
- }
-
- /**
- * Create a HTML-part containg arrows elements
- *
- * @param visualDocument
- * The current node of the source tree.
- * @param sourceNode
- * The document of the visual tree.
- * @return a HTML-part containg arrows elements
- */
- private nsIDOMElement createArrowsElement(nsIDOMDocument visualDocument,
- Node sourceNode) {
- nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
-
- table.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
- table.setAttribute(HTML.ATTR_CELLPADDING, ZERO_STRING);
- table.setAttribute(HTML.ATTR_CELLSPACING, ZERO_STRING);
-
- nsIDOMElement rowUp = visualDocument.createElement(HTML.TAG_TR);
- nsIDOMElement cellUp = visualDocument.createElement(HTML.TAG_TD);
-
- nsIDOMElement imageUpElement = visualDocument
- .createElement(HTML.TAG_INPUT);
-
- ComponentUtil.setImg(imageUpElement, IMAGE_NAME_UP);
-
- imageUpElement.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
- imageUpElement.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_IMAGE);
- imageUpElement.setAttribute(HTML.ATTR_CLASS, "dr-spnr-bn"); //$NON-NLS-1$
-
- cellUp.appendChild(imageUpElement);
- rowUp.appendChild(cellUp);
- table.appendChild(rowUp);
-
- nsIDOMElement rowDown = visualDocument.createElement(HTML.TAG_TR);
- nsIDOMElement cellDown = visualDocument.createElement(HTML.TAG_TD);
-
- nsIDOMElement imageDownElement = visualDocument
- .createElement(HTML.TAG_INPUT);
-
- ComponentUtil.setImg(imageDownElement, IMAGE_NAME_DOWN);
-
- imageDownElement.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
- imageDownElement.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_IMAGE);
- imageDownElement.setAttribute(HTML.ATTR_CLASS, "dr-spnr-bn"); //$NON-NLS-1$
- cellDown.appendChild(imageDownElement);
- rowDown.appendChild(cellDown);
- table.appendChild(rowDown);
-
- return table;
- }
-
- /**
- * Create a HTML-part containg input element
- *
- * @param visualDocument
- * The current node of the source tree.
- * @param sourceNode
- * The document of the visual tree.
- * @param elementData
- * @return a HTML-part containg input element
- */
- private nsIDOMElement createInputElement(nsIDOMDocument visualDocument,
- Element sourceElement, VpeElementData elementData) {
- nsIDOMElement inputElement = visualDocument
- .createElement(HTML.TAG_INPUT);
-
- inputElement
- .setAttribute(HTML.ATTR_CLASS, getInputClass(sourceElement));
-
- inputElement
- .setAttribute(HTML.ATTR_STYLE, getInputStyle(sourceElement));
-
- inputElement.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_TEXT);
-
- inputElement.setAttribute(HTML.ATTR_SIZE, getInputSize(sourceElement));
- inputElement
- .setAttribute(HTML.ATTR_VALUE, getInputValue(sourceElement));
-
- if ((sourceElement).hasAttribute(RichFaces.ATTR_VALUE)) {
- elementData.addNodeData(new NodeData(sourceElement
- .getAttributeNode(RichFaces.ATTR_VALUE), inputElement, true));
- } else {
- elementData.addNodeData(new AttributeData(
- RichFaces.ATTR_VALUE, inputElement, true));
- }
-
- return inputElement;
- }
-
- /**
- * Return a input value
- *
- * @param sourceNode
- * a sourceNode
- * @return a input value
- */
- private String getInputValue(Element sourceElement) {
- String returnValue = getAttribute(sourceElement, RichFaces.ATTR_VALUE);
- return returnValue;
- }
-
- /**
- * Return a input style
- *
- * @param sourceNode
- * a sourceNode
- * @return a input style
- */
- private String getInputStyle(Element sourceElement) {
- String returnValue = getAttribute(sourceElement,
- RichFaces.ATTR_INPUT_STYLE);
- return returnValue;
- }
-
- /**
- * Return a input size
- *
- * @param sourceNode
- * a sourceNode
- * @return a input size
- */
- protected String getInputSize(Element sourceElement) {
- String returnValue = getDefaultInputSize();
- String tmp = getAttribute(sourceElement, RichFaces.ATTR_INPUT_SIZE);
- if (tmp.length() != 0) {
- returnValue = tmp;
- }
- return returnValue;
- }
-
- /**
- * Return a input class
- *
- * @param sourceNode
- * a sourceNode
- * @return a input class
- */
- public String getInputClass(Element sourceElement) {
- String returnValue = getDefaultInputClass();
- String tmp = getAttribute(sourceElement, RichFaces.ATTR_INPUT_CLASS);
- if (tmp.length() != 0) {
- returnValue = new StringBuffer().append(returnValue).append(" ") //$NON-NLS-1$
- .append(tmp).toString();
- }
- return returnValue;
- }
-
- /**
- *
- * @see com.exadel.vpe.editor.template.VpeAbstractTemplate#setAttribute(com.exadel.vpe.editor.context.VpePageContext,
- * org.w3c.dom.Element, org.w3c.dom.Document, org.w3c.dom.Node,
- * java.lang.Object, java.lang.String, java.lang.String)
- */
- @Override
- public void setAttribute(VpePageContext pageContext, Element sourceElement,
- nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data,
- String name, String value) {
- // 1. Call super method
- super.setAttribute(pageContext, sourceElement, visualDocument,
- visualNode, data, name, value);
-
- nsIDOMElement table = (nsIDOMElement) visualNode
- .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- nsIDOMNodeList listTable = table.getChildNodes();
- nsIDOMNode nodeTr = listTable.item(0);
- nsIDOMNodeList listTr = nodeTr.getChildNodes();
- nsIDOMNode nodeTd = listTr.item(0);
-
- nsIDOMNodeList listTd = nodeTd.getChildNodes();
- nsIDOMNode entry0 = listTd.item(0);
-
- nsIDOMElement inputElement = (nsIDOMElement) entry0
- .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
-
- inputElement
- .setAttribute(HTML.ATTR_CLASS, getInputClass(sourceElement));
-
- inputElement
- .setAttribute(HTML.ATTR_STYLE, getInputStyle(sourceElement));
-
- inputElement.setAttribute(HTML.ATTR_SIZE, getInputSize(sourceElement));
- inputElement
- .setAttribute(HTML.ATTR_VALUE, getInputValue(sourceElement));
-
- // 3. Set a style for main container
- String strStyle = getAttribute(sourceElement, RichFaces.ATTR_STYLE);
- table.setAttribute(HTML.ATTR_STYLE, strStyle);
- }
-
- public String getDefaultInputSize() {
- return DEFAULT_INPUT_SIZE;
- }
-
- public String getDefaultInputClass() {
- return DEFAULT_INPUT_STYLE;
- }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.richfaces.template;
+
+import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.mapping.AttributeData;
+import org.jboss.tools.vpe.editor.mapping.NodeData;
+import org.jboss.tools.vpe.editor.mapping.VpeElementData;
+import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * Template for input number spinner control
+ */
+public class RichFacesInputNumberSpinnerTemplate extends
+/* AbstractRichFacesInputNumberTemplate */AbstractEditableRichFacesTemplate {
+
+ /** CSS_FILE_NAME */
+ final static private String CSS_FILE_NAME = "inputNumberSpinner/inputNumberSpinner.css"; //$NON-NLS-1$
+
+ /** IMAGE_NAME_UP */
+ final static private String IMAGE_NAME_UP = "/inputNumberSpinner/up.gif"; //$NON-NLS-1$
+
+ /** IMAGE_NAME_DOWN */
+ final static private String IMAGE_NAME_DOWN = "/inputNumberSpinner/down.gif"; //$NON-NLS-1$
+
+ /** DEFAULT_INPUT_SIZE */
+ final static private String DEFAULT_INPUT_SIZE = "10"; //$NON-NLS-1$
+
+ /** DEFAULT_INPUT_STYLE */
+ final static private String DEFAULT_INPUT_STYLE = "dr-spnr-i"; //$NON-NLS-1$
+
+ /** DEFAULT_INPUT_CONTAINER_STYLE */
+ final static private String DEFAULT_INPUT_CONTAINER_STYLE = "dr-spnr-e"; //$NON-NLS-1$
+
+ /** DEFAULT_BUTTONS_STYLE */
+ final static private String DEFAULT_BUTTONS_STYLE = "dr-spnr-b"; //$NON-NLS-1$
+
+ /** DEFAULT_BUTTON_STYLE */
+ final static private String DEFAULT_BUTTON_STYLE = "dr-spnr-bn"; //$NON-NLS-1$
+
+ final static private String ZERO_STRING = "0"; //$NON-NLS-1$
+
+ /** DISABLED_INPUT_STYLE applied for INPUT tag element in case of DISABLING */
+ final static private String DISABLED_INPUT_STYLE = "color:gray"; //$NON-NLS-1$
+
+ /* RichFaces styles for component elements */
+ /** RICH_SPINNER_C_STYLE */
+ final static private String RICH_SPINNER_C_STYLE = "rich-spinner-c"; //$NON-NLS-1$
+
+ /** RICH_SPINNER_INPUT_CONTAINER_STYLE */
+ final static private String RICH_SPINNER_INPUT_CONTAINER_STYLE = "rich-spinner-input-container"; //$NON-NLS-1$
+
+ /** RICH_SPINNER_INPUT_STYLE */
+ final static private String RICH_SPINNER_INPUT_STYLE = "rich-spinner-input"; //$NON-NLS-1$
+
+ /** RICH_SPINNER_BUTTON_STYLE */
+ final static private String RICH_SPINNER_BUTTON_STYLE = "rich-spinner-button"; //$NON-NLS-1$
+
+ /** RICH_SPINNER_BUTTONS_STYLE */
+ final static private String RICH_SPINNER_BUTTONS_STYLE = "rich-spinner-buttons"; //$NON-NLS-1$
+
+ /**
+ * Creates a node of the visual tree on the node of the source tree. This
+ * visual node should not have the parent node This visual node can have
+ * child nodes.
+ *
+ * @param pageContext
+ * Contains the information on edited page.
+ * @param sourceNode
+ * The current node of the source tree.
+ * @param visualDocument
+ * The document of the visual tree.
+ * @return The information on the created node of the visual tree.
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ // Set a css for this element
+ ComponentUtil.setCSSLink(pageContext, CSS_FILE_NAME, "richFacesInputNumberSpinner"); //$NON-NLS-1$
+
+ Element sourceElement = (Element) sourceNode;
+
+ nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
+ table.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
+ table.setAttribute(HTML.ATTR_CELLPADDING, ZERO_STRING);
+ table.setAttribute(HTML.ATTR_CELLSPACING, ZERO_STRING);
+
+ VpeElementData elementData = new VpeElementData();
+
+ nsIDOMElement row = visualDocument.createElement(HTML.TAG_TR);
+
+ // create input element
+ nsIDOMElement cellInput = visualDocument.createElement(HTML.TAG_TD);
+ cellInput.setAttribute(HTML.ATTR_CLASS, DEFAULT_INPUT_CONTAINER_STYLE + " " //$NON-NLS-1$
+ + RICH_SPINNER_INPUT_CONTAINER_STYLE);
+ cellInput.appendChild(createInputElement(visualDocument, sourceElement, elementData));
+ row.appendChild(cellInput);
+
+ // create arrows cell
+ nsIDOMElement cellArrows = visualDocument.createElement(HTML.TAG_TD);
+ cellArrows.setAttribute(HTML.ATTR_CLASS, DEFAULT_BUTTONS_STYLE + " " //$NON-NLS-1$
+ + RICH_SPINNER_BUTTONS_STYLE);
+ cellArrows.appendChild(createArrowsElement(visualDocument, sourceNode));
+ row.appendChild(cellArrows);
+
+ table.appendChild(row);
+
+ String tmp = getAttribute(sourceElement, RichFaces.ATTR_STYLE);
+ table.setAttribute(HTML.ATTR_STYLE, tmp);
+ tmp = getAttribute(sourceElement, RichFaces.ATTR_STYLE_CLASS);
+ tmp = new StringBuffer().append(RICH_SPINNER_C_STYLE).append(" ").append(tmp).toString(); //$NON-NLS-1$
+ table.setAttribute(HTML.ATTR_CLASS, tmp);
+
+ // Create return variable contain template
+ VpeCreationData creationData = new VpeCreationData(table);
+
+ creationData.setElementData(elementData);
+
+ return creationData;
+ }
+
+ /**
+ * Create a HTML-part containg arrows elements
+ *
+ * @param visualDocument
+ * The current node of the source tree.
+ * @param sourceNode
+ * The document of the visual tree.
+ * @return a HTML-part containg arrows elements
+ */
+ private nsIDOMElement createArrowsElement(nsIDOMDocument visualDocument,
+ Node sourceNode) {
+ nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
+
+ table.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
+ table.setAttribute(HTML.ATTR_CELLPADDING, ZERO_STRING);
+ table.setAttribute(HTML.ATTR_CELLSPACING, ZERO_STRING);
+
+ nsIDOMElement rowUp = visualDocument.createElement(HTML.TAG_TR);
+ nsIDOMElement cellUp = visualDocument.createElement(HTML.TAG_TD);
+
+ nsIDOMElement imageUpElement = visualDocument.createElement(HTML.TAG_INPUT);
+
+ ComponentUtil.setImg(imageUpElement, IMAGE_NAME_UP);
+
+ imageUpElement.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
+ imageUpElement.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_IMAGE);
+ imageUpElement.setAttribute(HTML.ATTR_CLASS, DEFAULT_BUTTON_STYLE + " " //$NON-NLS-1$
+ + RICH_SPINNER_BUTTON_STYLE);
+
+ cellUp.appendChild(imageUpElement);
+ rowUp.appendChild(cellUp);
+ table.appendChild(rowUp);
+
+ nsIDOMElement rowDown = visualDocument.createElement(HTML.TAG_TR);
+ nsIDOMElement cellDown = visualDocument.createElement(HTML.TAG_TD);
+
+ nsIDOMElement imageDownElement = visualDocument.createElement(HTML.TAG_INPUT);
+
+ ComponentUtil.setImg(imageDownElement, IMAGE_NAME_DOWN);
+
+ imageDownElement.setAttribute(HTML.ATTR_BORDER, ZERO_STRING);
+ imageDownElement.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_IMAGE);
+ imageDownElement.setAttribute(HTML.ATTR_CLASS, DEFAULT_BUTTON_STYLE + " " //$NON-NLS-1$
+ + RICH_SPINNER_BUTTON_STYLE);
+ cellDown.appendChild(imageDownElement);
+ rowDown.appendChild(cellDown);
+ table.appendChild(rowDown);
+
+ return table;
+ }
+
+ /**
+ * Create a HTML-part containg input element
+ *
+ * @param visualDocument
+ * The current node of the source tree.
+ * @param sourceNode
+ * The document of the visual tree.
+ * @param elementData
+ * @return a HTML-part containg input element
+ */
+ private nsIDOMElement createInputElement(nsIDOMDocument visualDocument,
+ Element sourceElement, VpeElementData elementData) {
+ nsIDOMElement inputElement = visualDocument.createElement(HTML.TAG_INPUT);
+
+ inputElement.setAttribute(HTML.ATTR_CLASS, getInputClass(sourceElement));
+ inputElement.setAttribute(HTML.ATTR_STYLE, getInputStyle(sourceElement));
+ inputElement.setAttribute(HTML.ATTR_TYPE, HTML.VALUE_TYPE_TEXT);
+ inputElement.setAttribute(HTML.ATTR_SIZE, getInputSize(sourceElement));
+ inputElement.setAttribute(HTML.ATTR_VALUE, getInputValue(sourceElement));
+
+ if ((sourceElement).hasAttribute(RichFaces.ATTR_VALUE)) {
+ elementData.addNodeData(new NodeData(sourceElement
+ .getAttributeNode(RichFaces.ATTR_VALUE), inputElement, true));
+ } else {
+ elementData.addNodeData(new AttributeData(RichFaces.ATTR_VALUE, inputElement, true));
+ }
+
+ return inputElement;
+ }
+
+ /**
+ * Return a input value
+ *
+ * @param sourceNode
+ * a sourceNode
+ * @return a input value
+ */
+ private String getInputValue(Element sourceElement) {
+ String returnValue = getAttribute(sourceElement, RichFaces.ATTR_VALUE);
+ return returnValue;
+ }
+
+ /**
+ * Return a input style
+ *
+ * @param sourceNode
+ * a sourceNode
+ * @return a input style
+ */
+ private String getInputStyle(Element sourceElement) {
+ String returnValue = getAttribute(sourceElement, RichFaces.ATTR_INPUT_STYLE);
+ if ((sourceElement).hasAttribute(RichFaces.ATTR_DISABLED)) {
+ String disabled = getAttribute(sourceElement, RichFaces.ATTR_DISABLED);
+ if (disabled != null && disabled.equals("true")) { //$NON-NLS-1$
+ returnValue = new StringBuffer().append(returnValue).append(" ; ") //$NON-NLS-1$
+ .append(DISABLED_INPUT_STYLE).toString();
+ }
+ }
+
+ return returnValue;
+ }
+
+ /**
+ * Return a input size
+ *
+ * @param sourceNode
+ * a sourceNode
+ * @return a input size
+ */
+ protected String getInputSize(Element sourceElement) {
+ String returnValue = getDefaultInputSize();
+ String tmp = getAttribute(sourceElement, RichFaces.ATTR_INPUT_SIZE);
+ if (tmp.length() != 0) {
+ returnValue = tmp;
+ }
+ return returnValue;
+ }
+
+ /**
+ * Return a input class
+ *
+ * @param sourceNode
+ * a sourceNode
+ * @return a input class
+ */
+ public String getInputClass(Element sourceElement) {
+ String returnValue = getDefaultInputClass();
+ // append default richfaces component style class
+ returnValue += " " + RICH_SPINNER_INPUT_STYLE; //$NON-NLS-1$
+ // append custom input style class
+ String tmp = getAttribute(sourceElement, RichFaces.ATTR_INPUT_CLASS);
+ if (tmp.length() != 0) {
+ returnValue = new StringBuffer().append(returnValue).append(" ") //$NON-NLS-1$
+ .append(tmp).toString();
+ }
+ return returnValue;
+ }
+
+ /**
+ *
+ * @see com.exadel.vpe.editor.template.VpeAbstractTemplate#setAttribute(com.exadel.vpe.editor.context.VpePageContext,
+ * org.w3c.dom.Element, org.w3c.dom.Document, org.w3c.dom.Node,
+ * java.lang.Object, java.lang.String, java.lang.String)
+ */
+ @Override
+ public void setAttribute(VpePageContext pageContext, Element sourceElement,
+ nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data,
+ String name, String value) {
+ // 1. Call super method
+ super.setAttribute(pageContext, sourceElement, visualDocument, visualNode, data, name, value);
+
+ nsIDOMElement table = (nsIDOMElement) visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+ nsIDOMNodeList listTable = table.getChildNodes();
+ nsIDOMNode nodeTr = listTable.item(0);
+ nsIDOMNodeList listTr = nodeTr.getChildNodes();
+ nsIDOMNode nodeTd = listTr.item(0);
+
+ nsIDOMNodeList listTd = nodeTd.getChildNodes();
+ nsIDOMNode entry0 = listTd.item(0);
+
+ nsIDOMElement inputElement = (nsIDOMElement) entry0.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+
+ inputElement.setAttribute(HTML.ATTR_CLASS, getInputClass(sourceElement));
+ inputElement.setAttribute(HTML.ATTR_STYLE, getInputStyle(sourceElement));
+ inputElement.setAttribute(HTML.ATTR_SIZE, getInputSize(sourceElement));
+ inputElement.setAttribute(HTML.ATTR_VALUE, getInputValue(sourceElement));
+
+ // 3. Set a style for main container
+ String strStyle = getAttribute(sourceElement, RichFaces.ATTR_STYLE);
+ table.setAttribute(HTML.ATTR_STYLE, strStyle);
+ }
+
+ public String getDefaultInputSize() {
+ return DEFAULT_INPUT_SIZE;
+ }
+
+ public String getDefaultInputClass() {
+ return DEFAULT_INPUT_STYLE;
+ }
+}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-11-05 17:04:43 UTC (rev 11529)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-11-05 17:20:00 UTC (rev 11530)
@@ -1,17 +1,20 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
-
-<head>
-</head>
-<body>
-<f:view>
- <rich:inputNumberSpinner id="inputNumberSpinner" value="50">
- </rich:inputNumberSpinner>
-</f:view>
-</body>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+<head>
+</head>
+<body>
+<f:view>
+ <rich:inputNumberSpinner id="inputNumberSpinner" value="50">
+ </rich:inputNumberSpinner>
+ <rich:inputNumberSpinner id="inputNumberSpinnerCustomCSS" value="50"
+ styleClass="componentStyleClass" inputClass="inputStyleClass"
+ inputStyle="font-style: italic;">
+ </rich:inputNumberSpinner>
+</f:view>
+</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml 2008-11-05 17:04:43 UTC (rev 11529)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml 2008-11-05 17:20:00 UTC (rev 11530)
@@ -1,25 +1,26 @@
<tests>
<test id="inputNumberSpinner">
- <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" >
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" STYLE=""
+ CLASS="rich-spinner-c">
<TR>
- <TD VALIGN="top" CLASS="ins-dr-spnr-e">
- <INPUT TYPE="text" CLASS="ins-input" STYLE="" SIZE="10"
- VALUE="50"/>
+ <TD CLASS="dr-spnr-e rich-spinner-input-container">
+ <INPUT TYPE="text" CLASS="dr-spnr-i rich-spinner-input"
+ STYLE="" SIZE="10" VALUE="50" />
</TD>
- <TD VALIGN="middle" CLASS="dr-spnr-b">
+ <TD CLASS="dr-spnr-b rich-spinner-buttons">
<TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
<TR>
<TD>
<INPUT TYPE="image" BORDER="0"
SRC="/.*resources/inputNumberSpinner/up.gif/"
- CLASS="dr-spnr-bn"/>
+ CLASS="dr-spnr-bn rich-spinner-button" />
</TD>
</TR>
<TR>
<TD>
<INPUT TYPE="image" BORDER="0"
SRC="/.*resources/inputNumberSpinner/down.gif/"
- CLASS="dr-spnr-bn"/>
+ CLASS="dr-spnr-bn rich-spinner-button" />
</TD>
</TR>
</TABLE>
@@ -27,4 +28,33 @@
</TR>
</TABLE>
</test>
+ <test id="inputNumberSpinnerCustomCSS">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" STYLE=""
+ CLASS="rich-spinner-c componentStyleClass">
+ <TR>
+ <TD CLASS="dr-spnr-e rich-spinner-input-container">
+ <INPUT TYPE="text" CLASS="dr-spnr-i rich-spinner-input inputStyleClass"
+ STYLE="font-style: italic;" SIZE="10" VALUE="50" />
+ </TD>
+ <TD CLASS="dr-spnr-b rich-spinner-buttons">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <INPUT TYPE="image" BORDER="0"
+ SRC="/.*resources/inputNumberSpinner/up.gif/"
+ CLASS="dr-spnr-bn rich-spinner-button" />
+ </TD>
+ </TR>
+ <TR>
+ <TD>
+ <INPUT TYPE="image" BORDER="0"
+ SRC="/.*resources/inputNumberSpinner/down.gif/"
+ CLASS="dr-spnr-bn rich-spinner-button" />
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ </TABLE>
+ </test>
</tests>
\ No newline at end of file
16 years, 2 months
JBoss Tools SVN: r11529 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-11-05 12:04:43 -0500 (Wed, 05 Nov 2008)
New Revision: 11529
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3011, code adjustment.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java 2008-11-05 17:00:13 UTC (rev 11528)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfForm.java 2008-11-05 17:04:43 UTC (rev 11529)
@@ -31,16 +31,13 @@
*/
public class JsfForm extends VpeAbstractTemplate {
- private static String TABLE_WIDTH_STYLE = "width: 100%;"; //$NON-NLS-1$
+ private static String CONTENT_DIV_STYLE = "width: 100%; display: table; "; //$NON-NLS-1$
private static final String DIR_VALUE_RTL = "RTL"; //$NON-NLS-1$
private static final String DIR_VALUE_LTR = "LTR"; //$NON-NLS-1$
- /* Attributes of h:form */
- private static final String DIR = "dir"; //$NON-NLS-1$
- private static final String STYLE = "style"; //$NON-NLS-1$
+ private static final String SPACE = " "; //$NON-NLS-1$
private static final String STYLE_CLASS = "styleClass"; //$NON-NLS-1$
- private static final String CLASS = "class"; //$NON-NLS-1$
private String dir;
private String style;
@@ -59,31 +56,21 @@
nsIDOMDocument visualDocument) {
Element sourceElement = (Element)sourceNode;
readAttributes(sourceElement);
- nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
- nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
- nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
nsIDOMElement content_div = visualDocument.createElement(HTML.TAG_DIV);
+ content_div.setAttribute(HTML.ATTR_STYLE, CONTENT_DIV_STYLE + SPACE + style);
- if (attrPresents(style)) {
- content_div.setAttribute(STYLE, style);
- }
if (attrPresents(styleClass)) {
- content_div.setAttribute(CLASS, styleClass);
+ content_div.setAttribute(HTML.ATTR_CLASS, styleClass);
}
if (attrPresents(dir)
&& (dir.equalsIgnoreCase(DIR_VALUE_RTL)
|| dir.equalsIgnoreCase(DIR_VALUE_LTR))) {
- content_div.setAttribute(DIR, dir);
+ content_div.setAttribute(HTML.ATTR_DIR, dir);
}
- table.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, TABLE_WIDTH_STYLE);
-
- td.appendChild(content_div);
- tr.appendChild(td);
- table.appendChild(tr);
-
- VpeCreationData creationData = new VpeCreationData(table);
+
+ VpeCreationData creationData = new VpeCreationData(content_div);
VpeChildrenInfo divInfo = new VpeChildrenInfo(content_div);
creationData.addChildrenInfo(divInfo);
@@ -127,9 +114,9 @@
* the source node
*/
private void readAttributes(Element sourceElement) {
- style = sourceElement.getAttribute(STYLE);
+ style = sourceElement.getAttribute(HTML.ATTR_STYLE);
styleClass = sourceElement.getAttribute(STYLE_CLASS);
- dir = sourceElement.getAttribute(DIR);
+ dir = sourceElement.getAttribute(HTML.ATTR_DIR);
}
/**
16 years, 2 months
JBoss Tools SVN: r11528 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-05 12:00:13 -0500 (Wed, 05 Nov 2008)
New Revision: 11528
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2829
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05 16:57:13 UTC (rev 11527)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05 17:00:13 UTC (rev 11528)
@@ -616,12 +616,12 @@
} else {
if (sourceElement.hasAttribute(RichFaces.ATTR_BUTTON_ICON))
- buttonIcon = Constants.FILE_PREFIX
- + ComponentUtil.getAbsoluteWorkspacePath(sourceElement
+ buttonIcon = ComponentUtil.getAbsoluteWorkspacePath(sourceElement
.getAttribute(RichFaces.ATTR_BUTTON_ICON),
pageContext);
else {
- buttonIcon = ComponentUtil
+ buttonIcon = Constants.FILE_PREFIX
+ + ComponentUtil
.getAbsoluteResourcePath(DEFAULT_BUTTON_ICON);
}
}
16 years, 2 months
JBoss Tools SVN: r11527 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-11-05 11:57:13 -0500 (Wed, 05 Nov 2008)
New Revision: 11527
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2829
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-11-05 14:54:55 UTC (rev 11526)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-11-05 16:57:13 UTC (rev 11527)
@@ -27,6 +27,7 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.ElService;
import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
@@ -231,7 +232,7 @@
if (uri.isAbsolute() || (new File(resolvedValue)).exists())
return resolvedValue;
- return FileUtil.getFile(resolvedValue, file).getLocation().toOSString();
+ return Constants.FILE_PREFIX+FileUtil.getFile(resolvedValue, file).getLocation().toOSString();
}
/**
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05 14:54:55 UTC (rev 11526)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-11-05 16:57:13 UTC (rev 11527)
@@ -341,8 +341,8 @@
List<Cell> footerContent = new ArrayList<Cell>();
if (showTodayControl)
footerContent.add(new Cell(TODAY_CONTROL,
- CSS_R_C_TOOLFOOTER,showTodayControl
- && showApplyButton ));
+ CSS_R_C_TOOLFOOTER, showTodayControl
+ && showApplyButton));
if (popup && showApplyButton)
footerContent.add(new Cell(APPLY_CONTROL,
CSS_R_C_TOOLFOOTER, false, true));
@@ -609,15 +609,17 @@
.getAttribute(RichFaces.ATTR_BUTTON_ICON_DISABLED),
pageContext);
else {
- buttonIcon = ComponentUtil
- .getAbsoluteResourcePath(DEFAULT_BUTTON_ICON_DISABLED);
+ buttonIcon = Constants.FILE_PREFIX
+ + ComponentUtil
+ .getAbsoluteResourcePath(DEFAULT_BUTTON_ICON_DISABLED);
}
} else {
if (sourceElement.hasAttribute(RichFaces.ATTR_BUTTON_ICON))
- buttonIcon = ComponentUtil.getAbsoluteWorkspacePath(
- sourceElement.getAttribute(RichFaces.ATTR_BUTTON_ICON),
- pageContext);
+ buttonIcon = Constants.FILE_PREFIX
+ + ComponentUtil.getAbsoluteWorkspacePath(sourceElement
+ .getAttribute(RichFaces.ATTR_BUTTON_ICON),
+ pageContext);
else {
buttonIcon = ComponentUtil
.getAbsoluteResourcePath(DEFAULT_BUTTON_ICON);
16 years, 2 months