[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders ...
Robert Stryker
rawblem at gmail.com
Thu Sep 21 17:37:15 EDT 2006
User: rawb
Date: 06/09/21 17:37:15
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders
InactiveExtensionViewProvider.java
DescriptorXPathViewProvider.java
EventLogViewProvider.java
Log:
final NLS stuff
Revision Changes Path
1.4 +2 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/InactiveExtensionViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InactiveExtensionViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/InactiveExtensionViewProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- InactiveExtensionViewProvider.java 31 Jul 2006 19:43:42 -0000 1.3
+++ InactiveExtensionViewProvider.java 21 Sep 2006 21:37:15 -0000 1.4
@@ -32,8 +32,8 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.jboss.ide.eclipse.as.core.util.ASDebug;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider;
import org.jboss.ide.eclipse.as.ui.views.JBossServerView;
@@ -126,7 +126,7 @@
} );
}
};
- act.setText("Re-Enable Category");
+ act.setText(Messages.InactiveCategoriesReEnable);
menu.add(act);
}
}
1.7 +19 -22 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/DescriptorXPathViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DescriptorXPathViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/DescriptorXPathViewProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DescriptorXPathViewProvider.java 20 Sep 2006 18:45:54 -0000 1.6
+++ DescriptorXPathViewProvider.java 21 Sep 2006 21:37:15 -0000 1.7
@@ -89,6 +89,7 @@
import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper.XPathPreferenceTreeItem;
import org.jboss.ide.eclipse.as.core.util.ASDebug;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider;
import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathCategoryDialog;
import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathDialog;
@@ -164,9 +165,8 @@
if( selected instanceof SimpleXPathPreferenceTreeItem && ((SimpleXPathPreferenceTreeItem)selected).getParent().equals(getRoot())) {
int style = SWT.APPLICATION_MODAL | SWT.YES | SWT.NO;
MessageBox messageBox = new MessageBox (Display.getCurrent().getActiveShell(), style);
- messageBox.setText ("Remove Category?");
- messageBox.setMessage ("Are you sure you want to delete this category and\nall of its elements?"
- + " All sub-nodes will be lost.");
+ messageBox.setText (Messages.DescriptorXPathRemoveCategory + "?");
+ messageBox.setMessage (Messages.DescriptorXPathRemoveCategoryDesc);
if( messageBox.open () == SWT.YES ) {
getRoot().deleteChild(((SimpleXPathPreferenceTreeItem)selected));
ServerAttributeHelper helper = jbServer.getAttributeHelper();
@@ -178,7 +178,7 @@
}
}
};
- deleteXPathCategoryAction.setText("Remove Category");
+ deleteXPathCategoryAction.setText(Messages.DescriptorXPathRemoveCategoryDesc);
newXPathAction = new Action() {
@@ -206,7 +206,7 @@
}
}
};
- newXPathAction.setText("New XPath");
+ newXPathAction.setText(Messages.DescriptorXPathNewXPath);
editXPathAction = new Action() {
public void run() {
@@ -233,7 +233,7 @@
}
}
};
- editXPathAction.setText("Edit XPath");
+ editXPathAction.setText(Messages.DescriptorXPathEditXPath);
deleteXPathAction = new Action() {
public void run() {
@@ -248,7 +248,7 @@
}
}
};
- deleteXPathAction.setText("Delete XPath");
+ deleteXPathAction.setText(Messages.DescriptorXPathDeleteXPath);
}
public void addListeners() {
@@ -267,8 +267,6 @@
menu.add(this.deleteXPathCategoryAction);
menu.add(new Separator());
}
-
- ASDebug.p("serverViewerSelection is " + selection, this);
}
public Object getServerViewSelection() {
@@ -396,12 +394,12 @@
if( simple ) {
getLabelProvider().setSimple(true);
column3.setText("");
- column2.setText("Attribute Value");
+ column2.setText(Messages.DescriptorXPathAttributeValue);
xpathTreeViewer.refresh();
} else {
getLabelProvider().setSimple(false);
- column3.setText("XPath / XML");
- column2.setText("Attribute Key / Value");
+ column3.setText(Messages.DescriptorXPathXPathXML);
+ column2.setText(Messages.DescriptorXPathAttributeKeyValue);
xpathTreeViewer.refresh();
}
} catch ( Exception e ) {
@@ -430,7 +428,6 @@
if( input == ((ContentWrapper)element).getElement() ) return;
input = ((ContentWrapper)element).getElement();
- ASDebug.p("Selection changed to " + input, this);
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
final IProgressMonitor monitor2 = monitor;
@@ -659,7 +656,7 @@
int groupWidth = 500;
- xPathGroup.setText("Descriptor Values");
+ xPathGroup.setText(Messages.DescriptorXPathDescriptorValues);
FormData groupData = new FormData();
groupData.right = new FormAttachment(100, -5);
groupData.left = new FormAttachment(0, 5);
@@ -677,9 +674,9 @@
column2 = new TreeColumn(xpathTree, SWT.NONE);
column3 = new TreeColumn(xpathTree, SWT.NONE);
- column.setText("Name / Location");
- column2.setText("Attribute Key / Value");
- column3.setText("XPath / XML");
+ column.setText(Messages.DescriptorXPathNameLocation);
+ column2.setText(Messages.DescriptorXPathAttributeKeyValue);
+ column3.setText(Messages.DescriptorXPathXPathXML);
column.setWidth(groupWidth * 7 / 20);
column2.setWidth(groupWidth * 6 / 20);
@@ -927,13 +924,13 @@
portComp.setLayout(new RowLayout(SWT.VERTICAL));
Label nameLabel = new Label(portComp, SWT.NONE);
- nameLabel.setText("Server Name: ");
+ nameLabel.setText(Messages.DescriptorXPathServerName);
serversCombo = new Combo(portComp, SWT.READ_ONLY);
serversCombo.setItems(serverNames);
Label categoryLabel = new Label(portComp, SWT.NONE);
- categoryLabel.setText("Port Category: ");
+ categoryLabel.setText(Messages.DescriptorXPathPortCategory);
portsCategoryCombo = new Combo(portComp, SWT.READ_ONLY);
@@ -1017,8 +1014,8 @@
simple = new Button(c, SWT.RADIO);
complex = new Button(c, SWT.RADIO);
- simple.setText("Show only xpath value in properties view.");
- complex.setText("Show all details in properties view.");
+ simple.setText(Messages.DescriptorXPathSimple);
+ complex.setText(Messages.DescriptorXPathComplex);
boolean prefVal = JBossServerUIPlugin.getDefault().getPreferenceStore().getBoolean(PREFERENCE_KEY);
simple.setSelection(prefVal == SIMPLE);
@@ -1079,7 +1076,7 @@
if( element instanceof XPathTreeItem2) {
XPathTreeItem2 element2 = (XPathTreeItem2)element;
- if( columnIndex == 0 ) return "Match " + element2.getIndex();
+ if( columnIndex == 0 ) return Messages.DescriptorXPathMatch + element2.getIndex();
if( columnIndex == 1 ) return element2.getText();
if( columnIndex == 2 && !simple) return element2.elementAsXML();
}
1.8 +16 -17 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EventLogViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- EventLogViewProvider.java 9 Aug 2006 19:27:07 -0000 1.7
+++ EventLogViewProvider.java 21 Sep 2006 21:37:15 -0000 1.8
@@ -55,8 +55,8 @@
import org.jboss.ide.eclipse.as.core.server.JBossServer;
import org.jboss.ide.eclipse.as.core.server.JBossServerBehavior.PublishLogEvent;
import org.jboss.ide.eclipse.as.core.server.ServerStateChecker.StateCheckerLogEvent;
-import org.jboss.ide.eclipse.as.core.util.ASDebug;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin.ServerViewProvider;
import org.jboss.ide.eclipse.as.ui.viewproviders.PropertySheetFactory.PropertiesTextSashPropertiesPage;
import org.jboss.ide.eclipse.as.ui.views.JBossServerView;
@@ -83,7 +83,6 @@
}
public void fillContextMenu(Shell shell, IMenuManager menu, Object selection) {
- ASDebug.p("Inside fill context menu, selection is " + selection, this);
}
public ITreeContentProvider getContentProvider() {
@@ -102,48 +101,48 @@
if( event.getEventType() == StateCheckerLogEvent.BEFORE) {
boolean expected = event.getExpectedState();
- return (expected == true ? "Starting Server" : "Stopping Server");
+ return (expected == true ? Messages.EventLogStartingServer : Messages.EventLogStoppingServer);
}
if( event.getEventType() == StateCheckerLogEvent.AFTER ) {
boolean current = (event.getCurrentState() == StateCheckerLogEvent.SERVER_UP);
- return current ? "Server is up." : "Server is down.";
+ return current ? Messages.EventLogServerUp : Messages.EventLogServerDown;
}
if( event.getEventType() == StateCheckerLogEvent.DURING) {
- String ret = "Twiddle Launch: Server is ";
- if( event.getCurrentState() == StateCheckerLogEvent.SERVER_STARTING ) ret += "still starting";
- if( event.getCurrentState() == StateCheckerLogEvent.SERVER_STOPPING ) ret += "still stopping";
- if( event.getCurrentState() == StateCheckerLogEvent.SERVER_UP ) ret += "up";
- if( event.getCurrentState() == StateCheckerLogEvent.SERVER_DOWN ) ret += "down";
+ String ret = Messages.EventLogTwiddleLaunchServerStatePrefix;
+ if( event.getCurrentState() == StateCheckerLogEvent.SERVER_STARTING ) ret += Messages.EventLogStillStarting;
+ if( event.getCurrentState() == StateCheckerLogEvent.SERVER_STOPPING ) ret += Messages.EventLogStillStopping;
+ if( event.getCurrentState() == StateCheckerLogEvent.SERVER_UP ) ret += Messages.EventLogUp;
+ if( event.getCurrentState() == StateCheckerLogEvent.SERVER_DOWN ) ret += Messages.EventLogDown;
return ret;
}
if( event.getEventType() == StateCheckerLogEvent.SERVER_STATE_CHANGE_CANCELED) {
- String ret = "Server action canceled.";
+ String ret = Messages.EventLogServerActionCanceled;
return ret;
}
if( event.getEventType() == StateCheckerLogEvent.SERVER_STATE_CHANGE_TIMEOUT) {
- String ret = "Server Timeout Reached.";
+ String ret = Messages.EventLogTimeoutReached;
return ret;
}
}
if( obj instanceof ConsoleLogEvent) {
- return "Console Output";
+ return Messages.EventLogConsoleOutput;
}
if( obj instanceof PublishLogEvent ) {
PublishLogEvent publishEvent = ((PublishLogEvent)obj);
if( publishEvent.getEventType() == PublishLogEvent.ROOT) {
- return "Publish Event";
+ return Messages.EventLogPublishEvent;
}
if( publishEvent.getEventType() == PublishLogEvent.PUBLISH) {
- return "Publishing module to server: " + publishEvent.getModuleName();
+ return Messages.EventLogPublishingToServer + publishEvent.getModuleName();
}
if( publishEvent.getEventType() == PublishLogEvent.UNPUBLISH) {
- return "Removing module from server: " + publishEvent.getModuleName();
+ return Messages.EventLogPublishRemoveFromServer + publishEvent.getModuleName();
}
- return "Unknown Publish Event";
+ return Messages.EventLogPublishUnknownEvent;
}
if( obj instanceof ExceptionLogEvent ) {
ExceptionLogEvent event = ((ExceptionLogEvent)obj);
@@ -154,7 +153,7 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd hh:mm:ss.S");
String eventToString;
if( event.getEventType() == ProcessLogEvent.UNKNOWN ) {
- eventToString = "Unknown Event";
+ eventToString = Messages.EventLogUnknownEvent;
} else {
eventToString = event.toString();
}
More information about the jboss-cvs-commits
mailing list