tmf: Give proper names to SD messages variables
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Wed, 8 May 2013 22:15:14 +0000 (18:15 -0400)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Thu, 9 May 2013 17:28:33 +0000 (13:28 -0400)
This should please Sonar.

Change-Id: I0de8cc4e541d966d7b3c8483c30f9d9cc2d4bd4a
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/12663
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
26 files changed:
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/DrawableToolTip.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDView.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/SDWidget.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/Criteria.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/FilterListDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/MinMaxDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/PagesDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SDPrintDialogUI.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/SearchFilterDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/dialogs/TabContents.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/FirstPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/KeyBindingsManager.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/LastPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/NextPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFiltersDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDFindDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/OpenSDPagesDialog.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/PrevPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/handlers/Zoom.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewPref.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/preferences/SDViewerPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/Messages.java [new file with mode: 0755]
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SDMessages.java [deleted file]
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/messages.properties

index fbeeb451be0b0bd3ddb40b774133e51ce690df30..4bcfb92f3ed470a8ea5a21c17b0acabbd8be38c1 100755 (executable)
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd;
 
 import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
@@ -243,7 +243,7 @@ public class DrawableToolTip implements PaintListener {
 
     @Override
     public void paintControl(PaintEvent event) {
-        fMessage = SDMessages._138 + " " +  fCurrentValue.toString(); //$NON-NLS-1$
+        fMessage = Messages.SequenceDiagram_Delta + " " +  fCurrentValue.toString(); //$NON-NLS-1$
         Point size = event.gc.textExtent(fMessage);
         if (size.x < fScaleLength) {
             size.x = fScaleLength;
@@ -282,11 +282,11 @@ public class DrawableToolTip implements PaintListener {
                 event.gc.fillRectangle(fHorMargin + i * step, fVertMargin + fTextScaleMargin + size.y - 5, step, 11);
             }
             if (i == 0) {
-                event.gc.drawText(SDMessages._56, fHorMargin, size.y + 2 * fVertMargin + fTextScaleMargin, true);
+                event.gc.drawText(Messages.SequenceDiagram_Min, fHorMargin, size.y + 2 * fVertMargin + fTextScaleMargin, true);
             }
             if (i == 0) {
-                int len = event.gc.textExtent(SDMessages._55).x;
-                event.gc.drawText(SDMessages._55, fHorMargin + fScaleLength - len + 1, size.y + 2 * fVertMargin + fTextScaleMargin, true);
+                int len = event.gc.textExtent(Messages.SequenceDiagram_Max).x;
+                event.gc.drawText(Messages.SequenceDiagram_Max, fHorMargin + fScaleLength - len + 1, size.y + 2 * fVertMargin + fTextScaleMargin, true);
             }
             int lineWidth = 10;
             if ((i == 0) || (i == 10)) {
index 05993f9bd3b6802453348cf5ac41878fbc64474f..504b7fac1493d0bfe804503e838f44ca312a1918 100644 (file)
@@ -60,7 +60,7 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPagingPro
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDPropertiesProvider;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.IUml2SDLoader;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.LoadersManager;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.layout.GridData;
@@ -474,12 +474,12 @@ public class SDView extends ViewPart {
             GraphNode node = getSDWidget().fCurrentGraphNode;
             if ((node instanceof SyncMessageReturn) && (((SyncMessageReturn) node).getMessage() != null)) {
                 Action goToMessage = new MoveToMessage(this);
-                goToMessage.setText(SDMessages._39);
+                goToMessage.setText(Messages.SequenceDiagram_GoToMessage);
                 manager.add(goToMessage);
             }
             if ((node instanceof SyncMessage) && (((SyncMessage) node).getMessageReturn() != null)) {
                 Action goToMessage = new MoveToMessage(this);
-                goToMessage.setText(SDMessages._40);
+                goToMessage.setText(Messages.SequenceDiagram_GoToMessageReturn);
                 manager.add(goToMessage);
             }
         }
@@ -542,17 +542,17 @@ public class SDView extends ViewPart {
         bar.getMenuManager().appendToGroup("UML2SD_OTHER_COMMANDS", zoomOut);//$NON-NLS-1$
         bar.getToolBarManager().appendToGroup("UML2SD_OTHER_COMMANDS", zoomOut); //$NON-NLS-1$
 
-        MenuManager navigation = new MenuManager(SDMessages._77);
+        MenuManager navigation = new MenuManager(Messages.SequenceDiagram_Navigation);
 
         ShowNodeStart showNodeStart = new ShowNodeStart(this);
-        showNodeStart.setText(SDMessages.uml_25);
+        showNodeStart.setText(Messages.SequenceDiagram_ShowNodeStart);
 
         showNodeStart.setId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart");//$NON-NLS-1$
         showNodeStart.setActionDefinitionId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart");//$NON-NLS-1$
         navigation.add(showNodeStart);
 
         ShowNodeEnd showNodeEnd = new ShowNodeEnd(this);
-        showNodeEnd.setText(SDMessages.uml_23);
+        showNodeEnd.setText(Messages.SequenceDiagram_ShowNodeEnd);
 
         showNodeEnd.setId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd");//$NON-NLS-1$
         showNodeEnd.setActionDefinitionId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd");//$NON-NLS-1$
@@ -561,7 +561,7 @@ public class SDView extends ViewPart {
         bar.getMenuManager().appendToGroup("UML2SD_OTHER_COMMANDS", navigation); //$NON-NLS-1$
 
         ConfigureMinMax minMax = new ConfigureMinMax(this);
-        minMax.setText(SDMessages.uml_45);
+        minMax.setText(Messages.SequenceDiagram_ConfigureMinMax);
         minMax.setId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ConfigureMinMax");//$NON-NLS-1$
         bar.getMenuManager().appendToGroup("UML2SD_OTHER_COMMANDS", minMax); //$NON-NLS-1$
 
@@ -605,7 +605,7 @@ public class SDView extends ViewPart {
                     action.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_FILTERS));
                 }
                 if (action.getText() == null || action.getText().length() == 0) {
-                    action.setText(SDMessages._42);
+                    action.setText(Messages.SequenceDiagram_EditFilters);
                 }
                 bar.getMenuManager().prependToGroup("UML2SD_FILTERING", action); //$NON-NLS-1$
                 bar.getToolBarManager().prependToGroup("UML2SD_FILTERING", action); //$NON-NLS-1$
@@ -637,7 +637,7 @@ public class SDView extends ViewPart {
                     action.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_SEARCH_SEQ));
                 }
                 if (action.getText() == null) {
-                    action.setText(SDMessages._41);
+                    action.setText(Messages.SequenceDiagram_Find + "..."); //$NON-NLS-1$
                 }
                 bar.getMenuManager().appendToGroup("UML2SD_OTHER_COMMANDS", action); //$NON-NLS-1$
                 bar.getToolBarManager().appendToGroup("UML2SD_OTHER_COMMANDS", action); //$NON-NLS-1$
index 25c8039a92ea0741a445fc9a5934b923f31bb3f9..93866f46cefd2eeb6de2bf312a73da026594dd1a 100755 (executable)
@@ -40,7 +40,7 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDCollapseP
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.load.LoadersManager;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.ISDPreferences;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.preferences.SDViewPref;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.accessibility.ACC;
 import org.eclipse.swt.accessibility.Accessible;
@@ -291,23 +291,23 @@ public class SDWidget extends ScrollView implements SelectionListener,
                 } else {
                     if (getFocusNode() != null) {
                         if (getFocusNode() instanceof Lifeline) {
-                            e.result = MessageFormat.format(SDMessages._1, new Object[] { String.valueOf(getFocusNode().getName()) });
+                            e.result = MessageFormat.format(Messages.SequenceDiagram_LifelineNode, new Object[] { String.valueOf(getFocusNode().getName()) });
                         }
                         if (getFocusNode() instanceof BaseMessage) {
                             BaseMessage mes = (BaseMessage) getFocusNode();
                             if ((mes.getStartLifeline() != null) && (mes.getEndLifeline() != null)) {
                                 e.result = MessageFormat.format(
-                                        SDMessages._2,
+                                        Messages.SequenceDiagram_MessageNode,
                                         new Object[] { String.valueOf(mes.getName()), String.valueOf(mes.getStartLifeline().getName()), Integer.valueOf(mes.getStartOccurrence()), String.valueOf(mes.getEndLifeline().getName()),
                                                 Integer.valueOf(mes.getEndOccurrence()) });
                             } else if ((mes.getStartLifeline() == null) && (mes.getEndLifeline() != null)) {
-                                e.result = MessageFormat.format(SDMessages._4, new Object[] { String.valueOf(mes.getName()), String.valueOf(mes.getEndLifeline().getName()), Integer.valueOf(mes.getEndOccurrence()) });
+                                e.result = MessageFormat.format(Messages.SequenceDiagram_FoundMessageNode, new Object[] { String.valueOf(mes.getName()), String.valueOf(mes.getEndLifeline().getName()), Integer.valueOf(mes.getEndOccurrence()) });
                             } else if ((mes.getStartLifeline() != null) && (mes.getEndLifeline() == null)) {
-                                e.result = MessageFormat.format(SDMessages._3, new Object[] { String.valueOf(mes.getName()), String.valueOf(mes.getStartLifeline().getName()), Integer.valueOf(mes.getStartOccurrence()) });
+                                e.result = MessageFormat.format(Messages.SequenceDiagram_LostMessageNode, new Object[] { String.valueOf(mes.getName()), String.valueOf(mes.getStartLifeline().getName()), Integer.valueOf(mes.getStartOccurrence()) });
                             }
                         } else if (getFocusNode() instanceof BasicExecutionOccurrence) {
                             BasicExecutionOccurrence exec = (BasicExecutionOccurrence) getFocusNode();
-                            e.result = MessageFormat.format(SDMessages._5,
+                            e.result = MessageFormat.format(Messages.SequenceDiagram_ExecutionOccurrenceWithParams,
                                     new Object[] { String.valueOf(exec.getName()), String.valueOf(exec.getLifeline().getName()), Integer.valueOf(exec.getStartOccurrence()), Integer.valueOf(exec.getEndOccurrence()) });
                         }
 
@@ -943,7 +943,7 @@ public class SDWidget extends ScrollView implements SelectionListener,
 
         fPrinter = new Printer(data);
 
-        String jobName = MessageFormat.format(SDMessages._116, new Object[] { String.valueOf(fSite.getContentDescription()), String.valueOf(fFrame.getName()) });
+        String jobName = MessageFormat.format(Messages.SequenceDiagram_plus, new Object[] { String.valueOf(fSite.getContentDescription()), String.valueOf(fFrame.getName()) });
         fPrinter.startJob(jobName);
 
         GC gc = new GC(fPrinter);
@@ -1179,7 +1179,7 @@ public class SDWidget extends ScrollView implements SelectionListener,
             postfix.append(" -> "); //$NON-NLS-1$
             postfix.append(fCurrentGraphNode.getName());
             postfix.append("\n"); //$NON-NLS-1$
-            postfix.append(SDMessages._138);
+            postfix.append(Messages.SequenceDiagram_Delta);
             postfix.append(" "); //$NON-NLS-1$
 
             //double delta = ((ITimeRange)toolTipNode).getLastTime()-((ITimeRange)currentGraphNode).getLastTime();
index c9c6f33fa1cd63596e0567132da7dee7ab59f313..3c2f0eb0b665f5541427d52d7436edc815ea60c2 100755 (executable)
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.events.FocusEvent;
@@ -732,7 +732,7 @@ public class ScrollView extends Composite {
             ovr.useControl(b);
             b.setData(ovr);
             cc = b;
-            b.setToolTipText(SDMessages._78);
+            b.setToolTipText(Messages.SequenceDiagram_OpenOverviewTooltip);
         }
         setCornerControl(cc);
     }
index 927078b3bf46cb501579ece96b0b347ee91582ef..255792d124c59c27122e9a0eed69aff782b8468e 100755 (executable)
@@ -20,7 +20,7 @@ import java.util.regex.PatternSyntaxException;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFilterProvider;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * This class describes the find or filter criteria selected by the user in the find or filter dialog box
@@ -348,22 +348,22 @@ public class Criteria {
             }
         } else {
             if (isLifeLineSelected()) {
-                list.add(SDMessages._28);
+                list.add(Messages.SequenceDiagram_Lifeline);
             }
             if (isSyncMessageSelected()) {
-                list.add(SDMessages._30);
+                list.add(Messages.SequenceDiagram_SynchronousMessage);
             }
             if (isSyncMessageReturnSelected()) {
-                list.add(SDMessages._31);
+                list.add(Messages.SequenceDiagram_SynchronousMessageReturn);
             }
             if (isAsyncMessageSelected()) {
-                list.add(SDMessages._32);
+                list.add(Messages.SequenceDiagram_AsynchronousMessage);
             }
             if (isAsyncMessageReturnSelected()) {
-                list.add(SDMessages._33);
+                list.add(Messages.SequenceDiagram_AsynchronousMessageReturn);
             }
             if (isStopSelected()) {
-                list.add(SDMessages._29);
+                list.add(Messages.SequenceDiagram_Stop);
             }
         }
         StringBuffer ret = new StringBuffer();
@@ -372,7 +372,7 @@ public class Criteria {
             String s = i.next();
             ret.append(prefix);
             ret.append(s);
-            prefix = " " + SDMessages._34 + " "; //$NON-NLS-1$ //$NON-NLS-2$
+            prefix = " " + Messages.SequenceDiagram_or + " "; //$NON-NLS-1$ //$NON-NLS-2$
         }
         ret.append("]"); //$NON-NLS-1$
         return ret.toString();
index bf01a9f649f9fed37607b432d5fdeec244368484..e2e62c5d156f2f39e9c8090a09e85eef3d5ee0ca 100755 (executable)
@@ -21,7 +21,7 @@ import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFilterProvider;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -147,7 +147,7 @@ public class FilterListDialog extends Dialog {
     public Control createDialogArea(Composite parent) {
 
         Group ret = new Group(parent, SWT.NONE);
-        ret.setText(SDMessages._57);
+        ret.setText(Messages.SequenceDiagram_ListOfHideDisplayPatterns);
         RowLayout rowLayout = new RowLayout();
         rowLayout.wrap = false;
         rowLayout.pack = true;
@@ -169,7 +169,7 @@ public class FilterListDialog extends Dialog {
             public void widgetDefaultSelected(SelectionEvent e) {
                 int count = fTable.getSelectionCount();
                 if (count == 1) {
-                    Criteria criteria = openFilterDialog(((CriteriaTableItem) fTable.getSelection()[0].getData()).getCriteria(), SDMessages._63);
+                    Criteria criteria = openFilterDialog(((CriteriaTableItem) fTable.getSelection()[0].getData()).getCriteria(), Messages.SequenceDiagram_Update);
                     if (criteria != null) {
                         replaceSelectedCriteria(criteria);
                     }
@@ -201,7 +201,7 @@ public class FilterListDialog extends Dialog {
         rowLayoutCommands.spacing = 8;
         commands.setLayout(rowLayoutCommands);
         fAdd = new Button(commands, SWT.NONE);
-        fAdd.setText(SDMessages._61);
+        fAdd.setText(Messages.SequenceDiagram_Add);
         fAdd.addSelectionListener(new SelectionListener() {
 
             @Override
@@ -212,7 +212,7 @@ public class FilterListDialog extends Dialog {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 Criteria init = new Criteria();
-                Criteria c = openFilterDialog(init, SDMessages._62);
+                Criteria c = openFilterDialog(init, Messages.SequenceDiagram_Create);
                 if (c != null) {
                     addCriteria(c, true, false, null);
                 }
@@ -220,7 +220,7 @@ public class FilterListDialog extends Dialog {
         });
 
         fEdit = new Button(commands, SWT.NONE);
-        fEdit.setText(SDMessages._60);
+        fEdit.setText(Messages.SequenceDiagram_EditIt);
         fEdit.addSelectionListener(new SelectionListener() {
 
             @Override
@@ -230,7 +230,7 @@ public class FilterListDialog extends Dialog {
 
             @Override
             public void widgetSelected(SelectionEvent e) {
-                Criteria c = openFilterDialog(((CriteriaTableItem) fTable.getSelection()[0].getData()).getCriteria(), SDMessages._63);
+                Criteria c = openFilterDialog(((CriteriaTableItem) fTable.getSelection()[0].getData()).getCriteria(), Messages.SequenceDiagram_Update);
                 if (c != null) {
                     replaceSelectedCriteria(c);
                 }
@@ -239,7 +239,7 @@ public class FilterListDialog extends Dialog {
         fEdit.setEnabled(false);
 
         fRemove = new Button(commands, SWT.NONE);
-        fRemove.setText(SDMessages._64);
+        fRemove.setText(Messages.SequenceDiagram_Remove);
         fRemove.addSelectionListener(new SelectionListener() {
 
             @Override
@@ -255,7 +255,7 @@ public class FilterListDialog extends Dialog {
         });
         fRemove.setEnabled(false);
 
-        getShell().setText(SDMessages._65);
+        getShell().setText(Messages.SequenceDiagram_SequenceDiagramHidePatterns);
         /*
          * for (int i=0;i<filters.size();i++) { if (filters.get(i) instanceof FilterCriteria)
          * addCriteria(((FilterCriteria)filters.get(i)).getCriteria(),true); }
@@ -274,7 +274,7 @@ public class FilterListDialog extends Dialog {
         SearchFilterDialog filter = new SearchFilterDialog((SDView) fViewer, fProvider, true, SWT.APPLICATION_MODAL);
         filter.setCriteria(criteria);
         filter.setOkText(action);
-        filter.setTitle(SDMessages._66);
+        filter.setTitle(Messages.SequenceDiagram_DefinitionOfHidePattern);
         filter.open();
         return filter.getCriteria();
     }
@@ -486,7 +486,7 @@ public class FilterListDialog extends Dialog {
          */
         public void setCriteria(Criteria criteria) {
             fCriteria = criteria;
-            fTableItem.setText((fIsPositive ? SDMessages._59 : SDMessages._58) + " " + fCriteria.getExpression() + " " + fCriteria.getGraphNodeSummary(fProvider, fLoaderClassName)); //$NON-NLS-1$ //$NON-NLS-2$
+            fTableItem.setText((fIsPositive ? Messages.SequenceDiagram_display : Messages.SequenceDiagram_hide) + " " + fCriteria.getExpression() + " " + fCriteria.getGraphNodeSummary(fProvider, fLoaderClassName)); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         /**
index 3da788b66387cd5aaa2ea88114b517115ce1abf3..0ff3fc82ccc077ba9cbbd5be661c9e9242f69737 100755 (executable)
@@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -109,7 +109,7 @@ public class MinMaxDialog extends Dialog {
 
     @Override
     protected Control createDialogArea(Composite p) {
-        p.getShell().setText(SDMessages._123);
+        p.getShell().setText(Messages.SequenceDiagram_TimeCompressionBarConfig);
         Composite parent = (Composite) super.createDialogArea(p);
 
         GridLayout parentLayout = new GridLayout();
@@ -123,7 +123,7 @@ public class MinMaxDialog extends Dialog {
         g1.setLayout(g1layout);
 
         fMinLabel = new Label(g1, SWT.RADIO);
-        fMinLabel.setText(SDMessages._124);
+        fMinLabel.setText(Messages.SequenceDiagram_MinTime);
         fMinLabel.setLayoutData(newGridData(1));
 
         fMinText = new Text(g1, SWT.SINGLE | SWT.BORDER);
@@ -131,7 +131,7 @@ public class MinMaxDialog extends Dialog {
         fMinText.setText(String.valueOf(fSdWidget.getFrame().getMinTime().getValue()));
 
         fMaxLabel = new Label(g1, SWT.RADIO);
-        fMaxLabel.setText(SDMessages._125);
+        fMaxLabel.setText(Messages.SequenceDiagram_MaxTime);
         fMaxLabel.setLayoutData(newGridData(1));
 
         fMaxText = new Text(g1, SWT.SINGLE | SWT.BORDER);
@@ -139,7 +139,7 @@ public class MinMaxDialog extends Dialog {
         fMaxText.setText(String.valueOf(fSdWidget.getFrame().getMaxTime().getValue()));
 
         fScaleLabel = new Label(g1, SWT.RADIO);
-        fScaleLabel.setText(SDMessages._136);
+        fScaleLabel.setText(Messages.SequenceDiagram_Scale);
         fScaleLabel.setLayoutData(newGridData(1));
 
         fScaleText = new Text(g1, SWT.SINGLE | SWT.BORDER);
@@ -148,7 +148,7 @@ public class MinMaxDialog extends Dialog {
 
 
         fPrecisionLabel = new Label(g1, SWT.RADIO);
-        fPrecisionLabel.setText(SDMessages._137);
+        fPrecisionLabel.setText(Messages.SequenceDiagram_Precision);
         fPrecisionLabel.setLayoutData(newGridData(1));
 
         fPrecisionText = new Text(g1, SWT.SINGLE | SWT.BORDER);
@@ -177,14 +177,14 @@ public class MinMaxDialog extends Dialog {
 
             super.okPressed();
         } catch (Exception e) {
-            MessageDialog.openError(getShell(), SDMessages._98, SDMessages._99);
+            MessageDialog.openError(getShell(), Messages.SequenceDiagram_Error, Messages.SequenceDiagram_InvalidRange);
         }
     }
 
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
         super.createButtonsForButtonBar(parent);
-        createButton(parent, IDialogConstants.CLIENT_ID, SDMessages._126, false);
+        createButton(parent, IDialogConstants.CLIENT_ID, Messages.SequenceDiagram_Default, false);
         getButton(IDialogConstants.CLIENT_ID).addSelectionListener(new SelectionListener() {
 
             @Override
index 062fe54b5fe8e2998b6a7749077cd3169dfffc0f..729d1358a9e5b2af4d7e676982effdf0a07744bd 100755 (executable)
@@ -16,7 +16,7 @@ import java.text.MessageFormat;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDAdvancedPagingProvider;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
@@ -80,13 +80,13 @@ public class PagesDialog extends Dialog {
         data.grabExcessHorizontalSpace = true;
         data.horizontalAlignment = GridData.FILL;
         ret.setLayoutData(data);
-        ret.setText(SDMessages._67);
+        ret.setText(Messages.SequenceDiagram_PageNavigation);
 
         FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
         ret.setLayout(fillLayout);
 
         Label label = new Label(ret, SWT.NONE);
-        label.setText(SDMessages._75);
+        label.setText(Messages.SequenceDiagram_CurrentPage);
 
         fCurrentPage = new TextArea(ret);
         fCurrentPage.setBounds(1, fProvider.pagesCount());
@@ -97,7 +97,7 @@ public class PagesDialog extends Dialog {
 
         updateComments();
 
-        getShell().setText(SDMessages._68);
+        getShell().setText(Messages.SequenceDiagram_SequenceDiagramPages);
         return ret;
     }
 
@@ -114,15 +114,15 @@ public class PagesDialog extends Dialog {
     protected void updateComments() {
         int pages = Math.max(0, fProvider.pagesCount());
         StringBuffer totalPageCommentText = new StringBuffer();
-        totalPageCommentText.append(SDMessages._70);
+        totalPageCommentText.append(Messages.SequenceDiagram_Total);
         totalPageCommentText.append(pages);
         totalPageCommentText.append(" "); //$NON-NLS-1$
         if (pages == 0) {
-            totalPageCommentText.append(SDMessages._71);
+            totalPageCommentText.append(Messages.SequenceDiagram_pages);
         } else if (pages == 1) {
-            totalPageCommentText.append(SDMessages._72);
+            totalPageCommentText.append(Messages.SequenceDiagram_page);
         } else {
-            totalPageCommentText.append(SDMessages._73);
+            totalPageCommentText.append(Messages.SequenceDiagram_pages);
         }
         fTotalPageComment.setText(totalPageCommentText.toString());
     }
@@ -197,7 +197,7 @@ public class PagesDialog extends Dialog {
             Integer tab[] = new Integer[2];
             tab[0] = Integer.valueOf(fMin);
             tab[1] = Integer.valueOf(fMax);
-            fText.setToolTipText(MessageFormat.format(SDMessages._69, (Object[]) tab));
+            fText.setToolTipText(MessageFormat.format(Messages.SequenceDiagram_IsInBetween, (Object[]) tab));
         }
     }
 
index 499c487a2fed588ad09833e93a977e10774fd775..d63890a20313506bd5e7861fc6a907acf4c3afc4 100755 (executable)
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.views.uml2sd.dialogs;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -81,7 +81,7 @@ public class SDPrintDialog extends Dialog {
 
     @Override
     protected Control createDialogArea(Composite p) {
-        p.getShell().setText(SDMessages._114);
+        p.getShell().setText(Messages.SequenceDiagram_Print);
         Composite parent = (Composite) super.createDialogArea(p);
 
         fDialogUI.createDialogArea(parent);
@@ -107,7 +107,7 @@ public class SDPrintDialog extends Dialog {
     protected void createButtonsForButtonBar(Composite parent) {
 
         super.createButtonsForButtonBar(parent);
-        createButton(parent, IDialogConstants.CLIENT_ID, SDMessages._115, false);
+        createButton(parent, IDialogConstants.CLIENT_ID, Messages.SequenceDiagram_Printer, false);
 
         getButton(IDialogConstants.CLIENT_ID).addSelectionListener(new SelectionListener() {
             @Override
index 32995be9287577e72c6a0bc6def7b5c7936e9b44..aad3d78851b02dc6b7a0db6f223df6f799602599 100755 (executable)
@@ -20,7 +20,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.DiagramToolTip;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.NGC;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
@@ -764,19 +764,19 @@ public class SDPrintDialogUI {
         parent.setLayout(parentLayout);
 
         Group g1 = new Group(parent, SWT.SHADOW_NONE);
-        g1.setText(SDMessages._113);
+        g1.setText(Messages.SequenceDiagram_ZoomOption);
         g1.setLayoutData(newGridData(3));
         GridLayout g1layout = new GridLayout();
         g1layout.numColumns = 2;
         g1.setLayout(g1layout);
 
         fUseCurrentZoom = new Button(g1, SWT.RADIO);
-        fUseCurrentZoom.setText(SDMessages._112);
+        fUseCurrentZoom.setText(Messages.SequenceDiagram_UseCurrentZoom);
         fUseCurrentZoom.setLayoutData(newGridData(2));
         fUseCurrentZoom.addSelectionListener(fSelectionListener);
 
         fSetHPagesNumber = new Button(g1, SWT.RADIO);
-        fSetHPagesNumber.setText(SDMessages._110);
+        fSetHPagesNumber.setText(Messages.SequenceDiagram_NumberOfHorizontalPages);
         fSetHPagesNumber.setLayoutData(newGridData(1));
         fSetHPagesNumber.addSelectionListener(fSelectionListener);
 
@@ -784,7 +784,7 @@ public class SDPrintDialogUI {
         fHorPagesNum.addModifyListener(fModifyListener);
 
         fSetVPagesNumber = new Button(g1, SWT.RADIO);
-        fSetVPagesNumber.setText(SDMessages._111);
+        fSetVPagesNumber.setText(Messages.SequenceDiagram_NumberOfVerticalPages);
         fSetVPagesNumber.setLayoutData(newGridData(1));
         fSetVPagesNumber.addSelectionListener(fSelectionListener);
 
@@ -792,14 +792,14 @@ public class SDPrintDialogUI {
         fVertPagesNum.addModifyListener(fModifyListener);
 
         Label nbTotal = new Label(g1, SWT.SHADOW_NONE | SWT.RIGHT);
-        nbTotal.setText(SDMessages._109);
+        nbTotal.setText(Messages.TotalNumberOfPages);
         // nbTotal.setLayoutData(newGridData(1));
 
         fTotalPages = new Text(g1, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
         // nbHV.addModifyListener(modifListener);
 
         Group g2 = new Group(parent, SWT.SHADOW_NONE);
-        g2.setText(SDMessages._119);
+        g2.setText(Messages.SequenceDiagram_Preview);
         GridData data = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
         data.horizontalSpan = 3;
         data.verticalSpan = 2;
@@ -853,38 +853,38 @@ public class SDPrintDialogUI {
         fCurrentSelection.setLayoutData(newGridData(1));
 
         Group g3 = new Group(parent, SWT.SHADOW_NONE);
-        g3.setText(SDMessages._118);
+        g3.setText(Messages.SequenceDiagram_PrintRange);
         g3.setLayoutData(newGridData(3));
         GridLayout g3layout = new GridLayout();
         g3layout.numColumns = 4;
         g3.setLayout(g3layout);
 
         fAllPages = new Button(g3, SWT.RADIO);
-        fAllPages.setText(SDMessages._108);
+        fAllPages.setText(Messages.SequenceDiagram_AllPages);
         fAllPages.setLayoutData(newGridData(4));
         fAllPages.addSelectionListener(fSelectionListener);
 
         fCurrentPage = new Button(g3, SWT.RADIO);
-        fCurrentPage.setText(SDMessages._107);
+        fCurrentPage.setText(Messages.SequenceDiagram_CurrentView);
         fCurrentPage.setLayoutData(newGridData(4));
         fCurrentPage.setEnabled(true);
         fCurrentPage.setSelection(true);
         fCurrentPage.addSelectionListener(fSelectionListener);
 
         fPageList = new Button(g3, SWT.RADIO);
-        fPageList.setText(SDMessages._106);
+        fPageList.setText(Messages.SequenceDiagram_SelectedPages);
         fPageList.setLayoutData(newGridData(4));
         fPageList.addSelectionListener(fSelectionListener);
 
         fPageRange = new Button(g3, SWT.RADIO);
-        fPageRange.setText(SDMessages._103);
+        fPageRange.setText(Messages.SequenceDiagram_FromPage);
         fPageRange.setLayoutData(newGridData(1));
         fPageRange.addSelectionListener(fSelectionListener);
 
         fFromPage = new Text(g3, SWT.SINGLE | SWT.BORDER);
 
         Label labelTo = new Label(g3, SWT.CENTER);
-        labelTo.setText(SDMessages._105);
+        labelTo.setText(Messages.SequenceDiagram_to);
 
         fToPage = new Text(g3, SWT.SINGLE | SWT.BORDER);
 
@@ -946,7 +946,7 @@ public class SDPrintDialogUI {
             Label label = new Label(printerDlg, SWT.NONE);
             label.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
             fPrinterDialog = new Button(printerDlg, SWT.PUSH);
-            fPrinterDialog.setText(SDMessages._115);
+            fPrinterDialog.setText(Messages.SequenceDiagram_Printer);
 
             fPrinterDialog.addSelectionListener(new SelectionListener() {
                 @Override
@@ -989,22 +989,22 @@ public class SDPrintDialogUI {
                 fFrom = Integer.valueOf(fFromPage.getText()).intValue();
                 fTo = Integer.valueOf(fToPage.getText()).intValue();
                 if (fFrom > maxNumOfPages() || fTo > maxNumOfPages() || fFrom <= 0 || fTo <= 0) {
-                    MessageDialog.openError(getShell(), SDMessages._98, SDMessages._99);
+                    MessageDialog.openError(getShell(), Messages.SequenceDiagram_Error, Messages.SequenceDiagram_InvalidRange);
                     return false;
                 }
             } else if (fSetHPagesNumber.getSelection() && fNbPages <= 0) {
-                MessageDialog.openError(getShell(), SDMessages._98, SDMessages._101);
+                MessageDialog.openError(getShell(), Messages.SequenceDiagram_Error, Messages.SequenceDiagram_InvalidNbHorizontal);
                 return false;
             } else if (fSetVPagesNumber.getSelection() && fNbPages <= 0) {
-                MessageDialog.openError(getShell(), SDMessages._98, SDMessages._100);
+                MessageDialog.openError(getShell(), Messages.SequenceDiagram_Error, Messages.SequenceDiagram_InvalidNbVertical);
                 return false;
             } else if (fPrintSelection && getPageList().length <= 0) {
-                MessageDialog.openError(getShell(), SDMessages._98, SDMessages._102);
+                MessageDialog.openError(getShell(), Messages.SequenceDiagram_Error, Messages.SequenceDiagram_NoPageSelected);
                 return false;
             }
 
         } catch (Exception e) {
-            MessageDialog.openError(getShell(), SDMessages._98, SDMessages._99);
+            MessageDialog.openError(getShell(), Messages.SequenceDiagram_Error, Messages.SequenceDiagram_InvalidRange);
             fFrom = 0;
             fTo = 0;
             return false;
@@ -1300,7 +1300,7 @@ public class SDPrintDialogUI {
      */
     protected void displayPageNum() {
         if (fPageNum > 0) {
-            String message = MessageFormat.format(SDMessages._117, new Object[] { Integer.valueOf(fPageNum) });
+            String message = MessageFormat.format(Messages.SequenceDiagram_Page, new Object[] { Integer.valueOf(fPageNum) });
             fCurrentSelection.setText(message);
             fCurrentSelection.getParent().layout();
         }
@@ -1400,7 +1400,7 @@ public class SDPrintDialogUI {
             // used in the wizard dialog
             if (fPrinterData == null) {
                 // show error message and disable Finish button
-                fParentWizardPage.setErrorMessage(SDMessages._135);
+                fParentWizardPage.setErrorMessage(Messages.SequenceDiagram_NoPrinterSelected);
                 fParentWizardPage.setPageComplete(false);
             } else {
                 // clear error message and enable Finish button
@@ -1411,7 +1411,7 @@ public class SDPrintDialogUI {
             // used in the print dialog
             if (fPrinterData == null) {
                 // show error message and disable OK button
-                fParentDialog.setErrorMessage(SDMessages._135);
+                fParentDialog.setErrorMessage(Messages.SequenceDiagram_NoPrinterSelected);
                 fParentDialog.setPageComplete(false);
             } else {
                 // clear error message and enable OK button
index 2863905f37e6810ea7eed08952096c28ec03830f..16c75c1eb04697d2d1d50455a20c114780cd6d52 100755 (executable)
@@ -29,7 +29,7 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.SyncMessage;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.core.SyncMessageReturn;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFindProvider;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
@@ -183,11 +183,11 @@ public class SearchFilterDialog extends Dialog {
         if (fOkText != null) {
             getButton(IDialogConstants.OK_ID).setText(fOkText);
         } else {
-            getButton(IDialogConstants.OK_ID).setText(SDMessages._21);
+            getButton(IDialogConstants.OK_ID).setText(Messages.SequenceDiagram_Find);
         }
 
         if (fIsFind) {
-            getButton(IDialogConstants.CANCEL_ID).setText(SDMessages._22);
+            getButton(IDialogConstants.CANCEL_ID).setText(Messages.SequenceDiagram_Close);
         }
 
         Button okButton = getButton(IDialogConstants.OK_ID);
@@ -200,7 +200,7 @@ public class SearchFilterDialog extends Dialog {
         if (fTitle != null) {
             getShell().setText(fTitle);
         } else {
-            getShell().setText(SDMessages._24);
+            getShell().setText(Messages.SequenceDiagram_SequenceDiagramFind);
         }
 
         getShell().pack();
index 516b0b1d027116b310c2fa899e58662ca55ff01f..f70a0c769ebb87a2cb014a3e718e4782c9029c02 100755 (executable)
@@ -13,7 +13,7 @@
 package org.eclipse.linuxtools.tmf.ui.views.uml2sd.dialogs;
 
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDGraphNodeSupporter;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -113,7 +113,7 @@ public class TabContents extends Composite {
 
         // Inform the user how to fill the string to search
         Label searchTitle = new Label(this, SWT.LEFT);
-        searchTitle.setText(SDMessages._26);
+        searchTitle.setText(Messages.SequenceDiagram_MatchingString);
         Composite searchPart = new Composite(this, SWT.NONE);
         GridData searchPartData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
         GridLayout searchPartLayout = new GridLayout();
@@ -137,11 +137,11 @@ public class TabContents extends Composite {
 
         // Create the case sensitive check button
         fCaseSensitive = new Button(searchPart, SWT.CHECK);
-        fCaseSensitive.setText(SDMessages._27);
+        fCaseSensitive.setText(Messages.SequenceDiagram_CaseSensitive);
 
         // Create the group for searched graph node kind selection
         fKindSelection = new Group(this, SWT.SHADOW_NONE);
-        fKindSelection.setText(SDMessages._25);
+        fKindSelection.setText(Messages.SequenceDiagram_SearchFor);
         // kindSelection.setLayoutData(tabLayoutData2);
         GridLayout kindSelectionLayout = new GridLayout();
         kindSelectionLayout.numColumns = 1;
@@ -156,7 +156,7 @@ public class TabContents extends Composite {
             if (nodeName != null) {
                 fLifelineButton.setText(nodeName);
             } else {
-                fLifelineButton.setText(SDMessages._28);
+                fLifelineButton.setText(Messages.SequenceDiagram_Lifeline);
             }
             fLifelineButton.setEnabled(true);
             fLifelineButton.addSelectionListener(fGraphNodeTypeListener);
@@ -169,7 +169,7 @@ public class TabContents extends Composite {
             if (nodeName != null) {
                 fStopButton.setText(nodeName);
             } else {
-                fStopButton.setText(SDMessages._29);
+                fStopButton.setText(Messages.SequenceDiagram_Stop);
             }
 
             fStopButton.setEnabled(true);
@@ -183,7 +183,7 @@ public class TabContents extends Composite {
             if (nodeName != null) {
                 fSynMessageButton.setText(nodeName);
             } else {
-                fSynMessageButton.setText(SDMessages._30);
+                fSynMessageButton.setText(Messages.SequenceDiagram_SynchronousMessage);
             }
             fSynMessageButton.setEnabled(true);
             fSynMessageButton.addSelectionListener(fGraphNodeTypeListener);
@@ -196,7 +196,7 @@ public class TabContents extends Composite {
             if (nodeName != null) {
                 fSynMessageReturnButton.setText(nodeName);
             } else {
-                fSynMessageReturnButton.setText(SDMessages._31);
+                fSynMessageReturnButton.setText(Messages.SequenceDiagram_SynchronousMessageReturn);
             }
             fSynMessageReturnButton.setEnabled(true);
             fSynMessageReturnButton.addSelectionListener(fGraphNodeTypeListener);
@@ -209,7 +209,7 @@ public class TabContents extends Composite {
             if (nodeName != null) {
                 fAsynMessageButton.setText(nodeName);
             } else {
-                fAsynMessageButton.setText(SDMessages._32);
+                fAsynMessageButton.setText(Messages.SequenceDiagram_AsynchronousMessage);
             }
             fAsynMessageButton.setEnabled(true);
             fAsynMessageButton.addSelectionListener(fGraphNodeTypeListener);
@@ -222,14 +222,14 @@ public class TabContents extends Composite {
             if (nodeName != null) {
                 fAsynMessageReturnButton.setText(nodeName);
             } else {
-                fAsynMessageReturnButton.setText(SDMessages._33);
+                fAsynMessageReturnButton.setText(Messages.SequenceDiagram_AsynchronousMessageReturn);
             }
             fAsynMessageReturnButton.setEnabled(true);
             fAsynMessageReturnButton.addSelectionListener(fGraphNodeTypeListener);
         }
 
         fResult = new Label(this, SWT.LEFT);
-        fResult.setText(SDMessages._23);
+        fResult.setText(Messages.SequenceDiagram_StringNotFound);
         fResult.setVisible(false);
     }
 
index f400bf887d6295dedeb56e8fb7f8eb23ded02ca8..3446c939da63568b9befe7dbd73cca13b2d76a20 100644 (file)
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * Action class implementation to move the focus to the first page of the whole sequence diagram.
@@ -55,8 +55,8 @@ public class FirstPage extends Action {
     public FirstPage(SDView view) {
         super();
         fView = view;
-        setText(SDMessages._139);
-        setToolTipText(SDMessages._140);
+        setText(Messages.SequenceDiagram_FirstPage);
+        setToolTipText(Messages.SequenceDiagram_GoToFirstPage);
         setId(ID);
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_FIRST_PAGE));
     }
index 307147836ffefb876bccad59b628c545659acaaa..f239e204f627aa0f0a9cae687643f579f13b8320 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.IHandlerActivation;
@@ -215,7 +215,7 @@ public class KeyBindingsManager {
         fHandlerActivations.add(activation);
 
         fShowNodeStartForKeyBinding = new ShowNodeStart();
-        fShowNodeStartForKeyBinding.setText(SDMessages.uml_25);
+        fShowNodeStartForKeyBinding.setText(Messages.SequenceDiagram_ShowNodeStart);
 
         fShowNodeStartForKeyBinding.setId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart");//$NON-NLS-1$
         fShowNodeStartForKeyBinding.setActionDefinitionId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeStart");//$NON-NLS-1$
@@ -231,7 +231,7 @@ public class KeyBindingsManager {
         fHandlerActivations.add(activation);
 
         fShowNodeEndForKeyBinding = new ShowNodeEnd();
-        fShowNodeEndForKeyBinding.setText(SDMessages.uml_23);
+        fShowNodeEndForKeyBinding.setText(Messages.SequenceDiagram_ShowNodeEnd);
         fShowNodeEndForKeyBinding.setId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd");//$NON-NLS-1$
         fShowNodeEndForKeyBinding.setActionDefinitionId("org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.ShowNodeEnd");//$NON-NLS-1$
 
index 222cedfb9b48207c5325bfa93322a3b88082b429..6cf8e7eeffa76856051c61314a320be0c17c9a0a 100644 (file)
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * Action class implementation to move the focus to the last page of the whole sequence diagram.
@@ -55,8 +55,8 @@ public class LastPage extends Action {
     public LastPage(SDView view) {
         super();
         fView = view;
-        setText(SDMessages._141);
-        setToolTipText(SDMessages._142);
+        setText(Messages.SequenceDiagram_LastPage);
+        setToolTipText(Messages.SequenceDiagram_GoToLastPage);
         setId(ID);
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_LAST_PAGE));
     }
index 9686a34c5425b9a82309d35f7923edf2841978ee..04aec1d10e4b7444438dc80b66dcf82f87e24c67 100755 (executable)
@@ -16,7 +16,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * Action class implementation to move the focus to the next page of the whole sequence diagram.
@@ -54,8 +54,8 @@ public class NextPage extends Action {
     public NextPage(SDView view) {
         super();
         fView = view;
-        setText(SDMessages._36);
-        setToolTipText(SDMessages._38);
+        setText(Messages.SequenceDiagram_NextPage);
+        setToolTipText(Messages.SequenceDiagram_GoToNextPage);
         setId(ID);
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_PAGE));
     }
index 392e32b602cf3532210c56f1b6b5927ea2a78b2e..ce6f93f1a2acf67cddbd902926c4fe3f04a72425 100755 (executable)
@@ -18,7 +18,7 @@ import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.dialogs.FilterListDialog;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDFilterProvider;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * Action class implementation for 'Filtering' of messages/lifelines.
@@ -61,10 +61,10 @@ public class OpenSDFiltersDialog extends Action {
      *            The provider
      */
     public OpenSDFiltersDialog(SDView view, ISDFilterProvider provider) {
-        super(SDMessages._43);
+        super(Messages.SequenceDiagram_HidePatterns);
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_FILTERS));
         setId(ID);
-        setToolTipText(SDMessages._43);
+        setToolTipText(Messages.SequenceDiagram_HidePatterns);
         fView = view;
         fProvider = provider;
     }
index 3a338342fee49f2122a778ed1fa86b937d4697b2..0b1d44d58565a84ae833e6e0db8b6259cd55152d 100755 (executable)
@@ -17,7 +17,7 @@ import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.dialogs.SearchFilterDialog;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 
 /**
@@ -65,11 +65,11 @@ public class OpenSDFindDialog extends Action {
      * @param view The view reference
      */
     public OpenSDFindDialog(SDView view) {
-        super(SDMessages._41);
+        super(Messages.SequenceDiagram_Find + "..."); //$NON-NLS-1$
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_SEARCH_SEQ));
         setId(ID);
         setActionDefinitionId(ACTION_DEFINITION_ID);
-        setToolTipText(SDMessages._41);
+        setToolTipText(Messages.SequenceDiagram_Find + "..."); //$NON-NLS-1$
         fView = view;
     }
 
index 9672ae75de85f621039a93cd8938c2b2f8d32d09..0d68d35d22ce9ffb0dc5daad2d5c8d33d3bbc14e 100755 (executable)
@@ -18,7 +18,7 @@ import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.dialogs.PagesDialog;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.handlers.provider.ISDAdvancedPagingProvider;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * Action class implementation for paging.
@@ -63,7 +63,7 @@ public class OpenSDPagesDialog extends Action {
      *            The provider
      */
     public OpenSDPagesDialog(SDView view, ISDAdvancedPagingProvider provider) {
-        super(SDMessages._44);
+        super(Messages.SequenceDiagram_Pages);
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_GOTO_PAGE));
         setId(ID);
         fView = view;
index 68fc56fdb2166b39135fbf8dec34030487a41f96..ae292fbb59796edd3cb1f74f3f56cb76f1ed5137 100755 (executable)
@@ -16,7 +16,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 
 /**
  * Action class implementation to move the focus to the previous page of the whole sequence diagram.
@@ -57,8 +57,8 @@ public class PrevPage extends Action {
     public PrevPage(SDView view) {
         super();
         fView = view;
-        setText(SDMessages._35);
-        setToolTipText(SDMessages._37);
+        setText(Messages.SequenceDiagram_PreviousPage);
+        setToolTipText(Messages.SequenceDiagram_GoToPreviousPage);
         setId(ID);
         setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREV_PAGE));
     }
index d1a9b1d25f3ec10d5c6e41f3cc7f5886cc215205..5cfc87ab064c99af3c0cfc9fb0a8cfd54b6fcfac 100755 (executable)
@@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.tmf.ui.Activator;
 import org.eclipse.linuxtools.internal.tmf.ui.ITmfImageConstants;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDView;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.SDWidget;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.widgets.Display;
@@ -123,30 +123,30 @@ public class Zoom extends Action {
 
         switch (type) {
         case ZOOM_IN:
-            setText(SDMessages._47);
-            setToolTipText(SDMessages._48);
+            setText(Messages.SequenceDiagram_ZoomIn);
+            setToolTipText(Messages.SequenceDiagram_ZoomInTheDiagram);
             setId(ZOOM_IN_ID);
             setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_ZOOM_IN_MENU));
             break;
 
         case ZOOM_OUT:
-            setText(SDMessages._51);
-            setToolTipText(SDMessages._52);
+            setText(Messages.SequenceDiagram_ZoomOut);
+            setToolTipText(Messages.SequenceDiagram_ZoomOutTheDiagram);
             setId(ZOOM_OUT_ID);
             setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_ZOOM_OUT_MENU));
             break;
 
         case ZOOM_RESET:
-            setText(SDMessages._49);
-            setToolTipText(SDMessages._50);
+            setText(Messages.SequenceDiagram_ResetZoomFactor);
+            setToolTipText(Messages.SequenceDiagram_ResetZoomFactor);
             setId(RESET_ZOOM_ID);
             setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_HOME_MENU));
             break;
 
         case ZOOM_NONE:
         default:
-            setText(SDMessages._53);
-            setToolTipText(SDMessages._54);
+            setText(Messages.SequenceDiagram_Select);
+            setToolTipText(Messages.SequenceDiagram_Select);
             setId(NO_ZOOM_ID);
             setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_SELECT_MENU));
             break;
index 3fc4e272f0a9028b2836fa5c45aa1a83dd8d9b64..2cf40b9c7a936730c4c84fdf19ca80e8c394ec74 100755 (executable)
@@ -25,7 +25,7 @@ import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IColor;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.IFont;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.impl.ColorImpl;
 import org.eclipse.linuxtools.tmf.ui.views.uml2sd.drawings.impl.FontImpl;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.FontData;
@@ -63,7 +63,7 @@ public class SDViewPref implements ISDPreferences, IPropertyChangeListener {
     /**
      * A 2nd array of preference names
      */
-    private static final String[] FONT_LIST2 = { SDMessages._88, SDMessages._89, SDMessages._90, SDMessages._91, SDMessages._92, SDMessages._93, SDMessages._94, SDMessages._95, SDMessages._96 };
+    private static final String[] FONT_LIST2 = { Messages.SequenceDiagram_Lifeline, Messages.SequenceDiagram_ExecutionOccurrence, Messages.SequenceDiagram_SyncMessage, Messages.SequenceDiagram_SyncMessageReturn, Messages.SequenceDiagram_AsyncMessage, Messages.SequenceDiagram_AsyncMessageReturn, Messages.SequenceDiagram_Frame, Messages.SequenceDiagram_LifelineHeader, Messages.SequenceDiagram_FrameTitle };
     /**
      * Array of background color preference names
      */
index 6e5e8f835f4ca385670e6882312e0ed947ddafbc..30c59d4ebe90340df2082f247aceb54660c47623 100755 (executable)
@@ -21,7 +21,7 @@ import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.FontFieldEditor;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.SDMessages;
+import org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -116,21 +116,21 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference
         page.setLayoutData(pageLayoutdata);
         page.setLayout(pageLayout);
 
-        fTooltip = new BooleanFieldEditor(ISDPreferences.PREF_TOOLTIP, SDMessages._97, page);
+        fTooltip = new BooleanFieldEditor(ISDPreferences.PREF_TOOLTIP, Messages.SequenceDiagram_ShowTooltips, page);
         fTooltip.setPreferenceStore(fPreferences.getPreferenceStore());
         fTooltip.load();
 
         // link font with zoom pref
-        fLink = new BooleanFieldEditor(ISDPreferences.PREF_LINK_FONT, SDMessages._82, page);
+        fLink = new BooleanFieldEditor(ISDPreferences.PREF_LINK_FONT, Messages.SequenceDiagram_IncreaseFontSizeWhenZooming, page);
         fLink.setPreferenceStore(fPreferences.getPreferenceStore());
         fLink.load();
 
-        fNoExternalTime = new BooleanFieldEditor(ISDPreferences.PREF_EXCLUDE_EXTERNAL_TIME, SDMessages._83, page);
+        fNoExternalTime = new BooleanFieldEditor(ISDPreferences.PREF_EXCLUDE_EXTERNAL_TIME, Messages.SequenceDiagram_ExcludeExternalTime, page);
         fNoExternalTime.setPreferenceStore(fPreferences.getPreferenceStore());
         fNoExternalTime.load();
 
         // use gradient color pref
-        fUseGrad = new BooleanFieldEditor(ISDPreferences.PREF_USE_GRADIENT, SDMessages._84, page);
+        fUseGrad = new BooleanFieldEditor(ISDPreferences.PREF_USE_GRADIENT, Messages.SequenceDiagram_UseGradientColor, page);
         fUseGrad.setPreferenceStore(fPreferences.getPreferenceStore());
         fUseGrad.load();
 
@@ -145,7 +145,7 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference
         prefPage.setLayout(prefPageLayout);
 
         // swimLane width pref
-        fLifelineWidth = new IntegerFieldEditor(ISDPreferences.PREF_LIFELINE_WIDTH, SDMessages._80, prefPage);
+        fLifelineWidth = new IntegerFieldEditor(ISDPreferences.PREF_LIFELINE_WIDTH, Messages.SequenceDiagram_LifelineWidth, prefPage);
         fLifelineWidth.setPreferenceStore(fPreferences.getPreferenceStore());
         fLifelineWidth.setValidRange(119, 500);
         fLifelineWidth.load();
@@ -175,20 +175,20 @@ public class SDViewerPage extends PreferencePage implements IWorkbenchPreference
         // font selector initialise for the lifeline font pref
         String[] fontList = SDViewPref.getFontList();
         fFont = new FontFieldEditor(fontList[0], "",//$NON-NLS-1$
-                SDMessages._81, fButtonArea);
+                Messages.SequenceDiagram_AaBbYyZz, fButtonArea);
         fFont.getPreviewControl().setSize(500, 500);
         fFont.setPreferenceStore(fPreferences.getPreferenceStore());
         fFont.load();
 
-        fBackGroundColor = new ColorFieldEditor(fontList[0] + SDViewPref.BACK_COLOR_POSTFIX, SDMessages._85, fButtonArea);
+        fBackGroundColor = new ColorFieldEditor(fontList[0] + SDViewPref.BACK_COLOR_POSTFIX, Messages.SequenceDiagram_Background, fButtonArea);
         fBackGroundColor.setPreferenceStore(fPreferences.getPreferenceStore());
         fBackGroundColor.load();
 
-        fLineColor = new ColorFieldEditor(fontList[0] + SDViewPref.FORE_COLOR_POSTFIX, SDMessages._86, fButtonArea);
+        fLineColor = new ColorFieldEditor(fontList[0] + SDViewPref.FORE_COLOR_POSTFIX, Messages.SequenceDiagram_Lines, fButtonArea);
         fLineColor.setPreferenceStore(fPreferences.getPreferenceStore());
         fLineColor.load();
 
-        fTextColor = new ColorFieldEditor(fontList[0] + SDViewPref.TEXT_COLOR_POSTFIX, SDMessages._87, fButtonArea);
+        fTextColor = new ColorFieldEditor(fontList[0] + SDViewPref.TEXT_COLOR_POSTFIX, Messages.SequenceDiagram_Text, fButtonArea);
         fTextColor.setPreferenceStore(fPreferences.getPreferenceStore());
         fTextColor.load();
         swapPref(true);
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/Messages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/Messages.java
new file mode 100755 (executable)
index 0000000..9a57092
--- /dev/null
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2013 IBM Corporation, Ericsson
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ *     IBM Corporation - initial API and implementation
+ *     Bernd Hufmann - Updated for TMF
+ *     Alexandre Montplaisir - Renamed variables
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf.ui.views.uml2sd.util;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Messages related to the sequence diagram
+ *
+ * @version 1.0
+ * @author Bernd Hufmann
+ * @since 2.0
+ */
+@SuppressWarnings("javadoc")
+public class Messages extends NLS {
+
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.messages"; //$NON-NLS-1$
+
+    private Messages() {
+        // Do not instantiate
+    }
+
+    public static String SequenceDiagram_LifelineNode;
+    public static String SequenceDiagram_MessageNode;
+    public static String SequenceDiagram_LostMessageNode;
+    public static String SequenceDiagram_FoundMessageNode;
+    public static String SequenceDiagram_ExecutionOccurrenceWithParams;
+
+    public static String SequenceDiagram_Find;
+    public static String SequenceDiagram_Close;
+    public static String SequenceDiagram_StringNotFound;
+    public static String SequenceDiagram_SequenceDiagramFind;
+    public static String SequenceDiagram_SearchFor;
+    public static String SequenceDiagram_MatchingString;
+    public static String SequenceDiagram_CaseSensitive;
+    public static String SequenceDiagram_Lifeline;
+    public static String SequenceDiagram_Stop;
+    public static String SequenceDiagram_SynchronousMessage;
+    public static String SequenceDiagram_SynchronousMessageReturn;
+    public static String SequenceDiagram_AsynchronousMessage;
+    public static String SequenceDiagram_AsynchronousMessageReturn;
+    public static String SequenceDiagram_or;
+    public static String SequenceDiagram_PreviousPage;
+    public static String SequenceDiagram_NextPage;
+    public static String SequenceDiagram_GoToPreviousPage;
+    public static String SequenceDiagram_GoToNextPage;
+    public static String SequenceDiagram_GoToMessage;
+    public static String SequenceDiagram_GoToMessageReturn;
+    public static String SequenceDiagram_EditFilters;
+    public static String SequenceDiagram_HidePatterns;
+    public static String SequenceDiagram_Pages;
+
+    public static String SequenceDiagram_ZoomIn;
+    public static String SequenceDiagram_ZoomInTheDiagram;
+    public static String SequenceDiagram_ResetZoomFactor;
+    public static String SequenceDiagram_ZoomOut;
+    public static String SequenceDiagram_ZoomOutTheDiagram;
+    public static String SequenceDiagram_Select;
+    public static String SequenceDiagram_Max;
+    public static String SequenceDiagram_Min;
+    public static String SequenceDiagram_ListOfHideDisplayPatterns;
+    public static String SequenceDiagram_hide;
+    public static String SequenceDiagram_display;
+    public static String SequenceDiagram_EditIt;
+    public static String SequenceDiagram_Add;
+    public static String SequenceDiagram_Create;
+    public static String SequenceDiagram_Update;
+    public static String SequenceDiagram_Remove;
+    public static String SequenceDiagram_SequenceDiagramHidePatterns;
+    public static String SequenceDiagram_DefinitionOfHidePattern;
+    public static String SequenceDiagram_PageNavigation;
+    public static String SequenceDiagram_SequenceDiagramPages;
+    public static String SequenceDiagram_IsInBetween;
+    public static String SequenceDiagram_Total;
+    public static String SequenceDiagram_pages;
+    public static String SequenceDiagram_page;
+
+    public static String SequenceDiagram_CurrentPage;
+
+    public static String SequenceDiagram_Navigation;
+    public static String SequenceDiagram_OpenOverviewTooltip;
+
+    public static String SequenceDiagram_LifelineWidth;
+    public static String SequenceDiagram_AaBbYyZz;
+    public static String SequenceDiagram_IncreaseFontSizeWhenZooming;
+    public static String SequenceDiagram_ExcludeExternalTime;
+    public static String SequenceDiagram_UseGradientColor;
+    public static String SequenceDiagram_Background;
+    public static String SequenceDiagram_Lines;
+    public static String SequenceDiagram_Text;
+
+    public static String SequenceDiagram_ExecutionOccurrence;
+    public static String SequenceDiagram_SyncMessage;
+    public static String SequenceDiagram_SyncMessageReturn;
+    public static String SequenceDiagram_AsyncMessage;
+    public static String SequenceDiagram_AsyncMessageReturn;
+    public static String SequenceDiagram_Frame;
+    public static String SequenceDiagram_LifelineHeader;
+    public static String SequenceDiagram_FrameTitle;
+    public static String SequenceDiagram_ShowTooltips;
+    public static String SequenceDiagram_Error;
+    public static String SequenceDiagram_InvalidRange;
+    public static String SequenceDiagram_InvalidNbVertical;
+    public static String SequenceDiagram_InvalidNbHorizontal;
+    public static String SequenceDiagram_NoPageSelected;
+    public static String SequenceDiagram_FromPage;
+
+    public static String SequenceDiagram_to;
+    public static String SequenceDiagram_SelectedPages;
+    public static String SequenceDiagram_CurrentView;
+    public static String SequenceDiagram_AllPages;
+    public static String TotalNumberOfPages;
+    public static String SequenceDiagram_NumberOfHorizontalPages;
+    public static String SequenceDiagram_NumberOfVerticalPages;
+    public static String SequenceDiagram_UseCurrentZoom;
+    public static String SequenceDiagram_ZoomOption;
+    public static String SequenceDiagram_Print;
+    public static String SequenceDiagram_Printer;
+    public static String SequenceDiagram_plus;
+    public static String SequenceDiagram_Page;
+    public static String SequenceDiagram_PrintRange;
+    public static String SequenceDiagram_Preview;
+
+    public static String SequenceDiagram_TimeCompressionBarConfig;
+    public static String SequenceDiagram_MinTime;
+    public static String SequenceDiagram_MaxTime;
+    public static String SequenceDiagram_Default;
+
+    public static String SequenceDiagram_NoPrinterSelected;
+    public static String SequenceDiagram_Scale;
+    public static String SequenceDiagram_Precision;
+    public static String SequenceDiagram_Delta;
+
+    public static String SequenceDiagram_FirstPage;
+    public static String SequenceDiagram_GoToFirstPage;
+    public static String SequenceDiagram_LastPage;
+    public static String SequenceDiagram_GoToLastPage;
+
+    public static String SequenceDiagram_ShowNodeEnd;
+    public static String SequenceDiagram_ShowNodeStart;
+    public static String SequenceDiagram_ConfigureMinMax;
+
+    static {
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+}
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SDMessages.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/util/SDMessages.java
deleted file mode 100755 (executable)
index 3dbce75..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation, Ericsson
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     IBM Corporation - initial API and implementation
- *     Bernd Hufmann - Updated for TMF
- *******************************************************************************/
-
-package org.eclipse.linuxtools.tmf.ui.views.uml2sd.util;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Messages related to the sequence diagram
- *
- * @version 1.0
- * @author Bernd Hufmann
- *
- */
-@SuppressWarnings("javadoc")
-public final class SDMessages extends NLS {
-
-    protected static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.ui.views.uml2sd.util.messages";//$NON-NLS-1$
-
-    protected SDMessages() {
-        // Do not instantiate
-    }
-
-    public static String _1;
-    public static String _2;
-    public static String _3;
-    public static String _4;
-    public static String _5;
-    public static String _6;
-    public static String _7;
-    public static String _8;
-    public static String _9;
-    public static String _10;
-    public static String _11;
-    public static String _12;
-    public static String _13;
-    public static String _14;
-    public static String _15;
-    public static String _16;
-    public static String _17;
-    public static String _18;
-    public static String _19;
-    public static String _20;
-    public static String _21;
-    public static String _22;
-    public static String _23;
-    public static String _24;
-    public static String _25;
-    public static String _26;
-    public static String _27;
-    public static String _28;
-    public static String _29;
-    public static String _30;
-    public static String _31;
-    public static String _32;
-    public static String _33;
-    public static String _34;
-    public static String _35;
-    public static String _36;
-    public static String _37;
-    public static String _38;
-    public static String _39;
-    public static String _40;
-    public static String _41;
-    public static String _42;
-    public static String _43;
-    public static String _44;
-    public static String _45;
-    public static String _46;
-    public static String _47;
-    public static String _48;
-    public static String _49;
-    public static String _50;
-    public static String _51;
-    public static String _52;
-    public static String _53;
-    public static String _54;
-    public static String _55;
-    public static String _56;
-    public static String _57;
-    public static String _58;
-    public static String _59;
-    public static String _60;
-    public static String _61;
-    public static String _62;
-    public static String _63;
-    public static String _64;
-    public static String _65;
-    public static String _66;
-    public static String _67;
-    public static String _68;
-    public static String _69;
-    public static String _70;
-    public static String _71;
-    public static String _72;
-    public static String _73;
-    public static String _74;
-    public static String _75;
-    public static String _76;
-    public static String _77;
-    public static String _78;
-    public static String _79;
-    public static String _80;
-    public static String _81;
-    public static String _82;
-    public static String _83;
-    public static String _84;
-    public static String _85;
-    public static String _86;
-    public static String _87;
-    public static String _88;
-    public static String _89;
-    public static String _90;
-    public static String _91;
-    public static String _92;
-    public static String _93;
-    public static String _94;
-    public static String _95;
-    public static String _96;
-    public static String _97;
-    public static String _98;
-    public static String _99;
-    public static String _100;
-    public static String _101;
-    public static String _102;
-    public static String _103;
-    public static String _104;
-    public static String _105;
-    public static String _106;
-    public static String _107;
-    public static String _108;
-    public static String _109;
-    public static String _110;
-    public static String _111;
-    public static String _112;
-    public static String _113;
-    public static String _114;
-    public static String _115;
-    public static String _116;
-    public static String _117;
-    public static String _118;
-    public static String _119;
-    public static String _120;
-    public static String _121;
-    public static String _122;
-    public static String _123;
-    public static String _124;
-    public static String _125;
-    public static String _126;
-    public static String _127;
-    public static String _128;
-    public static String _129;
-    public static String _130;
-    public static String _131;
-    public static String _132;
-    public static String _133;
-    public static String _134;
-    public static String _135;
-    public static String _136;
-    public static String _137;
-    public static String _138;
-
-    public static String _139;
-    public static String _140;
-    public static String _141;
-    public static String _142;
-
-    public static String uml_23;
-    public static String uml_25;
-    public static String uml_45;
-
-    static {
-        NLS.initializeMessages(BUNDLE_NAME, SDMessages.class);
-    }
-}
\ No newline at end of file
index 9bdf86472f77e17cbab74196dd4e7604ac5f0742..5a034be800234db2aba02c2167eed3ce857e4090 100755 (executable)
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2012 IBM Corporation, Ericsson
+# Copyright (c) 2005, 2013 IBM Corporation, Ericsson
 # 
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # Contributors:
 #   IBM Corporation - initial API and implementation
 #   Bernd Hufmann - Updated for TMF
+#   Alexandre Montplaisir - Renamed variables
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
 # NLS_ENCODING=UTF-8
 
 ##SD
-_1   = Lifeline node {0}
-_2   = Message node {0} from Lifeline {1} at event occurrence {2} to Lifeline {3} at event occurrence {4}
-_3   = Lost Message node {0} from Lifeline {1} at event occurrence {2}
-_4   = Found Message node {0} to Lifeline {1} at event occurrence {2}
-_5   = Execution occurrence {0} on Lifeline {1} from event occurrence {2} to {3}
+SequenceDiagram_LifelineNode=Lifeline node {0}
+SequenceDiagram_MessageNode=Message node {0} from Lifeline {1} at event occurrence {2} to Lifeline {3} at event occurrence {4}
+SequenceDiagram_LostMessageNode=Lost Message node {0} from Lifeline {1} at event occurrence {2}
+SequenceDiagram_FoundMessageNode=Found Message node {0} to Lifeline {1} at event occurrence {2}
+SequenceDiagram_ExecutionOccurrenceWithParams=Execution occurrence {0} on Lifeline {1} from event occurrence {2} to {3}
 
-# Full words versions are for accessibility (screen reader)
-_6   = {0,number} day {1,number,00} h
-_7   = {0,number} day {1,number,00} hours
-_8   = {0,number} days {1,number,00} h
-_9   = {0,number} days {1,number,00} hours
-_10  = {0,number} h {1,number,00} min
-_11  = {0,number} hours {1,number,00} minutes
-_12  = {0,number} min {1,number,00} s
-_13  = {0,number} minutes {1,number,00} seconds
-_14  = {0,number,0.###} s
-_15  = {0,number,0.###} seconds
-_16  = {0,number,0.###} ms
-_17  = {0,number,0.###} milliseconds
+SequenceDiagram_Find=Find
+SequenceDiagram_Close=Close
+SequenceDiagram_StringNotFound=String not found
+SequenceDiagram_SequenceDiagramFind=Sequence Diagram Find
+SequenceDiagram_SearchFor=Search for
+SequenceDiagram_MatchingString=Matching string (regular expression):
+SequenceDiagram_CaseSensitive=Case sensitive
+SequenceDiagram_Lifeline=Lifeline
+SequenceDiagram_Stop=Stop
+SequenceDiagram_SynchronousMessage=Synchronous message
+SequenceDiagram_SynchronousMessageReturn=Synchronous message return
+SequenceDiagram_AsynchronousMessage=Asynchronous message
+SequenceDiagram_AsynchronousMessageReturn=Asynchronous message return
+SequenceDiagram_or=or
+SequenceDiagram_PreviousPage=Previous page
+SequenceDiagram_NextPage=Next page
+SequenceDiagram_GoToPreviousPage=Go to previous page
+SequenceDiagram_GoToNextPage=Go to next page
+SequenceDiagram_GoToMessage=Go to message
+SequenceDiagram_GoToMessageReturn=Go to message return
+SequenceDiagram_FindEllipsis=Find...
+SequenceDiagram_EditFilters=Edit filters...
+SequenceDiagram_HidePatterns=Hide Patterns...
+SequenceDiagram_Pages=Pages...
+SequenceDiagram_ZoomIn=Zoom in
+SequenceDiagram_ZoomInTheDiagram=Zoom in the diagram
+SequenceDiagram_ResetZoomFactor=Reset zoom factor
+SequenceDiagram_ZoomOut=Zoom out
+SequenceDiagram_ZoomOutTheDiagram=Zoom out the diagram
+SequenceDiagram_Select=Select
+SequenceDiagram_Max=Max
+SequenceDiagram_Min=Min
+SequenceDiagram_ListOfHideDisplayPatterns=List of hide/display patterns
+SequenceDiagram_hide=hide
+SequenceDiagram_display=display
+SequenceDiagram_EditIt=Edit it
+SequenceDiagram_Add=Add...
+SequenceDiagram_Create=Create
+SequenceDiagram_Update=Update
+SequenceDiagram_Remove=Remove
+SequenceDiagram_SequenceDiagramHidePatterns=Sequence Diagram Hide Patterns
+SequenceDiagram_DefinitionOfHidePattern=Definition of Hide Pattern
+SequenceDiagram_PageNavigation=Page navigation
+SequenceDiagram_SequenceDiagramPages=Sequence Diagram Pages
+SequenceDiagram_IsInBetween={0,number} <= value <= {1,number}
+SequenceDiagram_Total=Total:
+SequenceDiagram_pages=pages
+SequenceDiagram_page=page
+SequenceDiagram_CurrentPage=Current page:
+SequenceDiagram_Navigation=Navigation
+SequenceDiagram_OpenOverviewTooltip=Click to open Overview\nDrag mouse to scroll\nUse Shift+Drag, Ctrl+Drag to scroll slower\nUse Shift+Ctrl+Drag to scroll very fine
+SequenceDiagram_LifelineWidth=&Lifeline Width (in pixels)
+SequenceDiagram_AaBbYyZz=AaBbYyZz
+SequenceDiagram_IncreaseFontSizeWhenZooming=&Increase font size when zooming
+SequenceDiagram_ExcludeExternalTime=&Exclude external time
+SequenceDiagram_UseGradientColor=&Use gradient color
+SequenceDiagram_Background=Background
+SequenceDiagram_Lines=Lines
+SequenceDiagram_Text=Text
+SequenceDiagram_ExecutionOccurrence=Execution Occurrence
+SequenceDiagram_SyncMessage=Sync Message
+SequenceDiagram_SyncMessageReturn=Sync Message Return
+SequenceDiagram_AsyncMessage=Async Message
+SequenceDiagram_AsyncMessageReturn=Async Message Return
+SequenceDiagram_Frame=Frame
+SequenceDiagram_LifelineHeader=Lifeline Header
+SequenceDiagram_FrameTitle=Frame Title
+SequenceDiagram_ShowTooltips=&Show tooltips
+SequenceDiagram_Error=Error
+SequenceDiagram_InvalidRange=Invalid range
+SequenceDiagram_InvalidNbVertical=Number of vertical pages is invalid
+SequenceDiagram_InvalidNbHorizontal=Number of horizontal pages is invalid
+SequenceDiagram_NoPageSelected=There is no page selected
+SequenceDiagram_FromPage=F&rom page 
+SequenceDiagram_to=&to
+SequenceDiagram_SelectedPages=Selected pages
+SequenceDiagram_CurrentView=Current view
+SequenceDiagram_AllPages=&All pages
+TotalNumberOfPages=Total number of pages:
+SequenceDiagram_NumberOfHorizontalPages=Number of horizontal pages:
+SequenceDiagram_NumberOfVerticalPages=Number of vertical pages:
+SequenceDiagram_UseCurrentZoom=Use current zoom
+SequenceDiagram_ZoomOption=Zoom options
+SequenceDiagram_Print=Print
+SequenceDiagram_Printer=Printer...
+SequenceDiagram_plus={0} + {1}
+SequenceDiagram_Page=Page {0}
+SequenceDiagram_PrintRange=Print range
+SequenceDiagram_Preview=Preview
 
-# \u00B5 is the greek mu letter for micro(second)
-_18  = {0,number,0.###} \u00B5s
-_19  = {0,number,0.###} microseconds
-_20  = Time elapsed from selection {0}
-_21  = Find
-_22  = Close
-_23  = String not found
-_24  = Sequence Diagram Find
-_25  = Search for
-_26  = Matching string (regular expression):
-_27  = Case sensitive
-_28  = Lifeline
-_29  = Stop
-_30  = Synchronous message
-_31  = Synchronous message return
-_32  = Asynchronous message
-_33  = Asynchronous message return
-_34  = or
-_35  = Previous page
-_36  = Next page
-_37  = Go to previous page
-_38  = Go to next page
-_39  = Go to message
-_40  = Go to message return
-_41  = Find...
-_42  = Edit filters...
-#_43  = Hide/Display Patterns...
-_43  = Hide Patterns...
-_44  = Pages...
-_45  = Hide internal messages
-_46  = Hide or display internal messages
-_47  = Zoom in
-_48  = Zoom in the diagram
-_49  = Reset zoom factor
-_50  = Reset zoom factor
-_51  = Zoom out
-_52  = Zoom out the diagram
-_53  = Select
-_54  = Select
-_55  = Max
-_56  = Min
-_57  = List of hide/display patterns
-_58  = hide
-_59  = display
-_60  = Edit it
-_61  = Add...
-_62  = Create
-_63  = Update
-_64  = Remove
-#_65  = Sequence Diagram Hide/Display Patterns
-_65  = Sequence Diagram Hide Patterns
-_66  = Definition of Hide Pattern
-_67  = Page navigation
-_68  = Sequence Diagram Pages
-_69  = {0,number} <= value <= {1,number}
-_70  = Total:
-_71  = pages
-_72  = page
-_73  = pages
-_74  = Currently in all pages:
-_75  = Current page:
-_76  = Maximum number of {0} in a page:
-_77  = Navigation
-_78  = Click to open Overview\nDrag mouse to scroll\nUse Shift+Drag, Ctrl+Drag to scroll slower\nUse Shift+Ctrl+Drag to scroll very fine
-_79  = "Use 'Open with...|UML2 interactions' menu item to populate this view"
-_80  = &Lifeline Width (in pixels)
-_81  = AaBbYyZz
-_82  = &Increase font size when zooming
-_83  = &Exclude external time
-_84  = &Use gradient color
-_85  = Background
-_86  = Lines
-_87  = Text
-_88 = Lifeline
-_89 = Execution Occurrence
-_90 = Sync Message
-_91 = Sync Message Return
-_92 = Async Message
-_93 = Async Message Return
-_94 = Frame
-_95 = Lifeline Header
-_96 = Frame Title
-_97 = &Show tooltips
-_98 = Error
-_99 = Invalid range
-_100 = Number of vertical pages is invalid
-_101 = Number of horizontal pages is invalid
-_102 = There is no page selected
-_103 = F&rom page 
-_104 = From
-_105 = &to
-_106 = Selected pages
-_107 = Current view
-_108 = &All pages
-_109 = Total number of pages:
-_110 = Number of horizontal pages:
-_111 = Number of vertical pages:
-_112 = Use current zoom
-_113 = Zoom options
-_114 = Print
-_115 = Printer...
-_116 = {0} + {1}
-_117 = Page {0}
-_118 = Print range
-_119 = Preview
-#report messages
-_120          = Print
-_121      = Define printer options for printing the Sequence Diagram
-_122=Print Sequence Diagram content
+SequenceDiagram_TimeCompressionBarConfig=TimeCompression bar configuration
+SequenceDiagram_MinTime=Min time
+SequenceDiagram_MaxTime=Max time
+SequenceDiagram_Default=Default
 
-_123 = TimeCompression bar configuration
-_124 = Min time
-_125 = Max time
-_126 = Default
-_127 = {0,number,0.###}
-_128 = days
-_129 = hours
-_130 = minutes
-_131 = s
-_132 = ms
-# \u00B5 is the greek mu letter for micro(second)
-_133 = \u00B5s
+SequenceDiagram_NoPrinterSelected=No default printer is selected. Click Printer button first and select a printer.
 
-_134  = Min Time {0} \n\nCurrent Time {1} \n\nMaxTime {2}
+SequenceDiagram_Scale=Scale
+SequenceDiagram_Precision=Precision
+SequenceDiagram_Delta=Delta
 
-_135 = No default printer is selected. Click Printer button first and select a printer.
+SequenceDiagram_FirstPage=First page
+SequenceDiagram_GoToFirstPage=Go to first page
+SequenceDiagram_LastPage=Last page
+SequenceDiagram_GoToLastPage=Go to last page
 
-_136 = Scale
-_137 = Precision
-_138 = Delta
-
-_139  = First page
-_140  = Go to first page
-
-_141  = Last page
-_142  = Go to last page
-
-uml_23  = Show the node end
-uml_25  = Show the node start
-uml_45 = Configure Min Max
+SequenceDiagram_ShowNodeEnd=Show the node end
+SequenceDiagram_ShowNodeStart=Show the node start
+SequenceDiagram_ConfigureMinMax=Configure Min Max
This page took 0.060851 seconds and 5 git commands to generate.