Author: scabanovich Date: 2010-11-12 04:04:58 -0500 (Fri, 12 Nov 2010) New Revision: 26489 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java Log: JBIDE-7563 https://jira.jboss.org/browse/JBIDE-7563 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2010-11-12 09:03:56 UTC (rev 26488) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2010-11-12 09:04:58 UTC (rev 26489) @@ -16,13 +16,13 @@ public class UIMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.common.model.ui.messages.messages";//$NON-NLS-1$ - static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, UIMessages.class); } public static String CANNOT_DISPLAY_DOCUMENT_CONTENTS; public static String PROPERTIES_EDITOR_FILTER; + public static String PROPERTIES_EDITOR_FILTER_SIMPLE; public static String PROPERTIES_EDITOR_FILTER_MATCHES; public static String PROPERTIES_EDITOR_EXPRESSION; public static String PROPERTIES_EDITOR_ILLEGAL_NAME_EXPRESSION; @@ -32,7 +32,4 @@ public static String REPORT_PROBLEM_NO_DESCRIPTION; public static String REPORT_PROBLEM_RESULT; public static String REPORT_PROBLEM_COPY_BUTTON; - public static String PROPERTIES_EDITOR_FILTER_REGULAR = PROPERTIES_EDITOR_EXPRESSION; - public static String PROPERTIES_EDITOR_FILTER_SIMPLE = PROPERTIES_EDITOR_FILTER; - } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2010-11-12 09:03:56 UTC (rev 26488) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2010-11-12 09:04:58 UTC (rev 26489) @@ -1,9 +1,10 @@ CANNOT_DISPLAY_DOCUMENT_CONTENTS=Cannot display document contents. PROPERTIES_EDITOR_FILTER=Filter -PROPERTIES_EDITOR_EXPRESSION=Expression +PROPERTIES_EDITOR_FILTER_SIMPLE=(* = any string, ? = any character, \\ = escape for literals * ? \\) +PROPERTIES_EDITOR_EXPRESSION=Regular Expression PROPERTIES_EDITOR_ILLEGAL_NAME_EXPRESSION=Illegal name expression: {0} PROPERTIES_EDITOR_ILLEGAL_VALUE_EXPRESSION=Illegal value expression: {0} -PROPERTIES_EDITOR_FILTER_MATCHES=Filter matched {0} out of {1} items. +PROPERTIES_EDITOR_FILTER_MATCHES=(matches {0} out of {1} items) REPORT_PROBLEM_DESCRIPTION=This wizard takes the description and info below and in addition collects various logs from eclipse and creates a zipped file which can be attached to issues or emails when reporting problems. REPORT_PROBLEM_NO_DESCRIPTION=Description must be set. Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2010-11-12 09:03:56 UTC (rev 26488) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2010-11-12 09:04:58 UTC (rev 26489) @@ -136,7 +136,7 @@ vsupport.getPropertyEditorAdapterByName(ATTR_VALUE).setValue(pHelper.valueFilter); ExpandableComposite g = filterComposite = new ExpandableComposite(panel, SWT.NONE); - g.setText(UIMessages.PROPERTIES_EDITOR_FILTER_REGULAR); + g.setText(UIMessages.PROPERTIES_EDITOR_FILTER); g.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Composite g1 = new Composite(g, SWT.NONE); GridLayout l1 = new GridLayout(3, false); @@ -243,7 +243,7 @@ isFilterExpression = fake.getSelection(); pHelper.applyFilters(); // if(fake.getSelection()) { -// g.setText(UIMessages.PROPERTIES_EDITOR_FILTER_REGULAR); +// g.setText(UIMessages.PROPERTIES_EDITOR_FILTER); // } else { // g.setText(UIMessages.PROPERTIES_EDITOR_FILTER_SIMPLE); // g.layout(); @@ -538,9 +538,9 @@ statistics.setText(""); } if(filtered != total) { - filterComposite.setText(UIMessages.PROPERTIES_EDITOR_FILTER_REGULAR + " " + NLS.bind(UIMessages.PROPERTIES_EDITOR_FILTER_MATCHES, filtered, total)); + filterComposite.setText(UIMessages.PROPERTIES_EDITOR_FILTER + " " + NLS.bind(UIMessages.PROPERTIES_EDITOR_FILTER_MATCHES, filtered, total)); } else { - filterComposite.setText(UIMessages.PROPERTIES_EDITOR_FILTER_REGULAR); + filterComposite.setText(UIMessages.PROPERTIES_EDITOR_FILTER); } filterComposite.layout(); statistics.update();