| author | Rainer Pielmann | 2012-01-31 03:40:11 (EST) |
|---|---|---|
| committer | Stephan Born | 2012-04-27 04:58:53 (EDT) |
| commit | 75c9c4d0b50b3a43cd88191a58ec3bc811e46352 (patch) (side-by-side diff) | |
| tree | 1c910a51e025dd84c6e6b07aaadab9316597b885 | |
| parent | db93536c60dc42f8668d5fd5c07097c09ea4f866 (diff) | |
| download | org.eclipse.stardust.ide.simulation-75c9c4d0b50b3a43cd88191a58ec3bc811e46352.zip org.eclipse.stardust.ide.simulation-75c9c4d0b50b3a43cd88191a58ec3bc811e46352.tar.gz org.eclipse.stardust.ide.simulation-75c9c4d0b50b3a43cd88191a58ec3bc811e46352.tar.bz2 | |
Jira-ID: CRNT-22379 CRNT-22383
Merge changes done on b_dev_6_0_x after 6.0.2.GA (6.0.2.2-r49368) through 6.0.3.GA (6.0.3.6-r50668) and beyond (6.0.x HEAD) to 7.0 (trunk) - moonglow / simulation / tate / tds
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide.simulation@53243 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
153 files changed, 2168 insertions, 1359 deletions
diff --git a/org.eclipse.stardust.ide.simulation.rt/plugin.properties b/org.eclipse.stardust.ide.simulation.rt/plugin.properties index e0fb0a5..d1d3c5f 100644 --- a/org.eclipse.stardust.ide.simulation.rt/plugin.properties +++ b/org.eclipse.stardust.ide.simulation.rt/plugin.properties @@ -14,3 +14,5 @@ launchConfigurationTypeName=Infinity Simulation Engine launchConfigurationDesc=Starts simulations on process models. simulationConfigurationName=Simulation simulationConfigurationOverlaysName=Statistics Overlays +infinitySimulation=Infinity Simulation +infinityCategory=Infinity diff --git a/org.eclipse.stardust.ide.simulation.rt/plugin.xml b/org.eclipse.stardust.ide.simulation.rt/plugin.xml index 5f5a780..9b202cc 100644 --- a/org.eclipse.stardust.ide.simulation.rt/plugin.xml +++ b/org.eclipse.stardust.ide.simulation.rt/plugin.xml @@ -62,7 +62,7 @@ class="org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.StatisticsView" icon="icons/simulation.gif" id="org.eclipse.stardust.ide.simulation.ui.runtime.gui.StatisticsView" - name="Infinity Simulation"/> + name="%infinityCategory"/> <category id="org.eclipse.stardust.modeling.core.viewcategory" name="CARNOT"/> diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/StandaloneSimulationEngine.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/StandaloneSimulationEngine.java index a240066..55a22e7 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/StandaloneSimulationEngine.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/StandaloneSimulationEngine.java @@ -49,7 +49,7 @@ public class StandaloneSimulationEngine { new SimulationTimeIntervalConfiguration(new SimpleDateFormat("ddMMyyyy").parse("02112007")); //$NON-NLS-1$ //$NON-NLS-2$ TerminationConditionConfiguration terminationConditionConfiguration = new TerminationConditionConfiguration(TerminationConditions.TRANSITION_TRAVERSED_COUNT_ID, - new TransitionTraversedConfiguration("ProcessDefinition_2", "2_1", "Transition_1", 2) //$NON-NLS-1$ //$NON-NLS-2$ + new TransitionTraversedConfiguration("ProcessDefinition_2", "2_1", "Transition_1", 2) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ); SimulationRuntimeConfiguration simulationRuntimeConfiguration = new SimulationRuntimeConfiguration( diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/AuditTrailJdbcEventLogger.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/AuditTrailJdbcEventLogger.java index fc3cd0f..0d7dc1b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/AuditTrailJdbcEventLogger.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/AuditTrailJdbcEventLogger.java @@ -79,9 +79,9 @@ import org.eclipse.stardust.ide.simulation.rt.output.beans.SimulatedPiHierarchyB import org.eclipse.stardust.ide.simulation.rt.output.beans.SimulatedPiScopeBean; import org.eclipse.stardust.ide.simulation.rt.output.beans.SimulatedTiBean; import org.eclipse.stardust.ide.simulation.rt.runtime.SimulationRandom; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.JdbcConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationPreconditionException; @@ -301,9 +301,10 @@ public class AuditTrailJdbcEventLogger implements IModelEventLogger { Parameters.instance().flush(); } - + public void init(SimulationRuntimeConfiguration simulationRuntimeConfiguration) { + // initalize jdbc connection try { @@ -328,7 +329,7 @@ public class AuditTrailJdbcEventLogger implements IModelEventLogger { // version checks if (this.activeModels.isEmpty()) { - throw new SimulationPreconditionException(Messages.AUDITTRAIL_LOGGING_NO_MODEL_ERROR); + throw new SimulationPreconditionException(Simulation_Runtime_Messages.AUDITTRAIL_LOGGING_NO_MODEL_ERROR); } ModelDefinitionRepository repository @@ -340,7 +341,7 @@ public class AuditTrailJdbcEventLogger implements IModelEventLogger { if(model == null) { String errorMsg - = Messages.bind(Messages.AUDITTRAIL_LOGGING_NO_MODEL_FOUND, def.getModelId()); + = Simulation_Runtime_Messages.bind(Simulation_Runtime_Messages.AUDITTRAIL_LOGGING_NO_MODEL_FOUND, def.getModelId()); throw new SimulationPreconditionException(errorMsg); } else @@ -357,7 +358,7 @@ public class AuditTrailJdbcEventLogger implements IModelEventLogger { versionOnServer, versionLocal }; - String msg = Messages.bind(Messages.AUDITTRAIL_LOGGING_VERSION_CHECK_ERROR, params); + String msg = Simulation_Runtime_Messages.bind(Simulation_Runtime_Messages.AUDITTRAIL_LOGGING_VERSION_CHECK_ERROR, params); throw new SimulationPreconditionException(msg); } } @@ -365,7 +366,7 @@ public class AuditTrailJdbcEventLogger implements IModelEventLogger { } catch (InternalException e) { if (e.getCause() != null || e.getCause() instanceof ConnectException) { // a "nice" exception for JDBC connection errors - throw new SimulationFailedException(org.eclipse.stardust.ide.simulation.ui.Messages.AUDITTRAIL_ERR_CONNECTION, simulationRuntimeConfiguration.getSimulationJdbcConfiguration().getConnectionUrl(), e.getCause()); + throw new SimulationFailedException(org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages.AUDITTRAIL_ERR_CONNECTION, simulationRuntimeConfiguration.getSimulationJdbcConfiguration().getConnectionUrl(), e.getCause()); } // something else close(); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/TransitionInstanceEvent.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/TransitionInstanceEvent.java index 151aa43..963f941 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/TransitionInstanceEvent.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/TransitionInstanceEvent.java @@ -26,7 +26,7 @@ public class TransitionInstanceEvent extends ModelEvent { } public String toString () { - return "TransitionInstanceEvent TID <"+this.transitionInstance.getTransitionDefinition().getTransitionDefinitionModel().getId()+"> from <"+this.transitionInstance.getSourceActivityInstance().getActivityDefinition().getActivityDefinitionModel().getId()+"> AIID <"+this.transitionInstance.getSourceActivityInstance().getId()+"> to <"+this.transitionInstance.getTargetActivityInstance().getActivityDefinition().getActivityDefinitionModel().getId()+"> AIID <"+this.transitionInstance.getTargetActivityInstance().getId()+">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + return "TransitionInstanceEvent TID <"+this.transitionInstance.getTransitionDefinition().getTransitionDefinitionModel().getId()+"> from <"+this.transitionInstance.getSourceActivityInstance().getActivityDefinition().getActivityDefinitionModel().getId()+"> AIID <"+this.transitionInstance.getSourceActivityInstance().getId()+"> to <"+this.transitionInstance.getTargetActivityInstance().getActivityDefinition().getActivityDefinitionModel().getId()+"> AIID <"+this.transitionInstance.getTargetActivityInstance().getId()+">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedAiBean.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedAiBean.java index 98a0d51..50e8efe 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedAiBean.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedAiBean.java @@ -673,7 +673,7 @@ public class SimulatedAiBean extends AttributedIdentifiablePersistentBean // todo (rsauer): perform onAssignment event handling? Assert.condition(model == participant.getModel().getModelOID(), - "Cannot assign " + this + " to participant from different model."); + "Cannot assign " + this + " to participant from different model."); //$NON-NLS-1$ //$NON-NLS-2$ //recordHistoricState(); //recordInitialPerformer(); @@ -689,7 +689,7 @@ public class SimulatedAiBean extends AttributedIdentifiablePersistentBean markModified(FIELD__CURRENT_DEPARTMENT); currentDepartment = departmentOid; - trace.info("Performer of " + this + " set to " + participant + "."); + trace.info("Performer of " + this + " set to " + participant + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public long getProcessInstanceOID() @@ -1457,7 +1457,7 @@ public void activate() throws IllegalStateChangeException Method method; try { - method = ActivityInstanceBean.class.getMethod("delegateToParticipant", IModelParticipant.class, IDepartment.class); + method = ActivityInstanceBean.class.getMethod("delegateToParticipant", IModelParticipant.class, IDepartment.class); //$NON-NLS-1$ } catch (Exception e) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedPiBean.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedPiBean.java index 6faaf68..7900581 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedPiBean.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedPiBean.java @@ -105,9 +105,9 @@ public class SimulatedPiBean extends AttributedIdentifiablePersistentBean private static final int PREFETCH_BATCH_SIZE = 400; - private static final String PI_NOTE = "NOTE"; - private static final String ABORTING_PI_OID = "Infinity.RootProcessInstance.AbortingPiOid"; - public static final String PI_NOTE_CONTEXT_PREFIX_PATTERN = "<context kind=\"{0}\" oid=\"{1}\" />"; + private static final String PI_NOTE = "NOTE"; //$NON-NLS-1$ + private static final String ABORTING_PI_OID = "Infinity.RootProcessInstance.AbortingPiOid"; //$NON-NLS-1$ + public static final String PI_NOTE_CONTEXT_PREFIX_PATTERN = "<context kind=\"{0}\" oid=\"{1}\" />"; //$NON-NLS-1$ private static final int PI_PROPERTY_FLAG_ANY = 1; // first bit public static final int PI_PROPERTY_FLAG_NOTE = 2; // second bit @@ -121,8 +121,8 @@ public class SimulatedPiBean extends AttributedIdentifiablePersistentBean public static final String FIELD__STATE = ProcessInstanceBean.FIELD__STATE; public static final String FIELD__MODEL = ProcessInstanceBean.FIELD__MODEL; public static final String FIELD__PROCESS_DEFINITION = ProcessInstanceBean.FIELD__PROCESS_DEFINITION; - public static final String FIELD__PRIORITY = "priority"; - public static final String FIELD__DEPLOYMENT = "deployment"; + public static final String FIELD__PRIORITY = "priority"; //$NON-NLS-1$ + public static final String FIELD__DEPLOYMENT = "deployment"; //$NON-NLS-1$ public static final String FIELD__ROOT_PROCESS_INSTANCE = ProcessInstanceBean.FIELD__ROOT_PROCESS_INSTANCE; public static final String FIELD__SCOPE_PROCESS_INSTANCE = ProcessInstanceBean.FIELD__SCOPE_PROCESS_INSTANCE; public static final String FIELD__STARTING_USER = ProcessInstanceBean.FIELD__STARTING_USER; @@ -131,7 +131,7 @@ public class SimulatedPiBean extends AttributedIdentifiablePersistentBean * @deprecated This attribute will not be maintained starting with version 3.2.1. */ public static final String FIELD__TOKEN_COUNT = ProcessInstanceBean.FIELD__TOKEN_COUNT; - public static final String FIELD__PROPERTIES_AVAILABLE = "propertiesAvailable"; + public static final String FIELD__PROPERTIES_AVAILABLE = "propertiesAvailable"; //$NON-NLS-1$ public static final FieldRef FR__OID = new FieldRef(SimulatedPiBean.class, FIELD__OID); public static final FieldRef FR__START_TIME = new FieldRef(SimulatedPiBean.class, FIELD__START_TIME); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedTiBean.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedTiBean.java index 8ee5c03..42f79fa 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedTiBean.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/output/beans/SimulatedTiBean.java @@ -26,11 +26,11 @@ public class SimulatedTiBean extends IdentifiablePersistentBean implements ITransitionInstance { public static final String FIELD__OID = IdentifiablePersistentBean.FIELD__OID; - public static final String FIELD__PROCESS_INSTANCE = "processInstance"; - public static final String FIELD__MODEL = "model"; - public static final String FIELD__TRANSITION = "transition"; - public static final String FIELD__SOURCE = "source"; - public static final String FIELD__TARGET = "target"; + public static final String FIELD__PROCESS_INSTANCE = "processInstance"; //$NON-NLS-1$ + public static final String FIELD__MODEL = "model"; //$NON-NLS-1$ + public static final String FIELD__TRANSITION = "transition"; //$NON-NLS-1$ + public static final String FIELD__SOURCE = "source"; //$NON-NLS-1$ + public static final String FIELD__TARGET = "target"; //$NON-NLS-1$ public static final FieldRef FR__OID = new FieldRef(SimulatedTiBean.class, FIELD__OID); public static final FieldRef FR__PROCESS_INSTANCE = new FieldRef(SimulatedTiBean.class, FIELD__PROCESS_INSTANCE); @@ -39,10 +39,10 @@ public class SimulatedTiBean extends IdentifiablePersistentBean public static final FieldRef FR__SOURCE = new FieldRef(SimulatedTiBean.class, FIELD__SOURCE); public static final FieldRef FR__TARGET = new FieldRef(SimulatedTiBean.class, FIELD__TARGET); - public static final String TABLE_NAME = "trans_inst"; - public static final String DEFAULT_ALIAS = "ti"; + public static final String TABLE_NAME = "trans_inst"; //$NON-NLS-1$ + public static final String DEFAULT_ALIAS = "ti"; //$NON-NLS-1$ public static final String PK_FIELD = FIELD__OID; - public static final String PK_SEQUENCE = "trans_inst_seq"; + public static final String PK_SEQUENCE = "trans_inst_seq"; //$NON-NLS-1$ public static final String[] trans_inst_idx1_INDEX = new String[] {FIELD__PROCESS_INSTANCE}; public static final String[] trans_inst_idx2_UNIQUE_INDEX = new String[] {FIELD__OID}; diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/SimulationRuntimePlugin.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/SimulationRuntimePlugin.java index da7f7ac..2645daa 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/SimulationRuntimePlugin.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/SimulationRuntimePlugin.java @@ -21,7 +21,7 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.stardust.ide.simulation.rt.runtime.ISimulationController; import org.eclipse.stardust.ide.simulation.rt.runtime.SimulationController; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -124,7 +124,7 @@ class SimulationRuntimeLogListener implements ILogListener { plugin.getWorkbench().getDisplay().syncExec(new Runnable() { public void run() { ErrorDialog.openError(plugin.getWorkbench().getDisplay().getActiveShell(), - Messages.RUNTIME_ERROR_TITLE, + Simulation_Runtime_Messages.RUNTIME_ERROR_TITLE, null, //Messages.RUNTIME_ERROR_MESSAGE, status); } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalCommand.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalCommand.java index 130106d..fdd29bb 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalCommand.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalCommand.java @@ -15,9 +15,9 @@ import java.util.Iterator; import org.eclipse.gef.commands.Command; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationConfigurationList; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.audittrail.AuditTrailEvaluator; import org.eclipse.stardust.ide.simulation.ui.audittrail.AuditTrailQueryFactoryForEMF; import org.eclipse.stardust.ide.simulation.ui.audittrail.DatabaseFacade; @@ -102,7 +102,7 @@ public class AuditTrailRetrievalCommand extends Command { try { databaseFacade.close(); } catch (SQLException e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_CONNECTION_CLOSE, e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_CONNECTION_CLOSE, e); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalDelegate.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalDelegate.java index 4f1fe1f..e348809 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalDelegate.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/AuditTrailRetrievalDelegate.java @@ -17,8 +17,8 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; import org.eclipse.gef.commands.CommandStack; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationCoreException; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; import org.eclipse.stardust.model.xpdl.carnot.ModelType; @@ -41,7 +41,7 @@ public class AuditTrailRetrievalDelegate implements ILaunchConfigurationDelegate IEditorPart editPart = UiAccessor.getActiveEditPart(); if (editPart == null || !(editPart instanceof WorkflowModelEditor)) { - throw new SimulationCoreException(Messages.RC_ERR_InvalidWorkbenchState, null); + throw new SimulationCoreException(Simulation_Runtime_Messages.RC_ERR_InvalidWorkbenchState, null); } AuditTrailRetrievalCommand command = new AuditTrailRetrievalCommand(runtimeConfiguration, model); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/SimulationLaunchDelegate.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/SimulationLaunchDelegate.java index 06147ec..528791d 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/SimulationLaunchDelegate.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/launching/SimulationLaunchDelegate.java @@ -38,7 +38,7 @@ public class SimulationLaunchDelegate extends LaunchConfigurationDelegate { try { // as long as I don't understand the usage of context ... PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(IPageLayout.ID_PROBLEM_VIEW); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.pde.runtime.LogView"); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView("org.eclipse.pde.runtime.LogView"); //$NON-NLS-1$ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(SliderView.ID); PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(StatisticsView.ID); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcAuditTrailConfigurationPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcAuditTrailConfigurationPanel.java index 86f1458..2aedfda 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcAuditTrailConfigurationPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcAuditTrailConfigurationPanel.java @@ -21,9 +21,9 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.common.StringUtils; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.JdbcConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.ui.validation.ValidationUtils; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.swt.SWT; @@ -75,7 +75,7 @@ public class JdbcAuditTrailConfigurationPanel { // Audit check box auditCheckBox = new Button(comp, SWT.CHECK); - auditCheckBox.setText(Messages.LOG_TO_AUDIT_TRAIL); + auditCheckBox.setText(Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL); auditCheckBox.addSelectionListener(new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { enableFields(auditCheckBox.getSelection()); @@ -87,7 +87,7 @@ public class JdbcAuditTrailConfigurationPanel { } }); - askForConfirmation = FormBuilder.createCheckBox(comp, Messages.ASK_BEFORE_LOGGING); + askForConfirmation = FormBuilder.createCheckBox(comp, Simulation_Runtime_Messages.ASK_BEFORE_LOGGING); askForConfirmation.setEnabled(auditCheckBox.getSelection()); askForConfirmation.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -97,7 +97,7 @@ public class JdbcAuditTrailConfigurationPanel { // Cleanup runtime check box cleanupRuntimeCheckBox = new Button(comp, SWT.CHECK); - cleanupRuntimeCheckBox.setText(Messages.CLEANUP_RUNTIME); + cleanupRuntimeCheckBox.setText(Simulation_Runtime_Messages.CLEANUP_RUNTIME); cleanupRuntimeCheckBox.addSelectionListener(new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { firePropertyChange(); @@ -109,7 +109,7 @@ public class JdbcAuditTrailConfigurationPanel { Group jdbcPanelOut = new Group(comp, SWT.NULL); - jdbcPanelOut.setText(Messages.AUDIT_TRAIL_JDBC_CONFIGURATION); + jdbcPanelOut.setText(Simulation_Runtime_Messages.AUDIT_TRAIL_JDBC_CONFIGURATION); // inner box Composite jdbcPanelIn = new Composite(jdbcPanelOut, SWT.NONE); @@ -119,7 +119,7 @@ public class JdbcAuditTrailConfigurationPanel { // Import button databaseImportFromFile = new Button(jdbcPanelIn, SWT.PUSH); - databaseImportFromFile.setText(Messages.JDBCTAB_IMPORT_BUTTON); + databaseImportFromFile.setText(Simulation_Runtime_Messages.JDBCTAB_IMPORT_BUTTON); databaseImportFromFile.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { invokeImportJdbcConfigurationDialog(); @@ -128,7 +128,7 @@ public class JdbcAuditTrailConfigurationPanel { // DBTYPE Label databaseTypeLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseTypeLabel.setText(Messages.DATABASE_TYPE); + databaseTypeLabel.setText(Simulation_Runtime_Messages.DATABASE_TYPE); databaseTypeCombo = new Combo(jdbcPanelIn, SWT.BORDER | SWT.READ_ONLY); databaseTypeCombo.setItems(JdbcConfigurationUtility.getDatabaseTypeItems()); @@ -146,7 +146,7 @@ public class JdbcAuditTrailConfigurationPanel { // Driver class name Label jdbcDriverLabel = new Label(jdbcPanelIn, SWT.NONE); - jdbcDriverLabel.setText(Messages.JDBC_DRIVER); + jdbcDriverLabel.setText(Simulation_Runtime_Messages.JDBC_DRIVER); driverClassNameText = new Text(jdbcPanelIn, SWT.SINGLE | SWT.BORDER); driverClassNameText.addModifyListener(new ModifyListener() { @@ -158,7 +158,7 @@ public class JdbcAuditTrailConfigurationPanel { // Database URL Label databaseUrlLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseUrlLabel.setText(Messages.JDBC_URL); + databaseUrlLabel.setText(Simulation_Runtime_Messages.JDBC_URL); databaseURLText = new Text(jdbcPanelIn, SWT.SINGLE | SWT.BORDER); databaseURLText.addModifyListener(new ModifyListener() { @@ -168,9 +168,9 @@ public class JdbcAuditTrailConfigurationPanel { }); Label databaseSchemaLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseSchemaLabel.setText(Messages.JDBC_SCHEMA); + databaseSchemaLabel.setText(Simulation_Runtime_Messages.JDBC_SCHEMA); - databaseSchemaDefault = FormBuilder.createCheckBox(jdbcPanelIn, Messages.JDBC_SCHEMA_DEFAULT); + databaseSchemaDefault = FormBuilder.createCheckBox(jdbcPanelIn, Simulation_Runtime_Messages.JDBC_SCHEMA_DEFAULT); databaseSchemaDefault.setSelection(true); databaseSchemaDefault.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -189,9 +189,9 @@ public class JdbcAuditTrailConfigurationPanel { // Partition Label databasePatritionLabel = new Label(jdbcPanelIn, SWT.NONE); - databasePatritionLabel.setText(Messages.JDBC_PARTITION); + databasePatritionLabel.setText(Simulation_Runtime_Messages.JDBC_PARTITION); - databasePatritionDefault = FormBuilder.createCheckBox(jdbcPanelIn, Messages.JDBC_PARTITION_DEFAULT); + databasePatritionDefault = FormBuilder.createCheckBox(jdbcPanelIn, Simulation_Runtime_Messages.JDBC_PARTITION_DEFAULT); databasePatritionDefault.setSelection(true); databasePatritionDefault.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -210,7 +210,7 @@ public class JdbcAuditTrailConfigurationPanel { // Database account Label databaseAccountLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseAccountLabel.setText(Messages.JDBC_ACCOUNT); + databaseAccountLabel.setText(Simulation_Runtime_Messages.JDBC_ACCOUNT); Composite databaseAccountAndPasswortLine = new Composite(jdbcPanelIn, SWT.NULL); @@ -224,7 +224,7 @@ public class JdbcAuditTrailConfigurationPanel { // Database Password Label databasePasswordLabel = new Label(databaseAccountAndPasswortLine, SWT.NONE); - databasePasswordLabel.setText(Messages.JDBC_PASSWORD); + databasePasswordLabel.setText(Simulation_Runtime_Messages.JDBC_PASSWORD); databasePasswordText = new Text(databaseAccountAndPasswortLine, SWT.SINGLE | SWT.BORDER); databasePasswordText.setEchoChar('*'); @@ -438,13 +438,13 @@ public class JdbcAuditTrailConfigurationPanel { if (auditCheckBox.getSelection()) { ValidationUtils.validate(!StringUtils.isEmpty(driverClassNameText.getText()), - Messages.JDBC_DRIVER, Messages.RC_ERR_LogJdbcDriver); + Simulation_Runtime_Messages.JDBC_DRIVER, Simulation_Runtime_Messages.RC_ERR_LogJdbcDriver); ValidationUtils.validate(JdbcConfigurationUtility.driverClassInClasspath(driverClassNameText.getText(), launchConfiguration), - Messages.JDBC_DRIVER, driverClassNameText.getText(), Messages.RC_ERR_LogJdbcDriverNotFound); + Simulation_Runtime_Messages.JDBC_DRIVER, driverClassNameText.getText(), Simulation_Runtime_Messages.RC_ERR_LogJdbcDriverNotFound); ValidationUtils.validate(!StringUtils.isEmpty(databaseURLText.getText()), - Messages.JDBC_DRIVER, Messages.RC_ERR_LogJdbcUrl); + Simulation_Runtime_Messages.JDBC_DRIVER, Simulation_Runtime_Messages.RC_ERR_LogJdbcUrl); } } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcConfigurationUtility.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcConfigurationUtility.java index c7e6185..2f8ec70 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcConfigurationUtility.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/JdbcConfigurationUtility.java @@ -17,7 +17,7 @@ import java.util.Properties; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.stardust.engine.core.persistence.jdbc.DBMSKey; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.util.EclipseUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.FileDialog; @@ -47,7 +47,7 @@ public class JdbcConfigurationUtility { public static Properties invokeImportDialog(Shell shell) { FileDialog dialog = new FileDialog(shell, SWT.OPEN); dialog.setFilterExtensions(new String[] {"carnot.properties", "*.properties", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - dialog.setFilterNames(new String[] {Messages.RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_carnot_properties, Messages.RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_properties, Messages.RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_all}); + dialog.setFilterNames(new String[] {Simulation_Runtime_Messages.RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_carnot_properties, Simulation_Runtime_Messages.RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_properties, Simulation_Runtime_Messages.RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_all}); String filename = dialog.open(); if (filename != null) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/LogToAuditTrailTab.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/LogToAuditTrailTab.java index 5cda43a..d60aab9 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/LogToAuditTrailTab.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/LogToAuditTrailTab.java @@ -16,10 +16,10 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.JdbcConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.RetrieveFromAuditTrailConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; @@ -55,7 +55,7 @@ public class LogToAuditTrailTab extends AbstractLaunchConfigurationTab { Composite topComp = new Composite(parent, SWT.NONE); setControl(topComp); - PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), Messages.AUDIT_TRAIL_LOGGING_CONFIGURATION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), Simulation_Runtime_Messages.AUDIT_TRAIL_LOGGING_CONFIGURATION); GridLayout topLayout = new GridLayout(); topLayout.numColumns = 1; topLayout.marginHeight=0; @@ -73,7 +73,7 @@ public class LogToAuditTrailTab extends AbstractLaunchConfigurationTab { } public String getName() { - return Messages.AUDIT_TRAIL_LOGGING_CONFIGURATION; + return Simulation_Runtime_Messages.AUDIT_TRAIL_LOGGING_CONFIGURATION; } public void initializeFrom(ILaunchConfiguration configuration) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/MainTab.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/MainTab.java index 26ca764..0d46cdd 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/MainTab.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/MainTab.java @@ -42,11 +42,11 @@ import org.eclipse.stardust.common.StringUtils; import org.eclipse.stardust.engine.api.model.IModel; import org.eclipse.stardust.ide.simulation.rt.plugin.SimulationRuntimePlugin; import org.eclipse.stardust.ide.simulation.rt.plugin.runtime.ui.termination.TerminationConditionConfigurationPanel; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.TerminationConditionConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.EndOfTimeIntervalConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.RuntimeUtils; import org.eclipse.stardust.ide.simulation.rt.util.TerminationConditions; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; @@ -134,7 +134,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { createMainPanel(comp); Group terminationConditionGroup = new Group(comp, SWT.NULL); - terminationConditionGroup.setText(Messages.TERMINATION_CONFIGURATION); + terminationConditionGroup.setText(Simulation_Runtime_Messages.TERMINATION_CONFIGURATION); GridLayoutFactory.fillDefaults().margins(0,0).spacing(0,0).applyTo(terminationConditionGroup); terminationConditionGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); terminationConditionComposite = new TerminationConditionConfigurationPanel(terminationConditionGroup, SWT.NULL); @@ -149,7 +149,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { Font font = parent.getFont(); Group modelPanel = new Group(parent, SWT.NONE); - modelPanel.setText(Messages.MODEL_CONFIGURATION); + modelPanel.setText(Simulation_Runtime_Messages.MODEL_CONFIGURATION); GridLayout topLayout = new GridLayout(); topLayout.verticalSpacing = 0; @@ -205,7 +205,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { }); Label configLabel = new Label(modelPanel, SWT.NONE); - configLabel.setText(Messages.SIMULATION_CONFIGURATION); + configLabel.setText(Simulation_Runtime_Messages.SIMULATION_CONFIGURATION); configLabel.setFont(font); simulationCombo = new SimulationCombo(modelPanel, SWT.SINGLE | SWT.BORDER); @@ -220,7 +220,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { emptyLabel.setText(""); //$NON-NLS-1$ Label startDateLabel = new Label (modelPanel, SWT.NULL); - startDateLabel.setText(Messages.START_OF_SIMULATION); + startDateLabel.setText(Simulation_Runtime_Messages.START_OF_SIMULATION); startDate = new DatePickerCombo(modelPanel, SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); @@ -317,7 +317,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { } catch (Exception e) { SimulationRuntimePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.RC_ERR_ConfigurationError, e )); + IStatus.OK, Simulation_Runtime_Messages.RC_ERR_ConfigurationError, e )); } } @@ -346,7 +346,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { } public String getName() { - return Messages.MAIN_CONFIGURATION; + return Simulation_Runtime_Messages.MAIN_CONFIGURATION; } public boolean isValid(ILaunchConfiguration configuration) { @@ -361,20 +361,20 @@ public class MainTab extends AbstractLaunchConfigurationTab { // project String projectName = projectText.getText().trim(); ValidationUtils.validate(!StringUtils.isEmpty(projectName), - null, Messages.RC_ERR_Project); + null, Simulation_Runtime_Messages.RC_ERR_Project); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); ValidationUtils.validate(project != null, - null, Messages.RC_ERR_ProjectDoesNotExist); + null, Simulation_Runtime_Messages.RC_ERR_ProjectDoesNotExist); // model String model = modelText.getText().trim(); ValidationUtils.validate(!StringUtils.isEmpty(model), - null, Messages.RC_ERR_ModelFile); + null, Simulation_Runtime_Messages.RC_ERR_ModelFile); IResource resource = project.findMember(model); ValidationUtils.validate(resource != null, - null, Messages.RC_ERR_ModelFileDoesNotExist); + null, Simulation_Runtime_Messages.RC_ERR_ModelFileDoesNotExist); if (this.model != null) { @@ -390,18 +390,18 @@ public class MainTab extends AbstractLaunchConfigurationTab { SimulationConfigurationList simulationConfigurationList = new SimulationConfigurationList(this.model.getAllAttributes()); ValidationUtils.validate(simulationConfigurationList.hasConfigurations(), - null, Messages.RC_ERR_SimulationConfigurationListIsEmpty); + null, Simulation_Runtime_Messages.RC_ERR_SimulationConfigurationListIsEmpty); ValidationUtils.validate(simulationConfigurationList.hasConfiguration(runtimeConfig.getSimulationConfigurationId()), - null, Messages.RC_ERR_SimulationConfigurationIsNotValid); + null, Simulation_Runtime_Messages.RC_ERR_SimulationConfigurationIsNotValid); // start date SimulationConfiguration simulationConfig = new SimulationConfiguration(runtimeConfig.getSimulationConfigurationId(), this.model.getAllAttributes()); - ValidationUtils.validate(this.startDate, Messages.START_OF_SIMULATION, Messages.RC_ERR_StartDate); + ValidationUtils.validate(this.startDate, Simulation_Runtime_Messages.START_OF_SIMULATION, Simulation_Runtime_Messages.RC_ERR_StartDate); SimulationInterval simulationInterval = simulationConfig.getInterval(); - ValidationUtils.validate(this.startDate, simulationInterval.getStartDate(), simulationInterval.getEndDate(), Messages.RC_ERR_StartDateNotValid); + ValidationUtils.validate(this.startDate, simulationInterval.getStartDate(), simulationInterval.getEndDate(), Simulation_Runtime_Messages.RC_ERR_StartDateNotValid); // termination condition terminationConditionComposite.validateConfiguration(this.model, runtimeConfig, simulationConfig); @@ -414,7 +414,7 @@ public class MainTab extends AbstractLaunchConfigurationTab { if (this.simulationCombo.getSelectedId() != -1 && this.simulationCombo.getDefaultId() != -1 && this.simulationCombo.getSelectedId() != this.simulationCombo.getDefaultId()) { - setMessage(Messages.WARNING_USING_NOT_DEFAULT_SIMULATION_CONFIGURATION); + setMessage(Simulation_Runtime_Messages.WARNING_USING_NOT_DEFAULT_SIMULATION_CONFIGURATION); // do not return false, it is only a warning } return super.isValid(configuration); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationConfirmDialog.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationConfirmDialog.java index 5151e3d..009aba2 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationConfirmDialog.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationConfirmDialog.java @@ -15,7 +15,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -35,14 +35,14 @@ public class RetrieveFromAuditTrailConfigurationConfirmDialog extends TitleAreaD } protected Control createDialogArea(Composite parent) { - setTitle(Messages.AUDITTRAIL_CONFIRMATION_TITLE); - setMessage(Messages.AUDITTRAIL_CONFIRMATION_MESSAGE); + setTitle(Simulation_Runtime_Messages.AUDITTRAIL_CONFIRMATION_TITLE); + setMessage(Simulation_Runtime_Messages.AUDITTRAIL_CONFIRMATION_MESSAGE); setHelpAvailable(false); Composite composite = new Composite(parent, SWT.NULL); Label label = new Label(composite, SWT.NULL); - label.setText(Messages.AUDITTRAIL_CONFIRMATION_QUESTION); + label.setText(Simulation_Runtime_Messages.AUDITTRAIL_CONFIRMATION_QUESTION); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(composite); GridLayoutFactory.fillDefaults().margins(10, 10).numColumns(1).applyTo(composite); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationPanel.java index 4e1842e..db64875 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailConfigurationPanel.java @@ -21,9 +21,9 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.common.StringUtils; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.RetrieveFromAuditTrailConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.ui.utils.SimulationDateFormat; import org.eclipse.stardust.ide.simulation.ui.validation.ValidationUtils; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; @@ -87,8 +87,8 @@ public class RetrieveFromAuditTrailConfigurationPanel { fControl = comp; // Checkboxes - retrieveBeforeRun = FormBuilder.createCheckBox(comp, Messages.RETRIEVE_BEFORE_RUN); - askBeforeRetrieve = FormBuilder.createCheckBox(comp, Messages.ASK_BEFORE_RETRIEVE); + retrieveBeforeRun = FormBuilder.createCheckBox(comp, Simulation_Runtime_Messages.RETRIEVE_BEFORE_RUN); + askBeforeRetrieve = FormBuilder.createCheckBox(comp, Simulation_Runtime_Messages.ASK_BEFORE_RETRIEVE); askBeforeRetrieve.setEnabled(retrieveBeforeRun.getSelection()); retrieveBeforeRun.addSelectionListener(new SelectionAdapter() { @@ -106,7 +106,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { // outer box with JDBC title Group jdbcPanelOut = new Group(comp, SWT.NULL); - jdbcPanelOut.setText(Messages.AUDIT_TRAIL_JDBC_CONFIGURATION); + jdbcPanelOut.setText(Simulation_Runtime_Messages.AUDIT_TRAIL_JDBC_CONFIGURATION); // inner box with three columns Composite jdbcPanelIn = new Composite(jdbcPanelOut, SWT.NONE); @@ -115,7 +115,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { Label fillIn1 = new Label(jdbcPanelIn, SWT.NULL); databaseImportFromFile = new Button(jdbcPanelIn, SWT.PUSH); - databaseImportFromFile.setText(Messages.JDBCTAB_IMPORT_BUTTON); + databaseImportFromFile.setText(Simulation_Runtime_Messages.JDBCTAB_IMPORT_BUTTON); databaseImportFromFile.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { invokeImportJdbcConfigurationDialog(); @@ -124,7 +124,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { // DBTYPE Label databaseTypeLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseTypeLabel.setText(Messages.DATABASE_TYPE); + databaseTypeLabel.setText(Simulation_Runtime_Messages.DATABASE_TYPE); databaseTypeCombo = new Combo(jdbcPanelIn, SWT.BORDER | SWT.READ_ONLY); databaseTypeCombo.setItems(JdbcConfigurationUtility.getDatabaseTypeItems()); @@ -138,7 +138,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { // Driver class name Label jdbcDriverLabel = new Label(jdbcPanelIn, SWT.NONE); - jdbcDriverLabel.setText(Messages.JDBC_DRIVER); + jdbcDriverLabel.setText(Simulation_Runtime_Messages.JDBC_DRIVER); driverClassNameText = new Text(jdbcPanelIn, SWT.SINGLE | SWT.BORDER); driverClassNameText.addModifyListener(new ModifyListener() { @@ -150,7 +150,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { // Database URL Label databaseUrlLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseUrlLabel.setText(Messages.JDBC_URL); + databaseUrlLabel.setText(Simulation_Runtime_Messages.JDBC_URL); databaseURLText = new Text(jdbcPanelIn, SWT.SINGLE | SWT.BORDER); databaseURLText.addModifyListener(new ModifyListener() { @@ -162,9 +162,9 @@ public class RetrieveFromAuditTrailConfigurationPanel { // Database Schema Label databaseSchemaLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseSchemaLabel.setText(Messages.JDBC_SCHEMA); + databaseSchemaLabel.setText(Simulation_Runtime_Messages.JDBC_SCHEMA); - databaseSchemaDefault = FormBuilder.createCheckBox(jdbcPanelIn, Messages.JDBC_SCHEMA_DEFAULT); + databaseSchemaDefault = FormBuilder.createCheckBox(jdbcPanelIn, Simulation_Runtime_Messages.JDBC_SCHEMA_DEFAULT); databaseSchemaDefault.setSelection(true); databaseSchemaDefault.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -183,9 +183,9 @@ public class RetrieveFromAuditTrailConfigurationPanel { // Partition Label databasePatritionLabel = new Label(jdbcPanelIn, SWT.NONE); - databasePatritionLabel.setText(Messages.JDBC_PARTITION); + databasePatritionLabel.setText(Simulation_Runtime_Messages.JDBC_PARTITION); - databasePatritionDefault = FormBuilder.createCheckBox(jdbcPanelIn, Messages.JDBC_PARTITION_DEFAULT); + databasePatritionDefault = FormBuilder.createCheckBox(jdbcPanelIn, Simulation_Runtime_Messages.JDBC_PARTITION_DEFAULT); databasePatritionDefault.setSelection(true); databasePatritionDefault.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -204,7 +204,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { // Database account Label databaseAccountLabel = new Label(jdbcPanelIn, SWT.NONE); - databaseAccountLabel.setText(Messages.JDBC_ACCOUNT); + databaseAccountLabel.setText(Simulation_Runtime_Messages.JDBC_ACCOUNT); Composite databaseAccountAndPasswortLine = new Composite(jdbcPanelIn, SWT.NULL); @@ -218,7 +218,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { // Database Password Label databasePasswordLabel = new Label(databaseAccountAndPasswortLine, SWT.NONE); - databasePasswordLabel.setText(Messages.JDBC_PASSWORD); + databasePasswordLabel.setText(Simulation_Runtime_Messages.JDBC_PASSWORD); databasePasswordText = new Text(databaseAccountAndPasswortLine, SWT.SINGLE | SWT.BORDER); databasePasswordText.setEchoChar('*'); @@ -231,10 +231,10 @@ public class RetrieveFromAuditTrailConfigurationPanel { Group algorithmGroup = new Group(comp, SWT.NULL); - algorithmGroup.setText(Messages.AUDIT_TRAIL_RETRIEVAL_METHOD_CONFIGURATION); + algorithmGroup.setText(Simulation_Runtime_Messages.AUDIT_TRAIL_RETRIEVAL_METHOD_CONFIGURATION); // StartDate and EndDate - Label startDateLabel = FormBuilder.createLabel(algorithmGroup, Messages.START_OF_RETRIEVAL); + Label startDateLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.START_OF_RETRIEVAL); startDate = new DatePickerCombo(algorithmGroup, SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); startDate.setDateFormat(SimulationDateFormat.getInteractiveDateFormatInstance()); @@ -255,7 +255,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { }); - Label endDateLabel = FormBuilder.createLabel(algorithmGroup, Messages.END_OF_RETRIEVAL); + Label endDateLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.END_OF_RETRIEVAL); endDate = new DatePickerCombo(algorithmGroup, SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); endDate.setDateFormat(SimulationDateFormat.getInteractiveDateFormatInstance()); @@ -275,7 +275,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { } }); - Label dailyAvailabilityInterpolationUnitLabel = FormBuilder.createLabel(algorithmGroup, Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT); + Label dailyAvailabilityInterpolationUnitLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT); dailyAvailabilityInterpolationUnit = FormBuilder.createCombo(algorithmGroup); dailyAvailabilityInterpolationUnit.setItems(new String[] { @@ -291,7 +291,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { firePropertyChange(); }}); - Label availableResourcesInterpolationUnitLabel = FormBuilder.createLabel(algorithmGroup, Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT); + Label availableResourcesInterpolationUnitLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT); availableResourcesInterpolationUnit = FormBuilder.createCombo(algorithmGroup); availableResourcesInterpolationUnit.setItems(new String[] { @@ -322,7 +322,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { }}); */ - Label defaultAvailabilityInterpolationModeLabel = FormBuilder.createLabel(algorithmGroup, Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE); + Label defaultAvailabilityInterpolationModeLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE); defaultAvailabilityInterpolationMode = FormBuilder.createCombo(algorithmGroup); defaultAvailabilityInterpolationMode.setItems(new String[] { @@ -334,7 +334,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { firePropertyChange(); }}); - Label defaultAvailabilityApproximationModeLabel = FormBuilder.createLabel(algorithmGroup, Messages.DEFAULT_AVAILABILITY_APPROXIMATION_MODE); + Label defaultAvailabilityApproximationModeLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.DEFAULT_AVAILABILITY_APPROXIMATION_MODE); defaultAvailabilityApproximationMode = FormBuilder.createCombo(algorithmGroup); defaultAvailabilityApproximationMode.setItems(new String[] { @@ -347,7 +347,7 @@ public class RetrieveFromAuditTrailConfigurationPanel { firePropertyChange(); }}); - Label resetCalendarLabel = FormBuilder.createLabel(algorithmGroup, Messages.RESET_AVAILABILITY_CALENDAR); + Label resetCalendarLabel = FormBuilder.createLabel(algorithmGroup, Simulation_Runtime_Messages.RESET_AVAILABILITY_CALENDAR); resetCalendar = FormBuilder.createCheckBox(algorithmGroup, ""); //$NON-NLS-1$ resetCalendar.addSelectionListener(new SelectionAdapter() { @@ -547,64 +547,64 @@ public class RetrieveFromAuditTrailConfigurationPanel { private static String idToMessage(String s) { if (RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min.equals(s)) - return Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min; + return Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min; if (RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min.equals(s)) - return Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min; + return Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min; if (RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour.equals(s)) - return Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour; + return Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour; if (RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours.equals(s)) - return Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours; + return Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours; if (RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours.equals(s)) - return Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours; + return Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours; if (RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours.equals(s)) - return Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours; + return Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours; if (RetrieveFromAuditTrailConfiguration.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day.equals(s)) - return Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day; + return Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day; if (RetrieveFromAuditTrailConfiguration.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week.equals(s)) - return Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week; + return Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week; if (RetrieveFromAuditTrailConfiguration.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month.equals(s)) - return Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month; + return Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month; if (RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max.equals(s)) - return Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max; + return Simulation_Runtime_Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max; if (RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average.equals(s)) - return Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average; + return Simulation_Runtime_Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average; if (RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear.equals(s)) - return Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear; + return Simulation_Runtime_Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear; if (RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate.equals(s)) - return Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate; + return Simulation_Runtime_Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate; if (RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue.equals(s)) - return Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue; + return Simulation_Runtime_Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue; return s; } private static String messageToId(String s) { - if (Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min.equals(s)) + if (Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min.equals(s)) return RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min; - if (Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min.equals(s)) + if (Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min.equals(s)) return RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min; - if (Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour.equals(s)) + if (Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour.equals(s)) return RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour; - if (Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours.equals(s)) + if (Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours.equals(s)) return RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours; - if (Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours.equals(s)) + if (Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours.equals(s)) return RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours; - if (Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours.equals(s)) + if (Simulation_Runtime_Messages.DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours.equals(s)) return RetrieveFromAuditTrailConfiguration.DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours; - if (Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day.equals(s)) + if (Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day.equals(s)) return RetrieveFromAuditTrailConfiguration.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day; - if (Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week.equals(s)) + if (Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week.equals(s)) return RetrieveFromAuditTrailConfiguration.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week; - if (Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month.equals(s)) + if (Simulation_Runtime_Messages.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month.equals(s)) return RetrieveFromAuditTrailConfiguration.AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month; - if (Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max.equals(s)) + if (Simulation_Runtime_Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max.equals(s)) return RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max; - if (Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average.equals(s)) + if (Simulation_Runtime_Messages.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average.equals(s)) return RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average; - if (Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear.equals(s)) + if (Simulation_Runtime_Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear.equals(s)) return RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear; - if (Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate.equals(s)) + if (Simulation_Runtime_Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate.equals(s)) return RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate; - if (Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue.equals(s)) + if (Simulation_Runtime_Messages.DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue.equals(s)) return RetrieveFromAuditTrailConfiguration.DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue; return s; } @@ -667,16 +667,16 @@ public class RetrieveFromAuditTrailConfigurationPanel { public void validateConfiguration(ILaunchConfiguration launchConfiguration) { if (retrieveBeforeRun.getSelection()) { ValidationUtils.validate(!StringUtils.isEmpty(driverClassNameText.getText()), - Messages.JDBC_DRIVER, Messages.RC_ERR_RetrieveJdbcDriver); + Simulation_Runtime_Messages.JDBC_DRIVER, Simulation_Runtime_Messages.RC_ERR_RetrieveJdbcDriver); ValidationUtils.validate(JdbcConfigurationUtility.driverClassInClasspath(driverClassNameText.getText(), launchConfiguration), - Messages.JDBC_DRIVER, driverClassNameText.getText(), Messages.RC_ERR_RetrieveJdbcDriverNotFound); + Simulation_Runtime_Messages.JDBC_DRIVER, driverClassNameText.getText(), Simulation_Runtime_Messages.RC_ERR_RetrieveJdbcDriverNotFound); ValidationUtils.validate(!StringUtils.isEmpty(databaseURLText.getText()), - Messages.JDBC_DRIVER, Messages.RC_ERR_RetrieveJdbcUrl); + Simulation_Runtime_Messages.JDBC_DRIVER, Simulation_Runtime_Messages.RC_ERR_RetrieveJdbcUrl); - ValidationUtils.validate(startDate, Messages.START_OF_RETRIEVAL, Messages.RC_ERR_InvalidValue); - ValidationUtils.validate(endDate, Messages.END_OF_RETRIEVAL, Messages.RC_ERR_InvalidValue); + ValidationUtils.validate(startDate, Simulation_Runtime_Messages.START_OF_RETRIEVAL, Simulation_Runtime_Messages.RC_ERR_InvalidValue); + ValidationUtils.validate(endDate, Simulation_Runtime_Messages.END_OF_RETRIEVAL, Simulation_Runtime_Messages.RC_ERR_InvalidValue); } } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailTab.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailTab.java index dad5cd4..5877aba 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailTab.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/RetrieveFromAuditTrailTab.java @@ -16,10 +16,10 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.JdbcConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.RetrieveFromAuditTrailConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; @@ -55,7 +55,7 @@ public class RetrieveFromAuditTrailTab extends AbstractLaunchConfigurationTab { Composite topComp = new Composite(parent, SWT.NONE); setControl(topComp); - PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), Messages.AUDIT_TRAIL_RETRIEVAL_CONFIGURATION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), Simulation_Runtime_Messages.AUDIT_TRAIL_RETRIEVAL_CONFIGURATION); GridLayout topLayout = new GridLayout(); topLayout.numColumns = 1; topLayout.marginHeight=0; @@ -74,7 +74,7 @@ public class RetrieveFromAuditTrailTab extends AbstractLaunchConfigurationTab { } public String getName() { - return Messages.AUDIT_TRAIL_RETRIEVAL_CONFIGURATION; + return Simulation_Runtime_Messages.AUDIT_TRAIL_RETRIEVAL_CONFIGURATION; } public void initializeFrom(ILaunchConfiguration configuration) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/SimulationCombo.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/SimulationCombo.java index 9510abb..b03c52b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/SimulationCombo.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/SimulationCombo.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationConfigurationList; import org.eclipse.stardust.ide.simulation.ui.utils.SimulationDateFormat; @@ -67,7 +67,7 @@ public class SimulationCombo { DateFormat df = SimulationDateFormat.getInteractiveDateFormatInstance(); String configurationString = configuration.getName()+" ("+df.format(configuration.getIntervalStart())+" - "+df.format(configuration.getIntervalEnd())+")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (this.defaultId == configuration.getId()) { - configurationString += Messages.RUNTIME_CONFIGURATION_DEFAULT_SUFFIX; + configurationString += Simulation_Runtime_Messages.RUNTIME_CONFIGURATION_DEFAULT_SUFFIX; } this.combo.add(configurationString); } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/StatisticsGuiNotifier.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/StatisticsGuiNotifier.java index 1aa48cf..b59de50 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/StatisticsGuiNotifier.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/StatisticsGuiNotifier.java @@ -63,7 +63,7 @@ public class StatisticsGuiNotifier implements ISimulationEventListener { } public void statisticsChanged(SimulationStatistics simulationStatistics) { - // ignore + simulationStatistics.addToHistory(); } private void stopTask () { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ApplicationQueueLengthPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ApplicationQueueLengthPanel.java index 4ac4221..f64baba 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ApplicationQueueLengthPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ApplicationQueueLengthPanel.java @@ -22,10 +22,10 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.engine.api.model.IModel; import org.eclipse.stardust.engine.core.model.beans.ApplicationBean; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ApplicationQueueLengthConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.RuntimeUtils; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerMinMax; @@ -76,7 +76,7 @@ public class ApplicationQueueLengthPanel implements ITerminationConfigurationPan Label applicationsLabel = new Label (settingsPanel, SWT.NULL); - applicationsLabel.setText(Messages.APPLICATIONS); + applicationsLabel.setText(Simulation_Runtime_Messages.APPLICATIONS); applicationsCombo = new Combo(settingsPanel, SWT.DROP_DOWN | SWT.READ_ONLY); applicationsCombo.addSelectionListener(new SelectionAdapter() { @@ -85,10 +85,10 @@ public class ApplicationQueueLengthPanel implements ITerminationConfigurationPan } }); - Label maxValueLabel = FormBuilder.createLabel(settingsPanel, Messages.MAX_QUEUE_LENGTH); + Label maxValueLabel = FormBuilder.createLabel(settingsPanel, Simulation_Runtime_Messages.MAX_QUEUE_LENGTH); maxValue = new Text(settingsPanel, SWT.BORDER); - maxValue.setToolTipText(Messages.MAX_QUEUE_LENGTH); + maxValue.setToolTipText(Simulation_Runtime_Messages.MAX_QUEUE_LENGTH); maxValueVerification = new VerifyIntegerMinMax(1, Integer.MAX_VALUE); maxValueVerification.verifyText(maxValue.getText()); maxValue.addFocusListener(maxValueVerification); @@ -175,7 +175,7 @@ public class ApplicationQueueLengthPanel implements ITerminationConfigurationPan } public void validateConfiguration(IModel model, SimulationRuntimeConfiguration runtimeConfig, SimulationConfiguration simulationConfig) { - ValidationUtils.validate(applicationsCombo, Messages.APPLICATIONS, Messages.RC_ERR_EmptyList); - ValidationUtils.validate(maxValue, Messages.MAX_QUEUE_LENGTH, maxValueVerification, Messages.RC_ERR_InvalidValue); + ValidationUtils.validate(applicationsCombo, Simulation_Runtime_Messages.APPLICATIONS, Simulation_Runtime_Messages.RC_ERR_EmptyList); + ValidationUtils.validate(maxValue, Simulation_Runtime_Messages.MAX_QUEUE_LENGTH, maxValueVerification, Simulation_Runtime_Messages.RC_ERR_InvalidValue); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/EndOfTimeIntervalPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/EndOfTimeIntervalPanel.java index 00c5a6d..c8de7a6 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/EndOfTimeIntervalPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/EndOfTimeIntervalPanel.java @@ -16,10 +16,10 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.engine.api.model.IModel; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.EndOfTimeIntervalConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; import org.eclipse.stardust.ide.simulation.ui.utils.SimulationDateFormat; @@ -66,7 +66,7 @@ public class EndOfTimeIntervalPanel implements ITerminationConfigurationPanel { settingsPanel.setFont(font); Label endDateLabel = new Label (settingsPanel, SWT.NULL); - endDateLabel.setText(Messages.END_OF_SIMULATION); + endDateLabel.setText(Simulation_Runtime_Messages.END_OF_SIMULATION); endDate = new DatePickerCombo(settingsPanel, SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); @@ -124,12 +124,12 @@ public class EndOfTimeIntervalPanel implements ITerminationConfigurationPanel { public void validateConfiguration(IModel model, SimulationRuntimeConfiguration runtimeConfig, SimulationConfiguration simulationConfig) { - ValidationUtils.validate(this.endDate, Messages.END_OF_SIMULATION, Messages.RC_ERR_EndDate); + ValidationUtils.validate(this.endDate, Simulation_Runtime_Messages.END_OF_SIMULATION, Simulation_Runtime_Messages.RC_ERR_EndDate); SimulationInterval simulationInterval = simulationConfig.getInterval(); - ValidationUtils.validate(this.endDate, simulationInterval.getStartDate(), simulationInterval.getEndDate(), Messages.RC_ERR_EndDateNotValid); + ValidationUtils.validate(this.endDate, simulationInterval.getStartDate(), simulationInterval.getEndDate(), Simulation_Runtime_Messages.RC_ERR_EndDateNotValid); - ValidationUtils.validate(this.endDate, runtimeConfig.getSimulationTimeIntervalConfiguration().getStartDate(), simulationInterval.getEndDate(), Messages.RC_ERR_EndDateNotValid); + ValidationUtils.validate(this.endDate, runtimeConfig.getSimulationTimeIntervalConfiguration().getStartDate(), simulationInterval.getEndDate(), Simulation_Runtime_Messages.RC_ERR_EndDateNotValid); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/NumberPIReachedPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/NumberPIReachedPanel.java index 26d5a30..6d92f3b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/NumberPIReachedPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/NumberPIReachedPanel.java @@ -22,10 +22,10 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.engine.api.model.IModel; import org.eclipse.stardust.engine.core.model.beans.ProcessDefinitionBean; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.NumberOfPIConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.RuntimeUtils; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerMinMax; @@ -76,7 +76,7 @@ public class NumberPIReachedPanel implements ITerminationConfigurationPanel { settingsPanel.setFont(font); Label processDefLabel = new Label (settingsPanel, SWT.NULL); - processDefLabel.setText(Messages.PROCESS_DEFINITION); + processDefLabel.setText(Simulation_Runtime_Messages.PROCESS_DEFINITION); processDefinitionCombo = new Combo(settingsPanel, SWT.DROP_DOWN | SWT.READ_ONLY); processDefinitionCombo.addSelectionListener(new SelectionAdapter() { @@ -85,10 +85,10 @@ public class NumberPIReachedPanel implements ITerminationConfigurationPanel { } }); - Label numberOfPILabel = FormBuilder.createLabel(settingsPanel, Messages.NUMBER_OF_PI); + Label numberOfPILabel = FormBuilder.createLabel(settingsPanel, Simulation_Runtime_Messages.NUMBER_OF_PI); numberOfPI = new Text(settingsPanel, SWT.BORDER); - numberOfPI.setToolTipText(Messages.NUMBER_OF_PI); + numberOfPI.setToolTipText(Simulation_Runtime_Messages.NUMBER_OF_PI); numberOfPIVerification = new VerifyIntegerMinMax(1, Integer.MAX_VALUE); numberOfPIVerification.verifyText(numberOfPI.getText()); numberOfPI.addFocusListener(numberOfPIVerification); @@ -172,8 +172,8 @@ public class NumberPIReachedPanel implements ITerminationConfigurationPanel { } public void validateConfiguration(IModel model, SimulationRuntimeConfiguration runtimeConfig, SimulationConfiguration simulationConfig) { - ValidationUtils.validate(processDefinitionCombo, Messages.PROCESS_DEFINITION, Messages.RC_ERR_EmptyList); - ValidationUtils.validate(RuntimeUtils.getProcessDefinitionByName(model, processDefinitionCombo.getText()) != null, Messages.PROCESS_DEFINITION, processDefinitionCombo.getText(), Messages.RC_ERR_ModelElementMissing); - ValidationUtils.validate(numberOfPI, Messages.NUMBER_OF_PI, numberOfPIVerification, Messages.RC_ERR_InvalidValue); + ValidationUtils.validate(processDefinitionCombo, Simulation_Runtime_Messages.PROCESS_DEFINITION, Simulation_Runtime_Messages.RC_ERR_EmptyList); + ValidationUtils.validate(RuntimeUtils.getProcessDefinitionByName(model, processDefinitionCombo.getText()) != null, Simulation_Runtime_Messages.PROCESS_DEFINITION, processDefinitionCombo.getText(), Simulation_Runtime_Messages.RC_ERR_ModelElementMissing); + ValidationUtils.validate(numberOfPI, Simulation_Runtime_Messages.NUMBER_OF_PI, numberOfPIVerification, Simulation_Runtime_Messages.RC_ERR_InvalidValue); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ParticipantQueueLengthPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ParticipantQueueLengthPanel.java index e27a113..d18e60d 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ParticipantQueueLengthPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/ParticipantQueueLengthPanel.java @@ -22,10 +22,10 @@ import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.engine.api.model.IModel; import org.eclipse.stardust.engine.core.model.beans.ModelParticipantBean; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ParticipantQueueLengthConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.RuntimeUtils; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerMinMax; @@ -75,7 +75,7 @@ public class ParticipantQueueLengthPanel implements ITerminationConfigurationPan settingsPanel.setFont(font); Label participantsLabel = new Label (settingsPanel, SWT.NULL); - participantsLabel.setText(Messages.PARTICIPANTS); + participantsLabel.setText(Simulation_Runtime_Messages.PARTICIPANTS); participantsCombo = new Combo(settingsPanel, SWT.DROP_DOWN | SWT.READ_ONLY); participantsCombo.addSelectionListener(new SelectionAdapter() { @@ -84,10 +84,10 @@ public class ParticipantQueueLengthPanel implements ITerminationConfigurationPan } }); - Label maxValueLabel = FormBuilder.createLabel(settingsPanel, Messages.MAX_QUEUE_LENGTH); + Label maxValueLabel = FormBuilder.createLabel(settingsPanel, Simulation_Runtime_Messages.MAX_QUEUE_LENGTH); maxValue = new Text(settingsPanel, SWT.BORDER); - maxValue.setToolTipText(Messages.MAX_QUEUE_LENGTH); + maxValue.setToolTipText(Simulation_Runtime_Messages.MAX_QUEUE_LENGTH); maxValueVerification = new VerifyIntegerMinMax(1, Integer.MAX_VALUE); maxValueVerification.verifyText(maxValue.getText()); maxValue.addFocusListener(maxValueVerification); @@ -174,7 +174,7 @@ public class ParticipantQueueLengthPanel implements ITerminationConfigurationPan } public void validateConfiguration(IModel model, SimulationRuntimeConfiguration runtimeConfig, SimulationConfiguration simulationConfig) { - ValidationUtils.validate(participantsCombo, Messages.PARTICIPANTS, Messages.RC_ERR_EmptyList); - ValidationUtils.validate(maxValue, Messages.MAX_QUEUE_LENGTH, maxValueVerification, Messages.RC_ERR_InvalidValue); + ValidationUtils.validate(participantsCombo, Simulation_Runtime_Messages.PARTICIPANTS, Simulation_Runtime_Messages.RC_ERR_EmptyList); + ValidationUtils.validate(maxValue, Simulation_Runtime_Messages.MAX_QUEUE_LENGTH, maxValueVerification, Simulation_Runtime_Messages.RC_ERR_InvalidValue); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TerminationConditionConfigurationPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TerminationConditionConfigurationPanel.java index df69e53..191b732 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TerminationConditionConfigurationPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TerminationConditionConfigurationPanel.java @@ -16,10 +16,10 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.stardust.engine.api.model.IModel; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.TerminationConditionConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.TerminationConditions; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.swt.SWT; @@ -95,12 +95,12 @@ public class TerminationConditionConfigurationPanel extends Composite { Composite terminationPanel = new Composite(this, SWT.NONE); Label terminationLabel = new Label (terminationPanel, SWT.RIGHT); - terminationLabel.setText(Messages.TERMINATION_CONDITION); + terminationLabel.setText(Simulation_Runtime_Messages.TERMINATION_CONDITION); terminationCombo = new Combo(terminationPanel, SWT.DROP_DOWN | SWT.READ_ONLY); terminationCombo.setItems(new String[] { - Messages.END_OF_TIME_INTERVAL, Messages.NUMBER_OF_PI_REACHED, Messages.APPLICATION_QUEUE_LENGTH, - Messages.PARTICIPANT_QUEUE_LENGTH, Messages.TRANSITIONS_TRAVERSED + Simulation_Runtime_Messages.END_OF_TIME_INTERVAL, Simulation_Runtime_Messages.NUMBER_OF_PI_REACHED, Simulation_Runtime_Messages.APPLICATION_QUEUE_LENGTH, + Simulation_Runtime_Messages.PARTICIPANT_QUEUE_LENGTH, Simulation_Runtime_Messages.TRANSITIONS_TRAVERSED }); terminationCombo.select(0); terminationCombo.addSelectionListener(new SelectionAdapter() { @@ -111,7 +111,7 @@ public class TerminationConditionConfigurationPanel extends Composite { }); Group detailsPanel = new Group(this, SWT.NULL); - detailsPanel.setText(Messages.SETTINGS); + detailsPanel.setText(Simulation_Runtime_Messages.SETTINGS); stackBox = new Composite(detailsPanel, SWT.NULL); endOfTimeIntervalPanel = new EndOfTimeIntervalPanel(); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TransitionTraversedPanel.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TransitionTraversedPanel.java index c2547c6..aebdd16 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TransitionTraversedPanel.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/plugin/runtime/ui/termination/TransitionTraversedPanel.java @@ -26,11 +26,11 @@ import org.eclipse.stardust.engine.api.model.IModel; import org.eclipse.stardust.engine.core.model.beans.ActivityBean; import org.eclipse.stardust.engine.core.model.beans.ProcessDefinitionBean; import org.eclipse.stardust.engine.core.model.beans.TransitionBean; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.ITerminationConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.TransitionTraversedConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.units.Activity; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.RuntimeUtils; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerMinMax; @@ -85,7 +85,7 @@ public class TransitionTraversedPanel implements ITerminationConfigurationPanel settingsPanel.setFont(font); Label processDefLabel = new Label (settingsPanel, SWT.NULL); - processDefLabel.setText(Messages.PROCESS_DEFINITION); + processDefLabel.setText(Simulation_Runtime_Messages.PROCESS_DEFINITION); processDefinitionCombo = new Combo(settingsPanel, SWT.DROP_DOWN | SWT.READ_ONLY); processDefinitionCombo.addSelectionListener(new SelectionAdapter() { @@ -98,7 +98,7 @@ public class TransitionTraversedPanel implements ITerminationConfigurationPanel }); Label activitiesLabel = new Label (settingsPanel, SWT.NULL); - activitiesLabel.setText(Messages.ACTIVITIES); + activitiesLabel.setText(Simulation_Runtime_Messages.ACTIVITIES); activitiesCombo = new Combo(settingsPanel, SWT.DROP_DOWN | SWT.READ_ONLY); activitiesCombo.addSelectionListener(new SelectionAdapter() { @@ -111,7 +111,7 @@ public class TransitionTraversedPanel implements ITerminationConfigurationPanel }); Label transitionsLabel = new Label (settingsPanel, SWT.NULL); - transitionsLabel.setText(Messages.TRANSITIONS); + transitionsLabel.setText(Simulation_Runtime_Messages.TRANSITIONS); transitionsCombo = new Combo(settingsPanel, SWT.DROP_DOWN | SWT.READ_ONLY); transitionsCombo.addSelectionListener(new SelectionAdapter() { @@ -120,10 +120,10 @@ public class TransitionTraversedPanel implements ITerminationConfigurationPanel } }); - Label maxTraversalsLabel = FormBuilder.createLabel(settingsPanel, Messages.MAX_TRAVERSALS); + Label maxTraversalsLabel = FormBuilder.createLabel(settingsPanel, Simulation_Runtime_Messages.MAX_TRAVERSALS); maxTraversals = new Text(settingsPanel, SWT.BORDER); - maxTraversals.setToolTipText(Messages.MAX_TRAVERSALS); + maxTraversals.setToolTipText(Simulation_Runtime_Messages.MAX_TRAVERSALS); maxTraversalsVerification = new VerifyIntegerMinMax(1, Integer.MAX_VALUE); maxTraversalsVerification.verifyText(maxTraversals.getText()); maxTraversals.addFocusListener(maxTraversalsVerification); @@ -342,9 +342,9 @@ public class TransitionTraversedPanel implements ITerminationConfigurationPanel } public void validateConfiguration(IModel model, SimulationRuntimeConfiguration runtimeConfig, SimulationConfiguration simulationConfig) { - ValidationUtils.validate(processDefinitionCombo, Messages.PROCESS_DEFINITION, Messages.RC_ERR_EmptyList); - ValidationUtils.validate(activitiesCombo, Messages.ACTIVITIES, Messages.RC_ERR_EmptyList); - ValidationUtils.validate(transitionsCombo, Messages.TRANSITIONS, Messages.RC_ERR_EmptyList); - ValidationUtils.validate(maxTraversals, Messages.MAX_TRAVERSALS, maxTraversalsVerification, Messages.RC_ERR_InvalidValue); + ValidationUtils.validate(processDefinitionCombo, Simulation_Runtime_Messages.PROCESS_DEFINITION, Simulation_Runtime_Messages.RC_ERR_EmptyList); + ValidationUtils.validate(activitiesCombo, Simulation_Runtime_Messages.ACTIVITIES, Simulation_Runtime_Messages.RC_ERR_EmptyList); + ValidationUtils.validate(transitionsCombo, Simulation_Runtime_Messages.TRANSITIONS, Simulation_Runtime_Messages.RC_ERR_EmptyList); + ValidationUtils.validate(maxTraversals, Simulation_Runtime_Messages.MAX_TRAVERSALS, maxTraversalsVerification, Simulation_Runtime_Messages.RC_ERR_InvalidValue); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/DummySimulationController.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/DummySimulationController.java index 7961229..cf7e8c9 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/DummySimulationController.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/DummySimulationController.java @@ -23,7 +23,7 @@ public class DummySimulationController implements ISimulationController { } public String getState() { - throw new RuntimeException("Not implemented for Dummy Simulation Controller"); + throw new RuntimeException(Simulation_Runtime_Messages.EXC_NOT_IMPLEMENTED_FOR_DUMMY_SIMULATION_CONTROLLER); } public void pauseSimulation() { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationController.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationController.java index 6ba5968..ede103c 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationController.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationController.java @@ -32,7 +32,6 @@ import org.eclipse.stardust.ide.simulation.rt.plugin.runtime.launching.AuditTrai import org.eclipse.stardust.ide.simulation.rt.plugin.runtime.ui.RetrieveFromAuditTrailConfigurationConfirmDialog; import org.eclipse.stardust.ide.simulation.rt.plugin.runtime.ui.StatisticsGuiNotifier; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.SimulationStatistics; import org.eclipse.stardust.ide.simulation.rt.util.EclipseUtils; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; @@ -121,7 +120,7 @@ public class SimulationController implements ISimulationController { //if (resource.findMaxProblemSeverity(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE) == IMarker.SEVERITY_ERROR) { if (hasErrors) { SimulationRuntimePlugin.getDefault().getLog().log( - EclipseUtils.createErrorStatus(new SimulationPreconditionException(ValidationUtils.format(Messages.ERRORS_IN_MODEL, simulationRuntimeConfiguration.getModelFile())))); + EclipseUtils.createErrorStatus(new SimulationPreconditionException(ValidationUtils.format(Simulation_Runtime_Messages.ERRORS_IN_MODEL, simulationRuntimeConfiguration.getModelFile())))); return false; } return true; @@ -147,15 +146,15 @@ public class SimulationController implements ISimulationController { boolean logToAuditTrail = simulationRuntimeConfiguration.isLogToAuditTrail() && (!simulationRuntimeConfiguration.isAskForConfirmation() || MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), - Messages.LOG_TO_AUDIT_TRAIL_TITLE, - Messages.LOG_TO_AUDIT_TRAIL_CONFIRMATION)); + Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_TITLE, + Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_CONFIRMATION)); simulationRuntimeConfiguration.setLogToAuditTrailConfirmed(logToAuditTrail); if (logToAuditTrail == true && simulationRuntimeConfiguration.isCleanupRuntime()) { if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), - Messages.LOG_TO_AUDIT_TRAIL_TITLE, - MessageFormat.format(Messages.LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION, + Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_TITLE, + MessageFormat.format(Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION, new Object[] {simulationRuntimeConfiguration.getSimulationJdbcConfiguration().getConnectionUrl()})) == false) { stopSimulation(); return; @@ -233,8 +232,8 @@ public class SimulationController implements ISimulationController { // simulation is able to be continued, if the user likes so SimulationRuntimePlugin.getDefault().getLog().log(EclipseUtils.createErrorStatus(e)); continueSimulation = MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), - Messages.RUNTIME_WARNING_TITLE, - MessageFormat.format(Messages.RUNTIME_CONTINUE_MESSAGE, new Object[] {Messages.RETRIEVE_FROM_AUDITTRAIL})); + Simulation_Runtime_Messages.RUNTIME_WARNING_TITLE, + MessageFormat.format(Simulation_Runtime_Messages.RUNTIME_CONTINUE_MESSAGE, new Object[] {Simulation_Runtime_Messages.RETRIEVE_FROM_AUDITTRAIL})); } catch (Exception e) { throw new RuntimeException(e); } @@ -248,15 +247,15 @@ public class SimulationController implements ISimulationController { boolean logToAuditTrail = simulationRuntimeConfiguration.isLogToAuditTrail() && (!simulationRuntimeConfiguration.isAskForConfirmation() || MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), - Messages.LOG_TO_AUDIT_TRAIL_TITLE, - Messages.LOG_TO_AUDIT_TRAIL_CONFIRMATION)); + Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_TITLE, + Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_CONFIRMATION)); simulationRuntimeConfiguration.setLogToAuditTrailConfirmed(logToAuditTrail); if (logToAuditTrail == true && simulationRuntimeConfiguration.isCleanupRuntime()) { if (MessageDialog.openQuestion(PlatformUI.getWorkbench().getDisplay().getActiveShell(), - Messages.LOG_TO_AUDIT_TRAIL_TITLE, - MessageFormat.format(Messages.LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION, + Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_TITLE, + MessageFormat.format(Simulation_Runtime_Messages.LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION, new Object[] {simulationRuntimeConfiguration.getSimulationJdbcConfiguration().getConnectionUrl()})) == false) { stopSimulation(); return; diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationTriggerQueue.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationTriggerQueue.java index 3033b19..3d5d3ba 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationTriggerQueue.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/SimulationTriggerQueue.java @@ -17,7 +17,6 @@ import org.apache.commons.logging.LogFactory; import org.eclipse.core.runtime.CoreException; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.termination.EndOfTimeIntervalConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.util.TerminationConditions; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.timeutils.TimeCalculator; @@ -54,17 +53,19 @@ public class SimulationTriggerQueue { // TODO: precondition if (startTime < earliestStartTime) - throw new RuntimeException(Messages.ERROR_WRONG_START1+new Date(startTime)+Messages.ERROR_WRONG_START2+new Date(earliestStartTime)+Messages.ERROR_WRONG_START3); + throw new RuntimeException(Simulation_Runtime_Messages.ERROR_WRONG_START1+new Date(startTime)+Simulation_Runtime_Messages.ERROR_WRONG_START2+new Date(earliestStartTime)+Simulation_Runtime_Messages.ERROR_WRONG_START3); // TODO: precondition if (endTime <= startTime) - throw new RuntimeException(Messages.ERROR_WRONG_END1+new Date(endTime)+Messages.ERROR_WRONG_END2+new Date(startTime)+Messages.ERROR_WRONG_END3); + throw new RuntimeException(Simulation_Runtime_Messages.ERROR_WRONG_END1+new Date(endTime)+Simulation_Runtime_Messages.ERROR_WRONG_END2+new Date(startTime)+Simulation_Runtime_Messages.ERROR_WRONG_END3); if (simulationRuntimeConfiguration.getTerminationConditionConfiguration().getTerminationConditionId().equals(TerminationConditions.END_OF_TIME_INTERVAL_ID)) { EndOfTimeIntervalConfiguration config = (EndOfTimeIntervalConfiguration)simulationRuntimeConfiguration.getTerminationConditionConfiguration().getTerminationConfiguration(); long runtimeEndTime = new TimeCalculator(config.getEndOfSimulationDate()).moveToEndOfDay().toLong(); if (runtimeEndTime > endTime) { - throw new RuntimeException("End time configured in runtime settings ("+new Date(runtimeEndTime)+") can not be after simulation interval end time "+new Date(endTime)); + throw new RuntimeException(Simulation_Runtime_Messages.EXC_END_TIME_CONFIGURED_IN_RUNTIME_SETTINGS+"("+new Date(runtimeEndTime)+")" + Simulation_Runtime_Messages.EXC_CANNOT_BE_AFTER_SIMULATION_INTERVAL_END_TIME+new Date(endTime)); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + + } endTime = runtimeEndTime; } @@ -87,7 +88,7 @@ public class SimulationTriggerQueue { public void addTrigger (SimulationTrigger trigger) { if (trigger.getScheduledTime() < this.getStartTime()) { - throw new RuntimeException("Can not schedule trigger for <"+trigger.getScheduledTime()+">, it is before start time <"+this.getStartTime()+">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + throw new RuntimeException(Simulation_Runtime_Messages.EXC_CANNOT_SCHEDULE_TRIGGER_FOR + "<"+trigger.getScheduledTime()+">"+Simulation_Runtime_Messages.EXC_IT_IS_BEFORE_START_TIME+"<"+this.getStartTime()+">"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } this.triggers.add(trigger); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/Simulation_Runtime_Messages.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/Simulation_Runtime_Messages.java new file mode 100644 index 0000000..70cc814 --- a/dev/null +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/Simulation_Runtime_Messages.java @@ -0,0 +1,478 @@ +/* + * $Id$ + * (C) 2000 - 2006 CARNOT AG + */ +package org.eclipse.stardust.ide.simulation.rt.runtime; + +import java.util.ResourceBundle; + +import org.eclipse.osgi.util.NLS; + +public class Simulation_Runtime_Messages extends NLS +{ + private static final String BUNDLE_NAME = "org.eclipse.stardust.ide.simulation.rt.simulation-runtime-messages"; //$NON-NLS-1$ + + private static final ResourceBundle singleton = ResourceBundle.getBundle(BUNDLE_NAME); + + private Simulation_Runtime_Messages() + {} + + static + { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Simulation_Runtime_Messages.class); + } + + public static String TERMINATION_CONDITION; + + public static String SETTINGS; + + public static String END_OF_TIME_INTERVAL; + + public static String NUMBER_OF_PI_REACHED; + + public static String NUMBER_OF_PI; + + public static String APPLICATION_QUEUE_LENGTH; + + public static String PARTICIPANT_QUEUE_LENGTH; + + public static String TRANSITIONS_TRAVERSED; + + public static String PROCESS_DEFINITION; + + public static String ACTIVITIES; + + public static String APPLICATIONS; + + public static String PARTICIPANTS; + + public static String TRANSITIONS; + + public static String MAX_QUEUE_LENGTH; + + public static String MAX_TRAVERSALS; + + public static String ASK_BEFORE_LOGGING; + + public static String ASK_BEFORE_RETRIEVE; + + public static String AUDITTRAIL_CONFIRMATION_MESSAGE; + + public static String AUDITTRAIL_CONFIRMATION_QUESTION; + + public static String AUDITTRAIL_CONFIRMATION_TITLE; + + public static String AUDITTRAIL_LOGGING_NO_MODEL_ERROR; + + public static String AUDITTRAIL_LOGGING_NO_MODEL_FOUND; + + public static String AUDITTRAIL_LOGGING_VERSION_CHECK_ERROR; + + public static String AUDIT_TRAIL_JDBC_CONFIGURATION; + + public static String AUDIT_TRAIL_LOGGING_CONFIGURATION; + + public static String AUDIT_TRAIL_RETRIEVAL_CONFIGURATION; + + public static String AUDIT_TRAIL_RETRIEVAL_METHOD_CONFIGURATION; + + public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT; + + public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day; + + public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month; + + public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week; + + public static String CLEANUP_RUNTIME; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours; + + public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours; + + public static String DATABASE_TYPE; + + public static String DEFAULT_AVAILABILITY_APPROXIMATION_MODE; + + public static String DEFAULT_AVAILABILITY_INTERPOLATION_MODE; + + public static String DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average; + + public static String DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max; + + public static String DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue; + + public static String DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear; + + public static String DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate; + + public static String RESET_AVAILABILITY_CALENDAR; + + public static String END_OF_RETRIEVAL; + + public static String END_OF_SIMULATION; + + public static String ERRORS_IN_MODEL; + + public static String ERROR_GOT_EXCEPTION; + + public static String ERROR_WRONG_END1; + + public static String ERROR_WRONG_END2; + + public static String ERROR_WRONG_END3; + + public static String ERROR_WRONG_START1; + + public static String ERROR_WRONG_START2; + + public static String ERROR_WRONG_START3; + + public static String EXC_CANNOT_BE_AFTER_SIMULATION_INTERVAL_END_TIME; + + public static String EXC_CANNOT_SCHEDULE_TRIGGER_FOR; + + public static String EXC_END_TIME_CONFIGURED_IN_RUNTIME_SETTINGS; + + public static String EXC_IT_IS_BEFORE_START_TIME; + + public static String EXC_NOT_IMPLEMENTED_FOR_DUMMY_SIMULATION_CONTROLLER; + + public static String EXC_SHOULD_NOT_BE_CALLED_WHEN; + + public static String EXC_TODO; + + public static String JDBCTAB_IMPORT_BUTTON; + + public static String JDBC_ACCOUNT; + + public static String JDBC_DRIVER; + + public static String JDBC_PARTITION; + + public static String JDBC_PARTITION_DEFAULT; + + public static String JDBC_PASSWORD; + + public static String JDBC_SCHEMA; + + public static String JDBC_SCHEMA_DEFAULT; + + public static String JDBC_URL; + + public static String LOG_TO_AUDIT_TRAIL; + + public static String LOG_TO_AUDIT_TRAIL_TITLE; + + public static String LOG_TO_AUDIT_TRAIL_CONFIRMATION; + + public static String LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION; + + public static String MAIN_CONFIGURATION; + + public static String MODEL_CONFIGURATION; + + public static String OVERLAYS_CONFIG_PARTICIPANT; + + public static String OVERLAYS_CONFIG_PARTICIPANT_CURRENTQUEUELENGTH; + + public static String OVERLAYS_CONFIG_PARTICIPANT_AVERAGEQUEUELENGTH; + + public static String OVERLAYS_CONFIG_APPLICATION; + + public static String OVERLAYS_CONFIG_APPLICATION_CURRENTQUEUELENGTH; + + public static String OVERLAYS_CONFIG_APPLICATION_AVERAGEQUEUELENGTH; + + public static String OVERLAYS_CONFIG_ACTIVITY; + + public static String OVERLAYS_CONFIG_ACTIVITY_ACTIVATETIME; + + public static String OVERLAYS_CONFIG_ACTIVITY_SUSPENDTIME; + + public static String OVERLAYS_CONFIG_TRANSITION; + + public static String OVERLAYS_ACTIVATE_TIME; + + public static String OVERLAYS_AVERAGE_QUEUE; + + public static String OVERLAYS_CONFIGURATION; + + public static String OVERLAYS_CONFIG_TITLE; + + public static String OVERLAYS_CURRENT_QUEUE; + + public static String OVERLAYS_CURVE; + + public static String OVERLAYS_MAXIMUM_QUEUE; + + public static String OVERLAYS_SUSPEND_TIME; + + public static String OVERLAYS_TOTAL_TIME; + + public static String OVERLAYS_TOOLTIP_COPY; + + public static String OVERLAYS_TOOLTIP_PIN; + + public static String OVERLAYS_TOOLTIP_UNPIN; + + public static String OVERLAY_ACTIVITY_ACTIVITY_PREFIX; + + public static String OVERLAY_APPLICATION_APPLICATION_PREFIX; + + public static String OVERLAY_APPLICATION_QUEUE_LENGTH; + + public static String OVERLAY_PARTICIPANT_PARTICIPANT_PREFIX; + + public static String OVERLAY_PARTICIPANT_QUEUE_LENGTH; + + public static String OVERLAY_TRANSITION_TRANSITION_PREFIX; + + public static String RC_ERR_ConfigurationError; + + public static String RC_ERR_EmptyList; + + public static String RC_ERR_EndDate; + + public static String RC_ERR_EndDateNotValid; + + public static String RC_ERR_InvalidValue; + + public static String RC_ERR_InvalidWorkbenchState; + + public static String RC_ERR_LogJdbcDriver; + + public static String RC_ERR_LogJdbcDriverNotFound; + + public static String RC_ERR_LogJdbcUrl; + + public static String RC_ERR_ModelElementMissing; + + public static String RC_ERR_ModelFile; + + public static String RC_ERR_ModelFileDoesNotExist1; + + public static String RC_ERR_ModelFileDoesNotExist; + + public static String RC_ERR_ModelFileNeedsToBeLoaded1; + + public static String RC_ERR_Project; + + public static String RC_ERR_ProjectDoesNotExist1; + + public static String RC_ERR_ProjectDoesNotExist; + + public static String RC_ERR_RetrieveJdbcDriver; + + public static String RC_ERR_RetrieveJdbcDriverNotFound; + + public static String RC_ERR_RetrieveJdbcUrl; + + public static String RC_ERR_SimulationConfigurationIsNotValid; + + public static String RC_ERR_SimulationConfigurationListIsEmpty; + + public static String RC_ERR_StartDate; + + public static String RC_ERR_StartDateNotValid; + + public static String RETRIEVE_BEFORE_RUN; + + public static String RETRIEVE_FROM_AUDITTRAIL; + + public static String RUNTIME_CONFIGURATION_DEFAULT_SUFFIX; + + public static String RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_all; + + public static String RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_carnot_properties; + + public static String RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_properties; + + public static String RUNTIME_CONTINUE_MESSAGE; + + public static String RUNTIME_ERROR_TITLE; + + public static String RUNTIME_WARNING_TITLE; + + public static String SIMULATION_CONFIGURATION; + + public static String START_OF_RETRIEVAL; + + public static String START_OF_SIMULATION; + + public static String STATISITICS_PROCESS_REFERENCE_VALUE_END; + + public static String STATISITICS_PROCESS_REFERENCE_VALUE_START; + + public static String STATISTICS_ACTION_OVERLAYS; + + public static String STATISTICS_ACTION_OVERLAYS_TOOLTIP; + + public static String STATISTICS_ACTION_PAUSE; + + public static String STATISTICS_ACTION_PAUSE_TOOLTIP; + + public static String STATISTICS_ACTION_REFERENCE; + + public static String STATISTICS_ACTION_REFERENCE_CLEAR; + + public static String STATISTICS_ACTION_REFERENCE_CLEAR_TOOLTIP; + + public static String STATISTICS_ACTION_REFERENCE_TOOLTIP; + + public static String STATISTICS_ACTION_RESTART; + + public static String STATISTICS_ACTION_RESTART_TOOLTIP; + + public static String STATISTICS_ACTION_RESUME; + + public static String STATISTICS_ACTION_RESUME_TOOLTIP; + + public static String STATISTICS_ACTION_RETRIEVAL; + + public static String STATISTICS_ACTION_RETRIEVAL_TOOLTIP; + + public static String STATISTICS_ACTION_START; + + public static String STATISTICS_ACTION_START_TOOLTIP; + + public static String STATISTICS_ACTION_STOP; + + public static String STATISTICS_ACTION_STOP_TOOLTIP; + + public static String STATISTICS_ACTIVITY_COLUMN_ACTIVITY; + + public static String STATISTICS_ACTIVITY_COLUMN_AVG_EXECUTION_DURATION; + + public static String STATISTICS_ACTIVITY_COLUMN_AVG_TOTAL_TIME; + + public static String STATISTICS_ACTIVITY_COLUMN_AVG_WAIT_TIME; + + public static String STATISTICS_ACTIVITY_COLUMN_MAX_EXECUTION_DURATION; + + public static String STATISTICS_ACTIVITY_COLUMN_MAX_TOTAL_TIME; + + public static String STATISTICS_ACTIVITY_COLUMN_MAX_WAIT_TIME; + + public static String STATISTICS_ACTIVITY_COLUMN_MIN_EXECUTION_DURATION; + + public static String STATISTICS_ACTIVITY_COLUMN_MIN_TOTAL_TIME; + + public static String STATISTICS_ACTIVITY_COLUMN_TOTAL_INSTANCES; + + public static String STATISTICS_ACTIVITY_REFERENCE_VALUE_END; + + public static String STATISTICS_ACTIVITY_REFERENCE_VALUE_START; + + public static String STATISTICS_ACTIVITY_SUBPROCESS_SUFFIX; + + public static String STATISTICS_EXPORT_CSV_REFERENCE_COLUMN_NAME_PREFIX; + + public static String STATISTICS_EXPORT_HTML_REFERENCE_COLUMN_NAME_PREFIX; + + public static String STATISTICS_LABEL_CURRENT_TIME; + + public static String STATISTICS_LABEL_END_TIME; + + public static String STATISTICS_LABEL_SIMULATION_PROGRESS; + + public static String STATISTICS_LABEL_START_TIME; + + public static String STATISTICS_MODEL_TIME_FORMAT; + + public static String STATISTICS_PROCESS_COLUMN_AVG_DURATION; + + public static String STATISTICS_PROCESS_COLUMN_COMPLETED_INSTANCES; + + public static String STATISTICS_PROCESS_COLUMN_CREATED_INSTANCES; + + public static String STATISTICS_PROCESS_COLUMN_MAX_DURATION; + + public static String STATISTICS_PROCESS_COLUMN_MIN_DURATION; + + public static String STATISTICS_PROCESS_COLUMN_PROCESS_DEFINITION; + + public static String STATISTICS_PROCESS_PATH_COLUMN_ACTIVITIES; + + public static String STATISTICS_PROCESS_PATH_COLUMN_DURATION; + + public static String STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_COUNT; + + public static String STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_RATE; + + public static String STATISTICS_PROCESS_PATH_REFERENCE_VALUE_END; + + public static String STATISTICS_PROCESS_PATH_REFERENCE_VALUE_START; + + public static String STATISTICS_RESOURCE_COLUMN_AVG_EXECUTION_DURATION; + + public static String STATISTICS_RESOURCE_COLUMN_AVG_QUEUE_LENGTH; + + public static String STATISTICS_RESOURCE_COLUMN_MAX_EXECUTION_DURATION; + + public static String STATISTICS_RESOURCE_COLUMN_MAX_QUEUE_LENGTH; + + public static String STATISTICS_RESOURCE_COLUMN_MIN_EXECUTION_DURATION; + + public static String STATISTICS_RESOURCE_COLUMN_RESOURCE_NAME; + + public static String STATISTICS_RESOURCE_COLUMN_TOTAL_INSTANCES; + + public static String STATISTICS_RESOURCE_REFERENCE_VALUE_END; + + public static String STATISTICS_RESOURCE_REFERENCE_VALUE_START; + + public static String STATISTICS_STATE_INITIALIZING; + + public static String STATISTICS_STATE_PAUSED; + + public static String STATISTICS_STATE_RUNNING; + + public static String STATISTICS_STATE_STOPPED; + + public static String STATISTICS_TAB_ACTIVITY; + + public static String STATISTICS_TAB_APPLICATION; + + public static String STATISTICS_TAB_PARTICIPANT; + + public static String STATISTICS_TAB_PROCESS; + + public static String STATISTICS_TAB_PROCESS_PATH; + + public static String STATISTICS_TAB_TRANSITION; + + public static String STATISTICS_TRANSITION_COLUMN_IN_OUT; + + public static String STATISTICS_TRANSITION_COLUMN_SOURCE_TARGET; + + public static String STATISTICS_TRANSITION_COLUMN_TRANSITION_NAME; + + public static String STATISTICS_TRANSITION_COLUMN_TRAVERSAL_COUNT; + + public static String STATISTICS_TRANSITION_COLUMN_TRAVERSAL_RATE; + + public static String STATISTICS_TRANSITION_IN_TRANSITION; + + public static String STATISTICS_TRANSITION_OUT_TRANSITION; + + public static String STATISTICS_TRANSITION_REFERENCE_VALUE_END; + + public static String STATISTICS_TRANSITION_REFERENCE_VALUE_START; + + public static String TERMINATION_CONFIGURATION; + + public static String WARNING_USING_NOT_DEFAULT_SIMULATION_CONFIGURATION; + +} diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/RetrieveFromAuditTrailConfiguration.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/RetrieveFromAuditTrailConfiguration.java index 0279b69..9ac8ac6 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/RetrieveFromAuditTrailConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/RetrieveFromAuditTrailConfiguration.java @@ -26,7 +26,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.stardust.ide.simulation.rt.output.AuditTrailJdbcEventLogger; import org.eclipse.stardust.ide.simulation.rt.util.EclipseUtils; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.audittrail.DatabaseFacade; import org.eclipse.stardust.ide.simulation.ui.audittrail.IRetrieveFromAuditTrailConfiguration; import org.eclipse.stardust.ide.simulation.ui.timeutils.TimeCalculator; @@ -91,7 +91,7 @@ public class RetrieveFromAuditTrailConfiguration extends JdbcConfiguration additionalClasspath = EclipseUtils.parseClasspath(configuration); } catch (Exception e) { - throw new SimulationCoreException(Messages.AUDITTRAIL_ERR_CONFIGURATION_INIT, e.getMessage(), e); + throw new SimulationCoreException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_CONFIGURATION_INIT, e.getMessage(), e); } } @@ -244,19 +244,19 @@ public class RetrieveFromAuditTrailConfiguration extends JdbcConfiguration throw new NullPointerException(); } catch (Exception e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_DRIVER, getDriverClassName(), e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_DRIVER, getDriverClassName(), e); } try { Properties info = new Properties(); - info.put("user", getUsername()); - info.put("password", getPassword()); + info.put("user", getUsername()); //$NON-NLS-1$ + info.put("password", getPassword()); //$NON-NLS-1$ connection = driver.connect(getConnectionUrl(), info); if (connection == null) throw new NullPointerException(); } catch (Exception e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_CONNECTION, getConnectionUrl(), e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_CONNECTION, getConnectionUrl(), e); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/SimulationTimeIntervalConfiguration.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/SimulationTimeIntervalConfiguration.java index ba5480c..ca400ee 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/SimulationTimeIntervalConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/SimulationTimeIntervalConfiguration.java @@ -17,6 +17,7 @@ import java.util.Date; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationCoreException; @@ -40,7 +41,7 @@ public class SimulationTimeIntervalConfiguration { this.startDate = df.parse(configuration.getAttribute(START_DATE_ATTRIBUTE, "01-01-2007")); //$NON-NLS-1$ } catch (ParseException e) { // TODO BUG#4126 Exception handling - throw new SimulationCoreException("TODO", null); + throw new SimulationCoreException(Simulation_Runtime_Messages.EXC_TODO, null); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/termination/EndOfTimeIntervalConfiguration.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/termination/EndOfTimeIntervalConfiguration.java index a512bda..a7dba33 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/termination/EndOfTimeIntervalConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/configuration/termination/EndOfTimeIntervalConfiguration.java @@ -17,6 +17,7 @@ import java.util.Date; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationCoreException; @@ -37,7 +38,7 @@ public class EndOfTimeIntervalConfiguration implements ITerminationConfiguration this.endOfSimulationDate = df.parse(configuration.getAttribute(END_OF_SIMULATION_DATE_ATTRIBUTE, "01-01-2007")); //$NON-NLS-1$ } catch (ParseException e) { // TODO BUG#4126 Exception handling - throw new SimulationCoreException("TODO", null); + throw new SimulationCoreException(Simulation_Runtime_Messages.EXC_TODO, null); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/i18n/Messages.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/i18n/Messages.java deleted file mode 100644 index 602ca2a..0000000 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/i18n/Messages.java +++ b/dev/null @@ -1,278 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 SunGard CSA LLC and others. - * 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: - * SunGard CSA LLC - initial API and implementation and/or initial documentation - *******************************************************************************/ -package org.eclipse.stardust.ide.simulation.rt.runtime.i18n; - -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS -{ - private static final String BUNDLE_NAME = "org.eclipse.stardust.ide.simulation.rt.runtime.i18n.messages"; //$NON-NLS-1$ - - private static final ResourceBundle singleton = ResourceBundle.getBundle(BUNDLE_NAME); - - private Messages() { - } - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - public static String getString(String key) { - try { - return singleton.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } - - public static String getString(String key, Object...values) - { - String rawMsg = getString(key); - String formattedMsg = MessageFormat.format(rawMsg, values); - return formattedMsg; - } - - public static String TERMINATION_CONDITION; - public static String SETTINGS; - public static String END_OF_TIME_INTERVAL; - public static String NUMBER_OF_PI_REACHED; - public static String NUMBER_OF_PI; - public static String APPLICATION_QUEUE_LENGTH; - public static String PARTICIPANT_QUEUE_LENGTH; - public static String QUEUE_LENGTH; - public static String TRANSITIONS_TRAVERSED; - public static String PROCESS_DEFINITION; - public static String ACTIVITIES; - public static String APPLICATIONS; - public static String PARTICIPANTS; - public static String TRANSITIONS; - public static String MAX_QUEUE_LENGTH; - public static String MAX_TRAVERSALS; - - public static String ASK_BEFORE_LOGGING; - public static String ASK_BEFORE_RETRIEVE; - public static String AUDITTRAIL_CONFIRMATION_MESSAGE; - public static String AUDITTRAIL_CONFIRMATION_QUESTION; - public static String AUDITTRAIL_CONFIRMATION_TITLE; - public static String AUDITTRAIL_LOGGING_NO_MODEL_ERROR; - public static String AUDITTRAIL_LOGGING_NO_MODEL_FOUND; - public static String AUDITTRAIL_LOGGING_VERSION_CHECK_ERROR; - public static String AUDIT_TRAIL_JDBC_CONFIGURATION; - public static String AUDIT_TRAIL_LOGGING_CONFIGURATION; - public static String AUDIT_TRAIL_RETRIEVAL_CONFIGURATION; - public static String AUDIT_TRAIL_RETRIEVAL_METHOD_CONFIGURATION; - public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT; - public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT_day; - public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT_month; - public static String AVAILABLE_RESOURCES_INTERPOLATION_UNIT_week; - public static String CLEANUP_RUNTIME; - public static String CUSTOM_DISTRIBUTION_INTERPOLATION_UNIT; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_15min; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_1hour; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_2hours; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_30min; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_4hours; - public static String DAILY_AVAILABILITY_INTERPOLATION_UNIT_8hours; - public static String DATABASE_TYPE; - public static String DEFAULT_AVAILABILITY_APPROXIMATION_MODE; - public static String DEFAULT_AVAILABILITY_INTERPOLATION_MODE; - public static String DEFAULT_AVAILABILITY_INTERPOLATION_MODE_average; - public static String DEFAULT_AVAILABILITY_INTERPOLATION_MODE_max; - public static String DEFAULT_AVAILABLE_APPROXIMATION_MODE_continue; - public static String DEFAULT_AVAILABLE_APPROXIMATION_MODE_linear; - public static String DEFAULT_AVAILABLE_APPROXIMATION_MODE_repeate; - public static String RESET_AVAILABILITY_CALENDAR; - public static String END_OF_RETRIEVAL; - public static String END_OF_SIMULATION; - public static String ERRORS_IN_MODEL; - public static String ERROR_GOT_EXCEPTION; - public static String ERROR_WRONG_END1; - public static String ERROR_WRONG_END2; - public static String ERROR_WRONG_END3; - public static String ERROR_WRONG_START1; - public static String ERROR_WRONG_START2; - public static String ERROR_WRONG_START3; - public static String JDBCTAB_IMPORT_BUTTON; - public static String JDBC_ACCOUNT; - public static String JDBC_DRIVER; - public static String JDBC_PARTITION; - public static String JDBC_PARTITION_DEFAULT; - public static String JDBC_PASSWORD; - public static String JDBC_SCHEMA; - public static String JDBC_SCHEMA_DEFAULT; - public static String JDBC_URL; - public static String LOG_TO_AUDIT_TRAIL; - public static String LOG_TO_AUDIT_TRAIL_TITLE; - public static String LOG_TO_AUDIT_TRAIL_CONFIRMATION; - public static String LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION; - public static String MAIN_CONFIGURATION; - public static String MODEL_CONFIGURATION; - public static String OVERLAYS_CONFIG_PARTICIPANT; - public static String OVERLAYS_CONFIG_PARTICIPANT_CURRENTQUEUELENGTH; - public static String OVERLAYS_CONFIG_PARTICIPANT_AVERAGEQUEUELENGTH; - public static String OVERLAYS_CONFIG_APPLICATION; - public static String OVERLAYS_CONFIG_APPLICATION_CURRENTQUEUELENGTH; - public static String OVERLAYS_CONFIG_APPLICATION_AVERAGEQUEUELENGTH; - public static String OVERLAYS_CONFIG_ACTIVITY; - public static String OVERLAYS_CONFIG_ACTIVITY_ACTIVATETIME; - public static String OVERLAYS_CONFIG_ACTIVITY_SUSPENDTIME; - public static String OVERLAYS_CONFIG_TRANSITION; - public static String OVERLAYS_ACTIVATE_TIME; - public static String OVERLAYS_AVERAGE_QUEUE; - public static String OVERLAYS_CONFIGURATION; - public static String OVERLAYS_CONFIG_TITLE; - public static String OVERLAYS_CURRENT_QUEUE; - public static String OVERLAYS_CURVE; - public static String OVERLAYS_MAXIMUM_QUEUE; - public static String OVERLAYS_SUSPEND_TIME; - public static String OVERLAYS_TOTAL_TIME; - public static String OVERLAYS_TOOLTIP_COPY; - public static String OVERLAYS_TOOLTIP_PIN; - public static String OVERLAYS_TOOLTIP_UNPIN; - public static String OVERLAY_ACTIVITY_ACTIVITY_PREFIX; - public static String OVERLAY_APPLICATION_APPLICATION_PREFIX; - public static String OVERLAY_APPLICATION_QUEUE_LENGTH; - public static String OVERLAY_PARTICIPANT_PARTICIPANT_PREFIX; - public static String OVERLAY_PARTICIPANT_QUEUE_LENGTH; - public static String OVERLAY_TRANSITION_TRANSITION_PREFIX; - public static String RC_ERR_ConfigurationError; - public static String RC_ERR_EmptyList; - public static String RC_ERR_EndDate; - public static String RC_ERR_EndDateNotValid; - public static String RC_ERR_InvalidValue; - public static String RC_ERR_InvalidWorkbenchState; - public static String RC_ERR_LogJdbcDriver; - public static String RC_ERR_LogJdbcDriverNotFound; - public static String RC_ERR_LogJdbcUrl; - public static String RC_ERR_ModelElementMissing; - public static String RC_ERR_ModelFile; - public static String RC_ERR_ModelFileDoesNotExist1; - public static String RC_ERR_ModelFileDoesNotExist; - public static String RC_ERR_ModelFileNeedsToBeLoaded1; - public static String RC_ERR_Project; - public static String RC_ERR_ProjectDoesNotExist1; - public static String RC_ERR_ProjectDoesNotExist; - public static String RC_ERR_RetrieveJdbcDriver; - public static String RC_ERR_RetrieveJdbcDriverNotFound; - public static String RC_ERR_RetrieveJdbcUrl; - public static String RC_ERR_SimulationConfigurationIsNotValid; - public static String RC_ERR_SimulationConfigurationListIsEmpty; - public static String RC_ERR_StartDate; - public static String RC_ERR_StartDateNotValid; - public static String RETRIEVE_BEFORE_RUN; - public static String RETRIEVE_FROM_AUDITTRAIL; - public static String RETRIEVE_NOW; - public static String RUNTIME_CONFIGURATION_DEFAULT_SUFFIX; - public static String RUNTIME_CONFIGURATION_ERROR_TITLE; - public static String RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_all; - public static String RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_carnot_properties; - public static String RUNTIME_CONFIGURATION_JDBC_FILE_DIALOG_FILTER_NAME_properties; - public static String RUNTIME_CONTINUE_MESSAGE; - public static String RUNTIME_ERROR_MESSAGE; - public static String RUNTIME_ERROR_TITLE; - public static String RUNTIME_WARNING_TITLE; - public static String SIMULATION_CONFIGURATION; - public static String SIMULATION_PROPERTIES; - public static String SIMULATION_TIME_INTERVAL_CONFIGURATION; - public static String START_OF_RETRIEVAL; - public static String START_OF_SIMULATION; - public static String STATISITICS_PROCESS_REFERENCE_VALUE_END; - public static String STATISITICS_PROCESS_REFERENCE_VALUE_START; - public static String STATISTICS_ACTION_OVERLAYS; - public static String STATISTICS_ACTION_OVERLAYS_TOOLTIP; - public static String STATISTICS_ACTION_PAUSE; - public static String STATISTICS_ACTION_PAUSE_TOOLTIP; - public static String STATISTICS_ACTION_REFERENCE; - public static String STATISTICS_ACTION_REFERENCE_CLEAR; - public static String STATISTICS_ACTION_REFERENCE_CLEAR_TOOLTIP; - public static String STATISTICS_ACTION_REFERENCE_TOOLTIP; - public static String STATISTICS_ACTION_RESTART; - public static String STATISTICS_ACTION_RESTART_TOOLTIP; - public static String STATISTICS_ACTION_RESUME; - public static String STATISTICS_ACTION_RESUME_TOOLTIP; - public static String STATISTICS_ACTION_RETRIEVAL; - public static String STATISTICS_ACTION_RETRIEVAL_TOOLTIP; - public static String STATISTICS_ACTION_START; - public static String STATISTICS_ACTION_START_TOOLTIP; - public static String STATISTICS_ACTION_STOP; - public static String STATISTICS_ACTION_STOP_TOOLTIP; - public static String STATISTICS_ACTIVITY_COLUMN_ACTIVITY; - public static String STATISTICS_ACTIVITY_COLUMN_AVG_EXECUTION_DURATION; - public static String STATISTICS_ACTIVITY_COLUMN_AVG_TOTAL_TIME; - public static String STATISTICS_ACTIVITY_COLUMN_AVG_WAIT_TIME; - public static String STATISTICS_ACTIVITY_COLUMN_MAX_EXECUTION_DURATION; - public static String STATISTICS_ACTIVITY_COLUMN_MAX_TOTAL_TIME; - public static String STATISTICS_ACTIVITY_COLUMN_MAX_WAIT_TIME; - public static String STATISTICS_ACTIVITY_COLUMN_MIN_EXECUTION_DURATION; - public static String STATISTICS_ACTIVITY_COLUMN_MIN_TOTAL_TIME; - public static String STATISTICS_ACTIVITY_COLUMN_TOTAL_INSTANCES; - public static String STATISTICS_ACTIVITY_REFERENCE_VALUE_END; - public static String STATISTICS_ACTIVITY_REFERENCE_VALUE_START; - public static String STATISTICS_ACTIVITY_SUBPROCESS_SUFFIX; - public static String STATISTICS_EXPORT_CSV_REFERENCE_COLUMN_NAME_PREFIX; - public static String STATISTICS_EXPORT_HTML_REFERENCE_COLUMN_NAME_PREFIX; - public static String STATISTICS_FORMAT_DAYS; - public static String STATISTICS_LABEL_CURRENT_TIME; - public static String STATISTICS_LABEL_END_TIME; - public static String STATISTICS_LABEL_SIMULATION_PROGRESS; - public static String STATISTICS_LABEL_START_TIME; - public static String STATISTICS_MODEL_TIME_FORMAT; - public static String STATISTICS_PROCESS_COLUMN_AVG_DURATION; - public static String STATISTICS_PROCESS_COLUMN_COMPLETED_INSTANCES; - public static String STATISTICS_PROCESS_COLUMN_CREATED_INSTANCES; - public static String STATISTICS_PROCESS_COLUMN_MAX_DURATION; - public static String STATISTICS_PROCESS_COLUMN_MIN_DURATION; - public static String STATISTICS_PROCESS_COLUMN_PROCESS_DEFINITION; - public static String STATISTICS_PROCESS_PATH_COLUMN_ACTIVITIES; - public static String STATISTICS_PROCESS_PATH_COLUMN_DURATION; - public static String STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_COUNT; - public static String STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_RATE; - public static String STATISTICS_PROCESS_PATH_REFERENCE_VALUE_END; - public static String STATISTICS_PROCESS_PATH_REFERENCE_VALUE_START; - public static String STATISTICS_RESOURCE_COLUMN_AVG_EXECUTION_DURATION; - public static String STATISTICS_RESOURCE_COLUMN_AVG_QUEUE_LENGTH; - public static String STATISTICS_RESOURCE_COLUMN_MAX_EXECUTION_DURATION; - public static String STATISTICS_RESOURCE_COLUMN_MAX_QUEUE_LENGTH; - public static String STATISTICS_RESOURCE_COLUMN_MIN_EXECUTION_DURATION; - public static String STATISTICS_RESOURCE_COLUMN_RESOURCE_NAME; - public static String STATISTICS_RESOURCE_COLUMN_TOTAL_INSTANCES; - public static String STATISTICS_RESOURCE_REFERENCE_VALUE_END; - public static String STATISTICS_RESOURCE_REFERENCE_VALUE_START; - public static String STATISTICS_STATE_INITIALIZING; - public static String STATISTICS_STATE_PAUSED; - public static String STATISTICS_STATE_RUNNING; - public static String STATISTICS_STATE_STOPPED; - public static String STATISTICS_TAB_ACTIVITY; - public static String STATISTICS_TAB_APPLICATION; - public static String STATISTICS_TAB_PARTICIPANT; - public static String STATISTICS_TAB_PROCESS; - public static String STATISTICS_TAB_PROCESS_PATH; - public static String STATISTICS_TAB_TRANSITION; - public static String STATISTICS_TRANSITION_COLUMN_IN_OUT; - public static String STATISTICS_TRANSITION_COLUMN_SOURCE_TARGET; - public static String STATISTICS_TRANSITION_COLUMN_TRANSITION_NAME; - public static String STATISTICS_TRANSITION_COLUMN_TRAVERSAL_COUNT; - public static String STATISTICS_TRANSITION_COLUMN_TRAVERSAL_RATE; - public static String STATISTICS_TRANSITION_IN_TRANSITION; - public static String STATISTICS_TRANSITION_OUT_TRANSITION; - public static String STATISTICS_TRANSITION_REFERENCE_VALUE_END; - public static String STATISTICS_TRANSITION_REFERENCE_VALUE_START; - public static String TERMINATION_CONFIGURATION; - public static String USE_AUDIT_TRAIL; - public static String WARNING_USING_NOT_DEFAULT_SIMULATION_CONFIGURATION; - -} diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/ProcessInstance.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/ProcessInstance.java index 8692290..83d54c1 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/ProcessInstance.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/ProcessInstance.java @@ -32,6 +32,7 @@ import org.eclipse.stardust.ide.simulation.rt.output.ProcessInstanceEvent; import org.eclipse.stardust.ide.simulation.rt.output.TransitionInstanceEvent; import org.eclipse.stardust.ide.simulation.rt.runtime.SimulationRandom; import org.eclipse.stardust.ide.simulation.rt.runtime.SimulationTriggerQueue; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessPath; public class ProcessInstance extends Instance { @@ -253,7 +254,7 @@ public class ProcessInstance extends Instance { result.add(transitionDefinition); return result; } else { - log.debug("transition will not be traversed since its maximum traversal count has been reached"); + log.debug("transition will not be traversed since its maximum traversal count has been reached"); //$NON-NLS-1$ return Collections.EMPTY_LIST; } } @@ -311,7 +312,7 @@ class AndJoin { public Set getTransitionInstancesToBeLogged(ActivityInstance newTargetActivityInstance) { if (this.getToBeJoinedTokenCount() != 0) { - throw new RuntimeException("Should not be called when this.getToBeJoinedTokenCount() != 0"); + throw new RuntimeException(Simulation_Runtime_Messages.EXC_SHOULD_NOT_BE_CALLED_WHEN+"this.getToBeJoinedTokenCount() != 0"); //$NON-NLS-1$ } // replace the target activity instance with the right one (only it contains the right audit trail oid) for (Iterator i = this.transitionInstancesToBeLogged.iterator(); i.hasNext(); ) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/TransitionTraversalCounter.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/TransitionTraversalCounter.java index 65d169d..fefada0 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/TransitionTraversalCounter.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/instance/TransitionTraversalCounter.java @@ -43,7 +43,7 @@ public class TransitionTraversalCounter // no entry in maxTraversalCounts yet, generate it (only once!) Long tmp = new Long(transitionDefinition.getTransitionExecutionCondition().generateMaxTraversalCount()); this.maxTraversalCounts.put(transitionId, tmp); - log.debug("maxTraversalCount for transition <"+transitionId+"> will be <"+tmp+">"); + log.debug("maxTraversalCount for transition <"+transitionId+"> will be <"+tmp+">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } long maxTraversalCount = ((Long)this.maxTraversalCounts.get(transitionId)).longValue(); if (currentTraversalCount < maxTraversalCount) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/i18n/messages.properties b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/simulation-runtime-messages.properties index 8aecf25..1b2c6ce 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/i18n/messages.properties +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/simulation-runtime-messages.properties @@ -1,14 +1,4 @@ -############################################################################### -# Copyright (c) 2011 SunGard CSA LLC and others. -# 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: -# SunGard CSA LLC - initial API and implementation and/or initial documentation -############################################################################### -SIMULATION_PROPERTIES=Simulation + MAIN_CONFIGURATION=&Main AUDIT_TRAIL_LOGGING_CONFIGURATION=Audit Trail &Logging @@ -17,7 +7,7 @@ AUDIT_TRAIL_JDBC_CONFIGURATION=JDBC Configuration AUDIT_TRAIL_RETRIEVAL_METHOD_CONFIGURATION=Retrieval Method Configuration -MODEL_CONFIGURATION=Model + OVERLAYS_CONFIGURATION=Statistics Overlays START_OF_SIMULATION=&Start of Simulation: @@ -38,10 +28,10 @@ LOG_TO_AUDIT_TRAIL_TITLE=Log to Audit Trail Database LOG_TO_AUDIT_TRAIL_CONFIRMATION=Log this simulation to the audit trail database? LOG_TO_AUDIT_TRAIL_CLEANUP_CONFIRMATION=Runtime data of all process instances will be deleted from audit trail database "{0}".\n\nContinue? CLEANUP_RUNTIME=Cleanup &Runtime Data Before Logging -USE_AUDIT_TRAIL=Use Simulation Audit Trail Configuration: + MODEL_CONFIGURATION=Model -SIMULATION_TIME_INTERVAL_CONFIGURATION=Simulation Time Interval + SIMULATION_CONFIGURATION=Simulation C&onfiguration: TERMINATION_CONFIGURATION=Termination @@ -51,7 +41,7 @@ SETTINGS=Settings END_OF_TIME_INTERVAL=End of Time Interval NUMBER_OF_PI_REACHED=Number of Completed Process Instances NUMBER_OF_PI=Completed Process &Instances: -QUEUE_LENGTH=Queue Length + APPLICATION_QUEUE_LENGTH=Application Queue Length PARTICIPANT_QUEUE_LENGTH=Participant Queue Length APPLICATIONS=&Application: @@ -67,13 +57,13 @@ MAX_TRAVERSALS=Maximum Tra&versals: ASK_BEFORE_LOGGING=A&sk for Confirmation RETRIEVE_BEFORE_RUN=Evaluate Audit Trail Data &before Simulation Run -RETRIEVE_NOW=Evaluate Now + ASK_BEFORE_RETRIEVE=A&sk for Confirmation START_OF_RETRIEVAL=S&tart of Evaluation Interval: END_OF_RETRIEVAL=End o&f Evaluation Interval: DAILY_AVAILABILITY_INTERPOLATION_UNIT=Interpolation Unit for &Daily Availability: AVAILABLE_RESOURCES_INTERPOLATION_UNIT=Interpolation Unit for Available &Resources: -CUSTOM_DISTRIBUTION_INTERPOLATION_UNIT=Interpolation Unit for &Custom Distribution: + DEFAULT_AVAILABILITY_INTERPOLATION_MODE=Default &Interpolation Mode: DEFAULT_AVAILABILITY_APPROXIMATION_MODE=Default Appro&ximation Method: RESET_AVAILABILITY_CALENDAR=Reset Availability Calendar @@ -113,12 +103,10 @@ OVERLAYS_MAXIMUM_QUEUE=Maximum Queue Length OVERLAYS_CURRENT_QUEUE=Current Queue Length OVERLAYS_TOTAL_TIME=Total Time: OVERLAYS_ACTIVATE_TIME=Activated: -OVERLAYS_SUSPEND_TIME=Waiting: \ - +OVERLAYS_SUSPEND_TIME=Waiting: OVERLAYS_TOOLTIP_COPY=Copy to Clipboard OVERLAYS_TOOLTIP_PIN=Pin OVERLAYS_TOOLTIP_UNPIN=Unpin - STATISTICS_ACTION_START=Start STATISTICS_ACTION_START_TOOLTIP=Start New Simulation... STATISTICS_ACTION_RESTART=Restart @@ -185,7 +173,7 @@ STATISTICS_PROCESS_COLUMN_PROCESS_DEFINITION=Process Definition STATISTICS_TRANSITION_COLUMN_TRANSITION_NAME=Transition STATISTICS_TRANSITION_COLUMN_TRAVERSAL_COUNT=Traversal Count STATISTICS_TAB_PROCESS=Process Statistics -STATISTICS_FORMAT_DAYS=\ days + STATISTICS_TAB_ACTIVITY=Activity Statistics STATISTICS_TAB_TRANSITION=Transition Statistics STATISTICS_TAB_PARTICIPANT=Participant Statistics @@ -200,9 +188,9 @@ STATISTICS_STATE_PAUSED=paused STATISTICS_STATE_INITIALIZING=initializing ... STATISTICS_STATE_RUNNING=running ... STATISTICS_STATE_STOPPED=stopped -RUNTIME_CONFIGURATION_ERROR_TITLE=Configuration Error + RUNTIME_ERROR_TITLE=Simulation Error -RUNTIME_ERROR_MESSAGE=Running simulation failed due to following reason: + RUNTIME_WARNING_TITLE=Simulation RUNTIME_CONTINUE_MESSAGE=Some optional parts of the simulation failed to execute.\n\nContinue simulation? ERRORS_IN_MODEL=Errors exist in required model \"{0}\", please correct them first @@ -210,6 +198,7 @@ RETRIEVE_FROM_AUDITTRAIL=Retrieving from Audit Trail Database AUDITTRAIL_CONFIRMATION_TITLE=Confirmation AUDITTRAIL_CONFIRMATION_MESSAGE=Confirm evaluation of the audit trail database. AUDITTRAIL_CONFIRMATION_QUESTION=Some settings of this simulation configuration depend on statistics\nabout already executed processes stored in the audit trail database.\n\nDo you want to evaluate the audit trail and update these settings now? + AUDITTRAIL_LOGGING_VERSION_CHECK_ERROR=Audit trail logging can not be performed, the model "{0}" deployed on the server has a different version than the local model. Model version on the server: "{1}", Model version local: "{2}" AUDITTRAIL_LOGGING_NO_MODEL_ERROR=Audit trail logging can not be performed, because no active model exist in the audit trail database AUDITTRAIL_LOGGING_NO_MODEL_FOUND=Audit trail logging can not be performed,the Model "{0}" could not be found in the Database @@ -220,11 +209,18 @@ ERROR_GOT_EXCEPTION=An unexpected runtime exception ERROR_WRONG_END1=Configuration error: endTime ( ERROR_WRONG_END2=) <= startTime ( ERROR_WRONG_END3=) +EXC_CANNOT_BE_AFTER_SIMULATION_INTERVAL_END_TIME=can not be after simulation interval end time +EXC_CANNOT_SCHEDULE_TRIGGER_FOR=Can not schedule trigger for +EXC_END_TIME_CONFIGURED_IN_RUNTIME_SETTINGS=End time configured in runtime settings +EXC_IT_IS_BEFORE_START_TIME=, it is before start time +EXC_NOT_IMPLEMENTED_FOR_DUMMY_SIMULATION_CONTROLLER=Not implemented for Dummy Simulation Controller +EXC_SHOULD_NOT_BE_CALLED_WHEN=Should not be called when +EXC_TODO=TODO JDBCTAB_IMPORT_BUTTON=Import Configuration from File... OVERLAY_ACTIVITY_ACTIVITY_PREFIX=Activity OVERLAY_APPLICATION_QUEUE_LENGTH=queue length OVERLAY_PARTICIPANT_QUEUE_LENGTH=queue length -OVERLAY_TRANSITION_TRANSITION_PREFIX=Transition + OVERLAY_TRANSITION_TRANSITION_PREFIX=Transition OVERLAY_APPLICATION_APPLICATION_PREFIX=Application OVERLAY_PARTICIPANT_PARTICIPANT_PREFIX=Participant diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/ProcessDefinitionStatistics.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/ProcessDefinitionStatistics.java index 80fb378..0b1f03b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/ProcessDefinitionStatistics.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/ProcessDefinitionStatistics.java @@ -117,7 +117,7 @@ public class ProcessDefinitionStatistics implements IStatistics { } public String toString () { - return "createdProcessInstanceCount <"+getCreatedProcessInstanceCount()+"> completedProcessInstanceCount <"+getCompletedProcessIntanceCount()+"> averageProcessInstanceLifetime <"+this.getAverageProcessInstanceLifetime()+">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return "createdProcessInstanceCount <"+getCreatedProcessInstanceCount()+"> completedProcessInstanceCount <"+getCompletedProcessIntanceCount()+"> averageProcessInstanceLifetime <"+this.getAverageProcessInstanceLifetime()+">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } public int hashCode() { @@ -170,7 +170,7 @@ public class ProcessDefinitionStatistics implements IStatistics { this.allProcessPaths.put(processPath.getActivityDefinitionList(), processPath); } processPath.registerTraversal(); - LogFactory.getLog(ProcessDefinitionStatistics.class).debug("path <"+traversedPath+"> is traversed for the <"+traversedPath.getTraversalCount()+"> time"); //$NON-NLS-1$ //$NON-NLS-2$ + LogFactory.getLog(ProcessDefinitionStatistics.class).debug("path <"+traversedPath+"> is traversed for the <"+traversedPath.getTraversalCount()+"> time"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/CsvStatisticsExporter.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/CsvStatisticsExporter.java index 1e3538a..d89ea32 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/CsvStatisticsExporter.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/CsvStatisticsExporter.java @@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.util.StatisticsFormat; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TreeColumn; @@ -40,7 +40,7 @@ public class CsvStatisticsExporter extends AbstractStatisticsExporter { for (int i=1; i<columns.length; i++) { columnLine += columns[i].getText() + "\t"; //$NON-NLS-1$ if (labelProvider.hasReferenceValues(i)) { - columnLine += Messages.STATISTICS_EXPORT_CSV_REFERENCE_COLUMN_NAME_PREFIX+ columns[i].getText() + "\t"; //$NON-NLS-1$ + columnLine += Simulation_Runtime_Messages.STATISTICS_EXPORT_CSV_REFERENCE_COLUMN_NAME_PREFIX+ columns[i].getText() + "\t"; //$NON-NLS-1$ } } data.prependLine(columnLine); @@ -101,7 +101,7 @@ public class CsvStatisticsExporter extends AbstractStatisticsExporter { for (int i=0; i<columns.length; i++) { columnLine += columns[i].getText() + "\t"; //$NON-NLS-1$ if (labelProvider.hasReferenceValues(i)) { - columnLine += Messages.STATISTICS_EXPORT_CSV_REFERENCE_COLUMN_NAME_PREFIX+ columns[i].getText() + "\t"; //$NON-NLS-1$ + columnLine += Simulation_Runtime_Messages.STATISTICS_EXPORT_CSV_REFERENCE_COLUMN_NAME_PREFIX+ columns[i].getText() + "\t"; //$NON-NLS-1$ } } data.appendLine(columnLine); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/HtmlStatisticsExporter.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/HtmlStatisticsExporter.java index e0bdf55..ea38e2e 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/HtmlStatisticsExporter.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/export/HtmlStatisticsExporter.java @@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.util.StatisticsFormat; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TreeColumn; @@ -35,7 +35,7 @@ public class HtmlStatisticsExporter extends AbstractStatisticsExporter { for (int i=0; i<columns.length; i++) { columnLine += "<th>"+columns[i].getText() + "</th>"; //$NON-NLS-1$ //$NON-NLS-2$ if (labelProvider.hasReferenceValues(i)) { - columnLine += "<th style='color:gray'>"+Messages.STATISTICS_EXPORT_HTML_REFERENCE_COLUMN_NAME_PREFIX+" "+columns[i].getText() + "</th>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + columnLine += "<th style='color:gray'>"+Simulation_Runtime_Messages.STATISTICS_EXPORT_HTML_REFERENCE_COLUMN_NAME_PREFIX+" "+columns[i].getText() + "</th>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } } columnLine += "</tr>"; //$NON-NLS-1$ @@ -97,7 +97,7 @@ public class HtmlStatisticsExporter extends AbstractStatisticsExporter { for (int i=1; i<columns.length; i++) { columnLine += "<th>" + columns[i].getText() + "</th>"; //$NON-NLS-1$ //$NON-NLS-2$ if (labelProvider.hasReferenceValues(i)) { - columnLine += "<th style='color:gray'>"+Messages.STATISTICS_EXPORT_HTML_REFERENCE_COLUMN_NAME_PREFIX+" "+columns[i].getText() + "</th>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + columnLine += "<th style='color:gray'>"+Simulation_Runtime_Messages.STATISTICS_EXPORT_HTML_REFERENCE_COLUMN_NAME_PREFIX+" "+columns[i].getText() + "</th>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } } data.prependLine("<html><body><table>"+columnLine+"</tr>"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/PathHighlighter.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/PathHighlighter.java index b1a0dec..bf78546 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/PathHighlighter.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/PathHighlighter.java @@ -12,6 +12,8 @@ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui; import java.util.Iterator; +import javax.xml.namespace.QName; + import org.eclipse.core.runtime.CoreException; import org.eclipse.stardust.ide.simulation.rt.definition.ActivityDefinition; import org.eclipse.stardust.ide.simulation.rt.definition.TransitionDefinition; @@ -64,16 +66,29 @@ public class PathHighlighter implements SelectionListener { HighlightManager.getDefault().removeAllHighlightables(); } - private void setHighlighted(final ActivityDefinition activity) { - HighlightManager.getDefault().setHighlightState(new IHighlightable() { - public String getProcessDefinitionChildId() { - return activity.getActivityDefinitionModel().getId(); - } + private void setHighlighted(final ActivityDefinition activity) + { + String modelId = activity.getModelId(); + String localActivityId = activity.getActivityDefinitionModel().getId(); + String localProcessId = activity.getProcessDefinition().getProcessDefinitionModel() + .getId(); - public String getProcessDefinitionId() { - return activity.getProcessDefinition().getProcessDefinitionModel().getId(); - }}, HighlightState.BROKEN_LITERAL); - } + final QName fullActivityId = new QName(modelId, localActivityId); + final QName fullProcessId = new QName(modelId, localProcessId); + + HighlightManager.getDefault().setHighlightState(new IHighlightable() + { + public String getProcessDefinitionChildId() + { + return fullActivityId.toString(); + } + + public String getProcessDefinitionId() + { + return fullProcessId.toString(); + } + }, HighlightState.BROKEN_LITERAL); + } private TransitionDefinition getTransition(ActivityDefinition activity1, ActivityDefinition activity2) { for (Iterator itr1 = activity1.getOutTransitionDefinitions().iterator(); itr1.hasNext();) { @@ -87,18 +102,34 @@ public class PathHighlighter implements SelectionListener { return null; } - private void setHighlighted(final ActivityDefinition activity1, final TransitionDefinition transition) { - if (transition == null) - return; + private void setHighlighted(final ActivityDefinition activity, + final TransitionDefinition transition) + { + if (transition == null) + return; - HighlightManager.getDefault().setHighlightState(new IHighlightable() { - public String getProcessDefinitionChildId() { - return transition.getTransitionDefinitionModel().getId(); - } + String activityModelId = activity.getModelId(); + String transitionModelId = transition.getModelId(); - public String getProcessDefinitionId() { - return activity1.getProcessDefinition().getProcessDefinitionModel().getId(); - }}, HighlightState.BROKEN_LITERAL); - } + String localTransitionId = transition.getTransitionDefinitionModel().getId(); + String localProcessId = activity.getProcessDefinition().getProcessDefinitionModel() + .getId(); + + final QName fullTransitionId = new QName(transitionModelId, localTransitionId); + final QName fullProcessId = new QName(activityModelId, localProcessId); + + HighlightManager.getDefault().setHighlightState(new IHighlightable() + { + public String getProcessDefinitionChildId() + { + return fullTransitionId.toString(); + } + + public String getProcessDefinitionId() + { + return fullProcessId.toString(); + } + }, HighlightState.BROKEN_LITERAL); + } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsImages.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsImages.java index b42b63c..58d8469 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsImages.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsImages.java @@ -40,6 +40,6 @@ public class StatisticsImages { public static final Image OVERLAY_UNPIN = ImageDescriptor.createFromFile(StatisticsView.class, "icons/ov_unpin.gif").createImage(); //$NON-NLS-1$ public static final Image OVERLAY_COPY = ImageDescriptor.createFromFile(StatisticsView.class, "icons/ov_copy.gif").createImage(); //$NON-NLS-1$ public static final ImageDescriptor RESTART = ImageDescriptor.createFromFile(StatisticsView.class, "icons/restart.gif"); //$NON-NLS-1$ - public static final ImageDescriptor RETRIEVAL = ImageDescriptor.createFromFile(StatisticsView.class, "icons/retrieval.gif"); + public static final ImageDescriptor RETRIEVAL = ImageDescriptor.createFromFile(StatisticsView.class, "icons/retrieval.gif"); //$NON-NLS-1$ } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsView.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsView.java index c025b2e..9c48c8c 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsView.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/StatisticsView.java @@ -33,8 +33,8 @@ import org.eclipse.stardust.engine.api.model.IApplication; import org.eclipse.stardust.ide.simulation.rt.plugin.SimulationRuntimePlugin; import org.eclipse.stardust.ide.simulation.rt.runtime.ISimulationController; import org.eclipse.stardust.ide.simulation.rt.runtime.ISimulationEventListener; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ResourceStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.SimulationStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.activitytree.ActivityTree; @@ -114,58 +114,58 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener IToolBarManager tbm = getViewSite().getActionBars().getToolBarManager(); - this.startSimulationAction = new Action(Messages.STATISTICS_ACTION_START, StatisticsImages.RUN) { + this.startSimulationAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_START, StatisticsImages.RUN) { public void run() { ILaunchConfigurationType simulationLaunchConfigurationType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType("ag.carnot.bpm.simulation.runtime.launchConfigurationType"); //$NON-NLS-1$ DebugUITools.openLaunchConfigurationDialogOnGroup(parent.getShell(), new TreeSelection(new TreePath(new Object[] {simulationLaunchConfigurationType})), "org.eclipse.debug.ui.launchGroup.run"); //$NON-NLS-1$ } }; - startSimulationAction.setToolTipText(Messages.STATISTICS_ACTION_START_TOOLTIP); + startSimulationAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_START_TOOLTIP); tbm.add(startSimulationAction); - this.restartSimulationAction = new Action(Messages.STATISTICS_ACTION_RESTART, StatisticsImages.RESTART) { + this.restartSimulationAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_RESTART, StatisticsImages.RESTART) { public void run() { SimulationRuntimePlugin.getDefault().getSimulationController().restartSimulation(); } }; - restartSimulationAction.setToolTipText(Messages.STATISTICS_ACTION_RESTART_TOOLTIP); + restartSimulationAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_RESTART_TOOLTIP); tbm.add(restartSimulationAction); - this.repeatRetrievalAction = new Action(Messages.STATISTICS_ACTION_RETRIEVAL, StatisticsImages.RETRIEVAL) { + this.repeatRetrievalAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_RETRIEVAL, StatisticsImages.RETRIEVAL) { public void run() { SimulationRuntimePlugin.getDefault().getSimulationController().repeatRetrieval(); } }; - repeatRetrievalAction.setToolTipText(Messages.STATISTICS_ACTION_RETRIEVAL_TOOLTIP); + repeatRetrievalAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_RETRIEVAL_TOOLTIP); tbm.add(repeatRetrievalAction); - this.stopSimulationAction = new Action(Messages.STATISTICS_ACTION_STOP, StatisticsImages.STOP) { + this.stopSimulationAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_STOP, StatisticsImages.STOP) { public void run() { SimulationRuntimePlugin.getDefault().getSimulationController().stopSimulation(); } }; - stopSimulationAction.setToolTipText(Messages.STATISTICS_ACTION_STOP_TOOLTIP); + stopSimulationAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_STOP_TOOLTIP); tbm.add(stopSimulationAction); - this.pauseSimulationAction = new Action(Messages.STATISTICS_ACTION_PAUSE, StatisticsImages.PAUSE) { + this.pauseSimulationAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_PAUSE, StatisticsImages.PAUSE) { public void run() { SimulationRuntimePlugin.getDefault().getSimulationController().pauseSimulation(); } }; - pauseSimulationAction.setToolTipText(Messages.STATISTICS_ACTION_PAUSE_TOOLTIP); + pauseSimulationAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_PAUSE_TOOLTIP); tbm.add(pauseSimulationAction); - this.resumeSimulationAction = new Action(Messages.STATISTICS_ACTION_RESUME, StatisticsImages.RESUME) { + this.resumeSimulationAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_RESUME, StatisticsImages.RESUME) { public void run() { SimulationRuntimePlugin.getDefault().getSimulationController().resumeSimulation(); } }; - resumeSimulationAction.setToolTipText(Messages.STATISTICS_ACTION_RESUME_TOOLTIP); + resumeSimulationAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_RESUME_TOOLTIP); tbm.add(resumeSimulationAction); tbm.add(new Separator("myGroup2")); //$NON-NLS-1$ - this.toggleOverlaysAction = new Action(Messages.STATISTICS_ACTION_OVERLAYS, Action.AS_CHECK_BOX) { + this.toggleOverlaysAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_OVERLAYS, Action.AS_CHECK_BOX) { public void run() { if (overlayManager.isEnabled()) overlayManager.disableOverlays(); @@ -176,12 +176,12 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener }; toggleOverlaysAction.setChecked(false); toggleOverlaysAction.setImageDescriptor(StatisticsImages.TOGGLE_OVERLAYS); - toggleOverlaysAction.setToolTipText(Messages.STATISTICS_ACTION_OVERLAYS_TOOLTIP); + toggleOverlaysAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_OVERLAYS_TOOLTIP); tbm.add(toggleOverlaysAction); tbm.add(new Separator("myGroup1")); //$NON-NLS-1$ - this.saveAsReferenceStatisticsAction = new Action(Messages.STATISTICS_ACTION_REFERENCE, StatisticsImages.PIN) { + this.saveAsReferenceStatisticsAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_REFERENCE, StatisticsImages.PIN) { public void run() { SimulationStatisticsHistory referenceStatistics = lastSimulationStatistics.getSimulationStatisticsHistory(); activityTree.setReferenceStatistics(referenceStatistics); @@ -194,10 +194,10 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener clearReferenceStatisticsAction.setEnabled(true); } }; - saveAsReferenceStatisticsAction.setToolTipText(Messages.STATISTICS_ACTION_REFERENCE_TOOLTIP); + saveAsReferenceStatisticsAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_REFERENCE_TOOLTIP); tbm.add(saveAsReferenceStatisticsAction); - this.clearReferenceStatisticsAction = new Action(Messages.STATISTICS_ACTION_REFERENCE_CLEAR, StatisticsImages.UNPIN) { + this.clearReferenceStatisticsAction = new Action(Simulation_Runtime_Messages.STATISTICS_ACTION_REFERENCE_CLEAR, StatisticsImages.UNPIN) { public void run() { activityTree.clearReferenceStatistics(); transitionTree.clearReferenceStatistics(); @@ -209,7 +209,7 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener clearReferenceStatisticsAction.setEnabled(false); } }; - clearReferenceStatisticsAction.setToolTipText(Messages.STATISTICS_ACTION_REFERENCE_CLEAR_TOOLTIP); + clearReferenceStatisticsAction.setToolTipText(Simulation_Runtime_Messages.STATISTICS_ACTION_REFERENCE_CLEAR_TOOLTIP); clearReferenceStatisticsAction.setEnabled(false); tbm.add(clearReferenceStatisticsAction); @@ -220,42 +220,42 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener TabItem processDefinitionStatisticsTabItem = new TabItem(tabFolder,SWT.NONE); processDefinitionStatisticsTabItem.setImage(StatisticsImages.PROCESS_DEFINITION); - processDefinitionStatisticsTabItem.setText(Messages.STATISTICS_TAB_PROCESS); + processDefinitionStatisticsTabItem.setText(Simulation_Runtime_Messages.STATISTICS_TAB_PROCESS); this.processTable = new ProcessTable(tabFolder); this.processTable.getTable().addMouseListener(new OpenPropertyPageListener()); processDefinitionStatisticsTabItem.setControl(this.processTable.getTable()); TabItem activityStatisticsTabItem = new TabItem(tabFolder,SWT.NONE); activityStatisticsTabItem.setImage(StatisticsImages.ACTIVITY); - activityStatisticsTabItem.setText(Messages.STATISTICS_TAB_ACTIVITY); + activityStatisticsTabItem.setText(Simulation_Runtime_Messages.STATISTICS_TAB_ACTIVITY); this.activityTree = new ActivityTree(tabFolder); this.activityTree.getTree().addMouseListener(new OpenPropertyPageListener()); activityStatisticsTabItem.setControl(this.activityTree.getTree()); TabItem transitionStatisticsTabItem = new TabItem(tabFolder,SWT.NONE); transitionStatisticsTabItem.setImage(StatisticsImages.TRANSITION); - transitionStatisticsTabItem.setText(Messages.STATISTICS_TAB_TRANSITION); + transitionStatisticsTabItem.setText(Simulation_Runtime_Messages.STATISTICS_TAB_TRANSITION); this.transitionTree = new TransitionTree(tabFolder); this.transitionTree.getTree().addMouseListener(new OpenPropertyPageListener()); transitionStatisticsTabItem.setControl(this.transitionTree.getTree()); TabItem participantStatisticsTabItem = new TabItem(tabFolder,SWT.NONE); participantStatisticsTabItem.setImage(StatisticsImages.PARTICIPANTS); - participantStatisticsTabItem.setText(Messages.STATISTICS_TAB_PARTICIPANT); + participantStatisticsTabItem.setText(Simulation_Runtime_Messages.STATISTICS_TAB_PARTICIPANT); this.participantTable = new ResourceTable(tabFolder); this.participantTable.getTable().addMouseListener(new OpenPropertyPageListener()); participantStatisticsTabItem.setControl(this.participantTable.getTable()); TabItem applicationStatisticsTabItem = new TabItem(tabFolder,SWT.NONE); applicationStatisticsTabItem.setImage(StatisticsImages.APPLICATION); - applicationStatisticsTabItem.setText(Messages.STATISTICS_TAB_APPLICATION); + applicationStatisticsTabItem.setText(Simulation_Runtime_Messages.STATISTICS_TAB_APPLICATION); this.applicationTable = new ResourceTable(tabFolder); this.applicationTable.getTable().addMouseListener(new OpenPropertyPageListener()); applicationStatisticsTabItem.setControl(this.applicationTable.getTable()); TabItem cpTabItem = new TabItem(tabFolder,SWT.NONE); cpTabItem.setImage(StatisticsImages.CRITICAL_PATH); - cpTabItem.setText(Messages.STATISTICS_TAB_PROCESS_PATH); + cpTabItem.setText(Simulation_Runtime_Messages.STATISTICS_TAB_PROCESS_PATH); this.cpTree = new CpTree(tabFolder); this.cpTree.getTree().addSelectionListener(new PathHighlighter()); this.cpTree.getTree().addMouseListener(new OpenPropertyPageListener()); @@ -270,13 +270,13 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener statusTextPanel.setLayout(new GridLayout(2, false)); Label simulationProgressLabel = new Label(statusTextPanel, SWT.LEFT); - simulationProgressLabel.setText(Messages.STATISTICS_LABEL_SIMULATION_PROGRESS); + simulationProgressLabel.setText(Simulation_Runtime_Messages.STATISTICS_LABEL_SIMULATION_PROGRESS); statusLabel = new Label(statusTextPanel, SWT.LEFT); statusLabel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); Label startTimeLabel = new Label(timePanel, SWT.RIGHT); - startTimeLabel.setText(Messages.STATISTICS_LABEL_START_TIME); + startTimeLabel.setText(Simulation_Runtime_Messages.STATISTICS_LABEL_START_TIME); this.startTime = new Label(timePanel, SWT.RIGHT | SWT.SHADOW_ETCHED_IN); this.startTime.setText("0000-00-00 00:00:00"); //$NON-NLS-1$ @@ -348,7 +348,7 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener }); Label currentTimeLabel = new Label(timePanel, SWT.RIGHT); - currentTimeLabel.setText(Messages.STATISTICS_LABEL_CURRENT_TIME); + currentTimeLabel.setText(Simulation_Runtime_Messages.STATISTICS_LABEL_CURRENT_TIME); this.currentTime = new Label(timePanel, SWT.RIGHT | SWT.SHADOW_ETCHED_IN); this.currentTime.setText("0000-00-00 00:00:00"); //$NON-NLS-1$ @@ -356,7 +356,7 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener modelNameLabel.setText(" "); //$NON-NLS-1$ Label endTimeLabel = new Label(timePanel, SWT.RIGHT); - endTimeLabel.setText(Messages.STATISTICS_LABEL_END_TIME); + endTimeLabel.setText(Simulation_Runtime_Messages.STATISTICS_LABEL_END_TIME); this.endTime = new Label(timePanel, SWT.RIGHT | SWT.SHADOW_ETCHED_IN); this.endTime.setText("0000-00-00 00:00:00"); //$NON-NLS-1$ @@ -432,7 +432,7 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener } private String formatTime (long time) { - return new SimpleDateFormat(Messages.STATISTICS_MODEL_TIME_FORMAT).format(new Date(time)); + return new SimpleDateFormat(Simulation_Runtime_Messages.STATISTICS_MODEL_TIME_FORMAT).format(new Date(time)); } public void setFocus() { @@ -508,15 +508,15 @@ public class StatisticsView extends ViewPart implements ISimulationEventListener private void updateStatusField (String simulationState) { if (simulationState.equals(ISimulationController.STATE_PAUSED)) { - statusLabel.setText(Messages.STATISTICS_STATE_PAUSED); + statusLabel.setText(Simulation_Runtime_Messages.STATISTICS_STATE_PAUSED); } else if (simulationState.equals(ISimulationController.STATE_RUNNING)) { if (lastSimulationStatistics == null) { - statusLabel.setText(Messages.STATISTICS_STATE_INITIALIZING); + statusLabel.setText(Simulation_Runtime_Messages.STATISTICS_STATE_INITIALIZING); } else { - statusLabel.setText(Messages.STATISTICS_STATE_RUNNING); + statusLabel.setText(Simulation_Runtime_Messages.STATISTICS_STATE_RUNNING); } } else if (simulationState.equals(ISimulationController.STATE_STOPPED)) { - statusLabel.setText(Messages.STATISTICS_STATE_STOPPED); + statusLabel.setText(Simulation_Runtime_Messages.STATISTICS_STATE_STOPPED); } else { throw new RuntimeException("Simulation state <"+simulationState+"> not supported"); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTree.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTree.java index a9cb2ab..342513b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTree.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTree.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ActivityStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.StatisticsExporterFactory; @@ -45,7 +45,7 @@ public class ActivityTree { tree.setHeaderVisible(true); TreeColumn activityNameColumn = new TreeColumn(tree,SWT.LEFT); - activityNameColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_ACTIVITY); + activityNameColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_ACTIVITY); activityNameColumn.setWidth(250); activityNameColumn.setMoveable(true); TreeColumnSorter cSorter = new ActivityBaseTreeColumnSorter(treeViewer, activityNameColumn) { @@ -56,7 +56,7 @@ public class ActivityTree { cSorter.setSorter(cSorter, TableColumnSorter.ASC); TreeColumn totalInstancesColumn = new TreeColumn(tree,SWT.RIGHT); - totalInstancesColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_TOTAL_INSTANCES); + totalInstancesColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_TOTAL_INSTANCES); totalInstancesColumn.setWidth(100); totalInstancesColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, totalInstancesColumn) { @@ -66,7 +66,7 @@ public class ActivityTree { }; TreeColumn averageSuspendedTime = new TreeColumn(tree,SWT.RIGHT); - averageSuspendedTime.setText(Messages.STATISTICS_ACTIVITY_COLUMN_AVG_WAIT_TIME); + averageSuspendedTime.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_AVG_WAIT_TIME); averageSuspendedTime.setWidth(150); averageSuspendedTime.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, averageSuspendedTime) { @@ -76,7 +76,7 @@ public class ActivityTree { }; TreeColumn maxSuspendedTime = new TreeColumn(tree,SWT.RIGHT); - maxSuspendedTime.setText(Messages.STATISTICS_ACTIVITY_COLUMN_MAX_WAIT_TIME); + maxSuspendedTime.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_MAX_WAIT_TIME); maxSuspendedTime.setWidth(150); maxSuspendedTime.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, maxSuspendedTime) { @@ -86,7 +86,7 @@ public class ActivityTree { }; TreeColumn averageDurationColumn = new TreeColumn(tree,SWT.RIGHT); - averageDurationColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_AVG_EXECUTION_DURATION); + averageDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_AVG_EXECUTION_DURATION); averageDurationColumn.setWidth(150); averageDurationColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, averageDurationColumn) { @@ -96,7 +96,7 @@ public class ActivityTree { }; TreeColumn minDurationColumn = new TreeColumn(tree,SWT.RIGHT); - minDurationColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_MIN_EXECUTION_DURATION); + minDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_MIN_EXECUTION_DURATION); minDurationColumn.setWidth(150); minDurationColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, minDurationColumn) { @@ -106,7 +106,7 @@ public class ActivityTree { }; TreeColumn maxDurationColumn = new TreeColumn(tree,SWT.RIGHT); - maxDurationColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_MAX_EXECUTION_DURATION); + maxDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_MAX_EXECUTION_DURATION); maxDurationColumn.setWidth(150); maxDurationColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, maxDurationColumn) { @@ -116,7 +116,7 @@ public class ActivityTree { }; TreeColumn averageTotalColumn = new TreeColumn(tree,SWT.RIGHT); - averageTotalColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_AVG_TOTAL_TIME); + averageTotalColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_AVG_TOTAL_TIME); averageTotalColumn.setWidth(150); averageTotalColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, averageTotalColumn) { @@ -126,7 +126,7 @@ public class ActivityTree { }; TreeColumn minTotalColumn = new TreeColumn(tree,SWT.RIGHT); - minTotalColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_MIN_TOTAL_TIME); + minTotalColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_MIN_TOTAL_TIME); minTotalColumn.setWidth(150); minTotalColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, minTotalColumn) { @@ -136,7 +136,7 @@ public class ActivityTree { }; TreeColumn maxTotalColumn = new TreeColumn(tree,SWT.RIGHT); - maxTotalColumn.setText(Messages.STATISTICS_ACTIVITY_COLUMN_MAX_TOTAL_TIME); + maxTotalColumn.setText(Simulation_Runtime_Messages.STATISTICS_ACTIVITY_COLUMN_MAX_TOTAL_TIME); maxTotalColumn.setWidth(150); maxTotalColumn.setMoveable(true); new ActivityBaseTreeColumnSorter(treeViewer, maxTotalColumn) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTreeLabelProvider.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTreeLabelProvider.java index 9e426fe..5994bf5 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTreeLabelProvider.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/activitytree/ActivityTreeLabelProvider.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.stardust.engine.api.model.ImplementationType; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ActivityStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.IExportableTableLabelProvider; @@ -92,7 +92,7 @@ public class ActivityTreeLabelProvider implements ITableLabelProvider, IExportab private void mergeNumbers(String[] numbers, String[] oldNumbers) { for (int i=1; i<numbers.length; i++) { - numbers[i] = numbers[i]+Messages.STATISTICS_ACTIVITY_REFERENCE_VALUE_START+oldNumbers[i]+Messages.STATISTICS_ACTIVITY_REFERENCE_VALUE_END; + numbers[i] = numbers[i]+Simulation_Runtime_Messages.STATISTICS_ACTIVITY_REFERENCE_VALUE_START+oldNumbers[i]+Simulation_Runtime_Messages.STATISTICS_ACTIVITY_REFERENCE_VALUE_END; } } @@ -103,7 +103,7 @@ public class ActivityTreeLabelProvider implements ITableLabelProvider, IExportab if (processDefinitionStatistics == null) { activityLabel = activityStatistics.getActivityDefinition().getActivityDefinitionModel().getName(); } else { - activityLabel = activityStatistics.getActivityDefinition().getActivityDefinitionModel().getName()+Messages.STATISTICS_ACTIVITY_SUBPROCESS_SUFFIX; + activityLabel = activityStatistics.getActivityDefinition().getActivityDefinitionModel().getName()+Simulation_Runtime_Messages.STATISTICS_ACTIVITY_SUBPROCESS_SUFFIX; } if (activityStatistics.getTotalCompletedCount() == 0) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTree.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTree.java index 0159bf9..a584da0 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTree.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTree.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessPath; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.StatisticsExporterFactory; @@ -45,7 +45,7 @@ public class CpTree { tree.setHeaderVisible(true); TreeColumn cpDurationColumn = new TreeColumn(tree,SWT.RIGHT); - cpDurationColumn.setText(Messages.STATISTICS_PROCESS_PATH_COLUMN_DURATION); + cpDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_PATH_COLUMN_DURATION); cpDurationColumn.setWidth(180); cpDurationColumn.setMoveable(true); TreeColumnSorter cSorter = new CpBaseTreeColumnSorter(treeViewer, cpDurationColumn, false) { @@ -56,7 +56,7 @@ public class CpTree { cSorter.setSorter(cSorter, TableColumnSorter.DESC); TreeColumn cpTraversalCountColumn = new TreeColumn(tree,SWT.RIGHT); - cpTraversalCountColumn.setText(Messages.STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_COUNT); + cpTraversalCountColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_COUNT); cpTraversalCountColumn.setWidth(120); cpTraversalCountColumn.setMoveable(true); new CpBaseTreeColumnSorter(treeViewer, cpTraversalCountColumn, true) { @@ -66,7 +66,7 @@ public class CpTree { }; TreeColumn cpTraversalRateColumn = new TreeColumn(tree,SWT.RIGHT); - cpTraversalRateColumn.setText(Messages.STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_RATE); + cpTraversalRateColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_PATH_COLUMN_TRAVERSAL_RATE); cpTraversalRateColumn.setWidth(120); cpTraversalRateColumn.setMoveable(true); new CpBaseTreeColumnSorter(treeViewer, cpTraversalRateColumn, true) { @@ -76,7 +76,7 @@ public class CpTree { }; TreeColumn cpActivitiesColumn = new TreeColumn(tree,SWT.LEFT); - cpActivitiesColumn.setText(Messages.STATISTICS_PROCESS_PATH_COLUMN_ACTIVITIES); + cpActivitiesColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_PATH_COLUMN_ACTIVITIES); cpActivitiesColumn.setWidth(500); cpActivitiesColumn.setMoveable(true); new CpBaseTreeColumnSorter(treeViewer, cpActivitiesColumn, true) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTreeLabelProvider.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTreeLabelProvider.java index a609980..cc00156 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTreeLabelProvider.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/cptree/CpTreeLabelProvider.java @@ -17,7 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessPath; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.IExportableTableLabelProvider; @@ -80,7 +80,7 @@ public class CpTreeLabelProvider implements ITableLabelProvider, IExportableTabl private void mergeNumbers(String[] numbers, String[] oldNumbers) { for (int i=0; i<3; i++) { - numbers[i] = numbers[i]+Messages.STATISTICS_PROCESS_PATH_REFERENCE_VALUE_START+oldNumbers[i]+Messages.STATISTICS_PROCESS_PATH_REFERENCE_VALUE_END; + numbers[i] = numbers[i]+Simulation_Runtime_Messages.STATISTICS_PROCESS_PATH_REFERENCE_VALUE_START+oldNumbers[i]+Simulation_Runtime_Messages.STATISTICS_PROCESS_PATH_REFERENCE_VALUE_END; } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlay.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlay.java index 216b25f..9a3cf26 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlay.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlay.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.MarginBorder; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.draw2d.ColoredLabel; import org.eclipse.stardust.ide.simulation.ui.curves.drawing.Configuration; @@ -30,10 +30,10 @@ public class ActivityOverlay extends ModelElementOverlayWithCurves { result.setFont(getConfiguration().getTextFontObject()); result.setBorder(new MarginBorder(5)); result.addTextLine(data.getToolTipHeadline()); - result.addText(getConfiguration().getCurveColorObject(1), Messages.OVERLAYS_CURVE); - result.addTextLine(ColorConstants.black, " - " + Messages.OVERLAYS_SUSPEND_TIME); //$NON-NLS-1$ - result.addText(getConfiguration().getCurveColorObject(2), Messages.OVERLAYS_CURVE); - result.addTextLine(ColorConstants.black, " - " + Messages.OVERLAYS_ACTIVATE_TIME); //$NON-NLS-1$ + result.addText(getConfiguration().getCurveColorObject(1), Simulation_Runtime_Messages.OVERLAYS_CURVE); + result.addTextLine(ColorConstants.black, " - " + Simulation_Runtime_Messages.OVERLAYS_SUSPEND_TIME); //$NON-NLS-1$ + result.addText(getConfiguration().getCurveColorObject(2), Simulation_Runtime_Messages.OVERLAYS_CURVE); + result.addTextLine(ColorConstants.black, " - " + Simulation_Runtime_Messages.OVERLAYS_ACTIVATE_TIME); //$NON-NLS-1$ return result; } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlayData.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlayData.java index e9ef6eb..832355b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlayData.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ActivityOverlayData.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; import java.util.ArrayList; import java.util.List; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ActivityStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.history.SimulationStatisticsHistoryEntry; @@ -36,15 +36,15 @@ public class ActivityOverlayData extends ModelElementOverlayWithCurvesData { // values String[] avgTimeValue = { - Messages.OVERLAYS_TOTAL_TIME, + Simulation_Runtime_Messages.OVERLAYS_TOTAL_TIME, OverlayConstants.VALUE_SEPARATOR, OverlayConstants.VALUE_EMPTY}; String[] avgSuspendTimeValue = { - Messages.OVERLAYS_SUSPEND_TIME, + Simulation_Runtime_Messages.OVERLAYS_SUSPEND_TIME, OverlayConstants.VALUE_SEPARATOR, OverlayConstants.VALUE_EMPTY}; String[] avgActivationTimeValue = { - Messages.OVERLAYS_ACTIVATE_TIME, + Simulation_Runtime_Messages.OVERLAYS_ACTIVATE_TIME, OverlayConstants.VALUE_SEPARATOR, OverlayConstants.VALUE_EMPTY}; @@ -123,6 +123,6 @@ public class ActivityOverlayData extends ModelElementOverlayWithCurvesData { } public String getToolTipHeadline() { - return Messages.OVERLAY_ACTIVITY_ACTIVITY_PREFIX + identifiable.getName(); + return Simulation_Runtime_Messages.OVERLAY_ACTIVITY_ACTIVITY_PREFIX + identifiable.getName(); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ApplicationOverlayData.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ApplicationOverlayData.java index 9ea3357..7e65deb 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ApplicationOverlayData.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ApplicationOverlayData.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; import java.util.ArrayList; import java.util.List; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.drawing.Layer; import org.eclipse.stardust.ide.simulation.ui.curves.layers.HorizontalMarkerLayer; import org.eclipse.stardust.ide.simulation.ui.curves.layers.StrokedCurveLayer; @@ -27,11 +27,11 @@ public class ApplicationOverlayData extends ResourceOverlayData { } public String getMeasureName() { - return Messages.OVERLAY_APPLICATION_QUEUE_LENGTH; + return Simulation_Runtime_Messages.OVERLAY_APPLICATION_QUEUE_LENGTH; } public String getToolTipHeadline() { - return Messages.OVERLAY_APPLICATION_APPLICATION_PREFIX + identifiable.getName(); + return Simulation_Runtime_Messages.OVERLAY_APPLICATION_APPLICATION_PREFIX + identifiable.getName(); } public Layer[] getCurveDrawings() { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlay.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlay.java index 4134fd3..2c574ba 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlay.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlay.java @@ -17,52 +17,67 @@ import org.eclipse.stardust.ide.simulation.ui.curves.draw2d.AbstractOverlayFigur import org.eclipse.stardust.ide.simulation.ui.curves.drawing.Configuration; -public abstract class ModelElementOverlay - extends AbstractOverlayFigure implements ModelElementOverlayDataListener { +public abstract class ModelElementOverlay extends AbstractOverlayFigure + implements ModelElementOverlayDataListener +{ - ModelOverlaySet parent; - ModelElementOverlayData data; + ModelOverlaySet parent; - public ModelElementOverlay(Configuration configuration, ModelOverlaySet parent, ModelElementOverlayData data) { - super(configuration); - this.parent = parent; - this.data = data; - } + ModelElementOverlayData data; - public Configuration getConfiguration() { - return parent.getConfiguration(); - } + public ModelElementOverlay(Configuration configuration, ModelOverlaySet parent, + ModelElementOverlayData data) + { + super(configuration); + this.parent = parent; + this.data = data; + } - public boolean isOverlaysEnabled() { - return parent.isEnabled(); - } + public Configuration getConfiguration() + { + return parent.getConfiguration(); + } - public boolean containsPoint(int x, int y) { - Point pt = new Point(x, y); - translateFromParent(pt); - for (int i = 0; i < getChildren().size(); i++) { - IFigure child = (IFigure)getChildren().get(i); - if (child.containsPoint(pt.x, pt.y)) - return true; - } - return false; - } + public boolean isOverlaysEnabled() + { + return parent.isEnabled(); + } - - public void paint(Graphics graphics) { - if (isOverlaysEnabled()) - super.paint(graphics); - } + public boolean containsPoint(int x, int y) + { + Point pt = new Point(x, y); + translateFromParent(pt); + for (int i = 0; i < getChildren().size(); i++) + { + IFigure child = (IFigure) getChildren().get(i); + if (child.containsPoint(pt.x, pt.y)) + return true; + } + return false; + } - public void notifyDataChanged() { - invalidateTree(); - } + public void paint(Graphics graphics) + { + if (isOverlaysEnabled()) + super.paint(graphics); + } - public void executeRepaint() { - repaint(); - } + public void notifyDataChanged() + { + invalidateTree(); + } - public ModelElementOverlayData getOverlayData() { - return data; - } + public void executeRepaint() + { + //only repaint when the overlays are shown + if (parent.getOverlayManager().isEnabled()) + { + repaint(); + } + } + + public ModelElementOverlayData getOverlayData() + { + return data; + } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayData.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayData.java index 49526f3..9716d0d 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayData.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayData.java @@ -18,44 +18,54 @@ import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.history.Simulat import org.eclipse.stardust.model.xpdl.carnot.IIdentifiableElement; -public abstract class ModelElementOverlayData { - - public abstract void reset(); - public abstract void update(int historyIndex, long offset, SimulationStatisticsHistoryEntry entry); - public abstract void updatePosition(long timeOffset, SimulationStatisticsHistoryEntry entry); - - public abstract String getToolTipHeadline(); - public abstract String[][] getValueHolders(); - - IIdentifiableElement identifiable; - List listeners = new ArrayList(); - boolean needRepaint; - - public ModelElementOverlayData(IIdentifiableElement identifiable) { - this.identifiable = identifiable; - } - - public void addListener(ModelElementOverlayDataListener listener) { - listeners.add(listener); - } - - public void removeListener(ModelElementOverlayDataListener listener) { - listeners.remove(listener); - } - - protected void fireDataChanged() { - for (Iterator itr = listeners.iterator(); itr.hasNext();) { - ((ModelElementOverlayDataListener) itr.next()).notifyDataChanged(); - } - needRepaint = true; - } - - protected void fireRepaint() { - if (needRepaint) { - needRepaint = false; - for (Iterator itr = listeners.iterator(); itr.hasNext();) { - ((ModelElementOverlayDataListener) itr.next()).executeRepaint(); - } - } - } +public abstract class ModelElementOverlayData +{ + + public abstract void reset(); + + public abstract void update(int historyIndex, long offset, + SimulationStatisticsHistoryEntry entry); + + public abstract void updatePosition(long timeOffset, + SimulationStatisticsHistoryEntry entry); + + public abstract String getToolTipHeadline(); + + public abstract String[][] getValueHolders(); + + IIdentifiableElement identifiable; + + List listeners = new ArrayList(); + + public ModelElementOverlayData(IIdentifiableElement identifiable) + { + this.identifiable = identifiable; + } + + public void addListener(ModelElementOverlayDataListener listener) + { + listeners.add(listener); + } + + public void removeListener(ModelElementOverlayDataListener listener) + { + listeners.remove(listener); + } + + protected void fireDataChanged() + { + for (Iterator itr = listeners.iterator(); itr.hasNext();) + { + ((ModelElementOverlayDataListener) itr.next()).notifyDataChanged(); + } + } + + protected void fireRepaint() + { + for (Iterator itr = listeners.iterator(); itr.hasNext();) + { + ((ModelElementOverlayDataListener) itr.next()).executeRepaint(); + } + } + } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayWithCurves.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayWithCurves.java index 6083b08..e276b9a 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayWithCurves.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelElementOverlayWithCurves.java @@ -17,7 +17,7 @@ import org.eclipse.draw2d.MouseEvent; import org.eclipse.draw2d.MouseListener; import org.eclipse.draw2d.ToolbarLayout; import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.StatisticsImages; import org.eclipse.stardust.ide.simulation.ui.curves.draw2d.CurveFigure; import org.eclipse.stardust.ide.simulation.ui.curves.draw2d.FigureUtility; @@ -70,7 +70,7 @@ public abstract class ModelElementOverlayWithCurves extends ModelElementOverlay buttons.setLayoutManager(layout); Label copy = new Label(StatisticsImages.OVERLAY_COPY); - copy.setToolTip(new Label(Messages.OVERLAYS_TOOLTIP_COPY)); + copy.setToolTip(new Label(Simulation_Runtime_Messages.OVERLAYS_TOOLTIP_COPY)); buttons.add(copy); copy.addMouseListener(new MouseListener.Stub() { public void mousePressed(MouseEvent me) { @@ -87,13 +87,13 @@ public abstract class ModelElementOverlayWithCurves extends ModelElementOverlay info.setToolTip(createToolTipFigure()); final Label pin = new Label(StatisticsImages.OVERLAY_PIN); - pin.setToolTip(new Label(Messages.OVERLAYS_TOOLTIP_PIN)); + pin.setToolTip(new Label(Simulation_Runtime_Messages.OVERLAYS_TOOLTIP_PIN)); buttons.add(pin); pin.addMouseListener(new MouseListener.Stub() { public void mousePressed(MouseEvent me) { zoomSwitch.setPin(!zoomSwitch.isPin()); pin.setIcon(zoomSwitch.isPin() ? StatisticsImages.OVERLAY_UNPIN : StatisticsImages.OVERLAY_PIN); - pin.setToolTip(new Label(zoomSwitch.isPin() ? Messages.OVERLAYS_TOOLTIP_UNPIN : Messages.OVERLAYS_TOOLTIP_PIN)); + pin.setToolTip(new Label(zoomSwitch.isPin() ? Simulation_Runtime_Messages.OVERLAYS_TOOLTIP_UNPIN : Simulation_Runtime_Messages.OVERLAYS_TOOLTIP_PIN)); } }); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelOverlaySet.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelOverlaySet.java index 2e4adad..29e2eb3 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelOverlaySet.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ModelOverlaySet.java @@ -30,8 +30,8 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.stardust.ide.simulation.rt.plugin.SimulationRuntimePlugin; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.SimulationStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.history.SimulationStatisticsHistoryEntry; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.drawing.Configuration; import org.eclipse.stardust.model.xpdl.carnot.ActivitySymbolType; import org.eclipse.stardust.model.xpdl.carnot.ApplicationSymbolType; @@ -45,181 +45,237 @@ import org.eclipse.stardust.modeling.core.decoration.IDecorationProvider; import org.eclipse.swt.widgets.Display; -public class ModelOverlaySet implements IDecorationProvider { - - OverlayManager parent; - Map overlayData = new HashMap(); - int knownHistorySize = 0; - - public ModelOverlaySet(OverlayManager overlayManager) { - this.parent = overlayManager; - } - - public Configuration getConfiguration() { - return parent.getConfiguration(); - } - - public boolean isEnabled() { - return parent.isEnabled(); - } - - public String getId() { - return ModelOverlaySet.class.getName(); - } - - public boolean updateIncremental(SimulationStatistics statistics) { - synchronized (this) { - List history = statistics.getSimulationStatisticsHistory().getHistory(); - if (history.size() > knownHistorySize) { - for (int i = knownHistorySize; i < history.size(); i++) { - SimulationStatisticsHistoryEntry entry = (SimulationStatisticsHistoryEntry) history.get(i); - for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) { - ((ModelElementOverlayData)itr.next()).update(i, statistics.getStartTime(), entry); - } - } - return true; - } - return false; - } - } - - public boolean updatePosition(long offset, SimulationStatisticsHistoryEntry entry) { - synchronized (this) { - for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) { - ((ModelElementOverlayData)itr.next()).updatePosition(offset, entry); - } - return true; - } - } - - public boolean resetOverlays() { - synchronized (this) { - knownHistorySize = 0; - for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) { - ((ModelElementOverlayData)itr.next()).reset(); - } - } - return true; - } - - public void fireRepaintAllChanged() { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) { - ((ModelElementOverlayData)itr.next()).fireRepaint(); - } - } - }); - - } - - public IFigure createDecoration(INodeSymbol inodesymbol) { - - IIdentifiableModelElement element = null; - ModelElementOverlayData data = null; - ModelElementOverlay decoration = null; - if (inodesymbol instanceof IModelParticipantSymbol) { - element = ((IModelParticipantSymbol) inodesymbol).getModelElement(); - data = (ModelElementOverlayData) overlayData.get(element.getId()); - if (data == null) - overlayData.put(element.getId(), data = new ParticipantOverlayData(element)); - decoration = new ParticipantOverlay(getConfiguration(), this, data); - } - else if (inodesymbol instanceof ApplicationSymbolType) { - element = ((ApplicationSymbolType) inodesymbol).getModelElement(); - data = (ModelElementOverlayData) overlayData.get(element.getId()); - if (data == null) - overlayData.put(element.getId(), data = new ApplicationOverlayData(element)); - decoration = new ApplicationOverlay(getConfiguration(), this, data); - } - else if (inodesymbol instanceof ActivitySymbolType) { - element = ((ActivitySymbolType) inodesymbol).getModelElement(); - data = (ModelElementOverlayData) overlayData.get(element.getId()); - if (data == null) - overlayData.put(element.getId(), data = new ActivityOverlayData(element)); - decoration = new ActivityOverlay(getConfiguration(), this, data); - } - - if (element != null && data != null) - { - overlayData.put(element.getId(), data); - if (decoration != null) - data.addListener(decoration); - } - return decoration; - } - - public Locator createDecorationLocator(INodeSymbol node, IFigure nodeFigure, IFigure decorationFigure) { - return new RelativeLocator(nodeFigure, PositionConstants.NORTH_EAST) { - protected Rectangle getReferenceBox() { - return new Rectangle(super.getReferenceBox()).expand(new Insets(-60, 0, 0, 105)); - } - }; - } - - public IFigure createDecoration(IConnectionSymbol connection) { - - try { - if( !(connection instanceof TransitionConnectionType) ) - return null; - - TransitionConnectionType transitionConnection = (TransitionConnectionType)connection; -// if( !(transitionConnection.getSourceActivitySymbol() instanceof GatewaySymbol) ) -// return null; - - if( transitionConnection.getTransition() == null ) - return null; - - ModelElementOverlayData data = (ModelElementOverlayData) overlayData.get(transitionConnection.getTransition().getId()); - if (data == null) - overlayData.put(transitionConnection.getTransition().getId(), data = new TransitionOverlayData(transitionConnection)); - - TransitionOverlay decoration = new TransitionOverlay(getConfiguration(), this, data); - if (decoration != null) - data.addListener(decoration); - - return decoration; - } catch (RuntimeException e) { - SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, - SimulationRuntimePlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_INITIALIZING_OVERLAY, e )); - return null; - } - } - - public ConnectionLocator createDecorationLocator(IConnectionSymbol connection, Connection connectionFigure, IFigure decorationFigure) { - - try { - if( !(connection instanceof TransitionConnectionType) ) - return null; - - TransitionConnectionType transitionConnection = (TransitionConnectionType)connection; - if( !(transitionConnection.getSourceActivitySymbol() instanceof GatewaySymbol) ) - return null; - - int size = connectionFigure.getPoints().size(); - if (size % 2 == 0) - return new MidpointLocator(connectionFigure, (size / 2) - 1); - else - return new BendpointLocator(connectionFigure, size / 2); - } catch (RuntimeException e) { - SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, - SimulationRuntimePlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_INITIALIZING_OVERLAY, e )); - return null; - } - } - - public void decorationRemoved(INodeSymbol node, IFigure figure) - { - ModelElementOverlay overlay = (ModelElementOverlay) figure; - overlay.getOverlayData().removeListener(overlay); - } - - public void decorationRemoved(IConnectionSymbol connection, IFigure figure) - { - ModelElementOverlay overlay = (ModelElementOverlay) figure; - overlay.getOverlayData().removeListener(overlay); - } +public class ModelOverlaySet implements IDecorationProvider +{ + OverlayManager parent; + + Map overlayData = new HashMap(); + + int knownHistorySize = 0; + + public ModelOverlaySet(OverlayManager overlayManager) + { + this.parent = overlayManager; + } + + public Configuration getConfiguration() + { + return parent.getConfiguration(); + } + + public boolean isEnabled() + { + return parent.isEnabled(); + } + + public String getId() + { + return ModelOverlaySet.class.getName(); + } + + public boolean updateIncremental(SimulationStatistics statistics) + { + synchronized (this) + { + List history = statistics.getSimulationStatisticsHistory().getHistory(); + if (history.size() > knownHistorySize) + { + for (int i = knownHistorySize; i < history.size(); i++) + { + SimulationStatisticsHistoryEntry entry = (SimulationStatisticsHistoryEntry) history + .get(i); + for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) + { + ((ModelElementOverlayData) itr.next()).update(i, + statistics.getStartTime(), entry); + } + } + return true; + } + return false; + } + } + + public boolean updatePosition(long offset, SimulationStatisticsHistoryEntry entry) + { + synchronized (this) + { + for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) + { + ((ModelElementOverlayData) itr.next()).updatePosition(offset, entry); + } + return true; + } + } + + public boolean resetOverlays() + { + synchronized (this) + { + knownHistorySize = 0; + for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) + { + ((ModelElementOverlayData) itr.next()).reset(); + } + } + return true; + } + + public void fireRepaintAllChanged() + { + Display.getDefault().asyncExec(new Runnable() + { + public void run() + { + for (Iterator itr = overlayData.values().iterator(); itr.hasNext();) + { + ((ModelElementOverlayData) itr.next()).fireRepaint(); + } + } + }); + + } + + public IFigure createDecoration(INodeSymbol inodesymbol) + { + + IIdentifiableModelElement element = null; + ModelElementOverlayData data = null; + ModelElementOverlay decoration = null; + if (inodesymbol instanceof IModelParticipantSymbol) + { + element = ((IModelParticipantSymbol) inodesymbol).getModelElement(); + data = (ModelElementOverlayData) overlayData.get(element.getId()); + if (data == null) + overlayData.put(element.getId(), data = new ParticipantOverlayData(element)); + decoration = new ParticipantOverlay(getConfiguration(), this, data); + } + else if (inodesymbol instanceof ApplicationSymbolType) + { + element = ((ApplicationSymbolType) inodesymbol).getModelElement(); + data = (ModelElementOverlayData) overlayData.get(element.getId()); + if (data == null) + overlayData.put(element.getId(), data = new ApplicationOverlayData(element)); + decoration = new ApplicationOverlay(getConfiguration(), this, data); + } + else if (inodesymbol instanceof ActivitySymbolType) + { + element = ((ActivitySymbolType) inodesymbol).getModelElement(); + data = (ModelElementOverlayData) overlayData.get(element.getId()); + if (data == null) + overlayData.put(element.getId(), data = new ActivityOverlayData(element)); + decoration = new ActivityOverlay(getConfiguration(), this, data); + } + + if (element != null && data != null) + { + overlayData.put(element.getId(), data); + if (decoration != null) + data.addListener(decoration); + } + return decoration; + } + + public Locator createDecorationLocator(INodeSymbol node, IFigure nodeFigure, + IFigure decorationFigure) + { + return new RelativeLocator(nodeFigure, PositionConstants.NORTH_EAST) + { + protected Rectangle getReferenceBox() + { + return new Rectangle(super.getReferenceBox()).expand(new Insets(-60, 0, 0, + 105)); + } + }; + } + + public IFigure createDecoration(IConnectionSymbol connection) + { + + try + { + if (!(connection instanceof TransitionConnectionType)) + return null; + + TransitionConnectionType transitionConnection = (TransitionConnectionType) connection; + // if( !(transitionConnection.getSourceActivitySymbol() instanceof GatewaySymbol) + // ) + // return null; + + if (transitionConnection.getTransition() == null) + return null; + + ModelElementOverlayData data = (ModelElementOverlayData) overlayData + .get(transitionConnection.getTransition().getId()); + if (data == null) + overlayData.put(transitionConnection.getTransition().getId(), + data = new TransitionOverlayData(transitionConnection)); + + TransitionOverlay decoration = new TransitionOverlay(getConfiguration(), this, + data); + if (decoration != null) + data.addListener(decoration); + + return decoration; + } + catch (RuntimeException e) + { + SimulationPlugin + .getDefault() + .getLog() + .log(new Status(IStatus.WARNING, SimulationRuntimePlugin.getDefault() + .getBundle().getSymbolicName(), IStatus.OK, + Simulation_Modeling_Messages.ERROR_INITIALIZING_OVERLAY, e)); + return null; + } + } + + public ConnectionLocator createDecorationLocator(IConnectionSymbol connection, + Connection connectionFigure, IFigure decorationFigure) + { + + try + { + if (!(connection instanceof TransitionConnectionType)) + return null; + + TransitionConnectionType transitionConnection = (TransitionConnectionType) connection; + if (!(transitionConnection.getSourceActivitySymbol() instanceof GatewaySymbol)) + return null; + + int size = connectionFigure.getPoints().size(); + if (size % 2 == 0) + return new MidpointLocator(connectionFigure, (size / 2) - 1); + else + return new BendpointLocator(connectionFigure, size / 2); + } + catch (RuntimeException e) + { + SimulationPlugin + .getDefault() + .getLog() + .log(new Status(IStatus.WARNING, SimulationRuntimePlugin.getDefault() + .getBundle().getSymbolicName(), IStatus.OK, + Simulation_Modeling_Messages.ERROR_INITIALIZING_OVERLAY, e)); + return null; + } + } + + public void decorationRemoved(INodeSymbol node, IFigure figure) + { + ModelElementOverlay overlay = (ModelElementOverlay) figure; + overlay.getOverlayData().removeListener(overlay); + } + + public void decorationRemoved(IConnectionSymbol connection, IFigure figure) + { + ModelElementOverlay overlay = (ModelElementOverlay) figure; + overlay.getOverlayData().removeListener(overlay); + } + + public OverlayManager getOverlayManager() + { + return parent; + } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlayManager.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlayManager.java index ea01abd..0cdc98d 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlayManager.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlayManager.java @@ -23,108 +23,139 @@ import org.eclipse.stardust.ide.simulation.ui.curves.swtutil.ColorUtils; import org.eclipse.stardust.model.xpdl.carnot.ModelType; import org.eclipse.ui.IPartListener; -public class OverlayManager { - - boolean enabled = false; - Configuration configuration; - - Map knownModelOverlays; - ModelOverlaySet activeModelOverlay; - - OverlaysSimulationEventListener simulationEventListener; - OverlaysPartListener partListener; - - public OverlayManager() { - - configuration = Configuration.createDefault(); - configuration.setMarginTop(1); - configuration.setMarginBottom(1); - configuration.setMarginLeft(1); - configuration.setMarginRight(1); - configuration.setGridColor(configuration.getCurveColors()[2]); - configuration.getCurveColors()[2] = ColorUtils.brighter(configuration.getCurveColors()[2]); - configuration.setAxesColor(configuration.getCurveColors()[1]); - configuration.setTextColor(configuration.getCurveColors()[1]); - configuration.setTextFont(JFaceResources.getFontRegistry().get(JFaceResources.DIALOG_FONT).getFontData()[0]); - - knownModelOverlays = new HashMap(); - activeModelOverlay = null; - simulationEventListener = new OverlaysSimulationEventListener(this); - partListener = new OverlaysPartListener(this); - } - - public Configuration getConfiguration() { - return configuration; - } - - public boolean isEnabled() { - return enabled; - } - - public void enableOverlays() { - this.enabled = true; - partListener.setAllEditorsEnabled(true); - resetOverlays(); - } - - public void disableOverlays() { - this.enabled = false; - partListener.setAllEditorsEnabled(false); - resetOverlays(); - } - - public ModelOverlaySet activateModelOverlays(IModel model) { - activeModelOverlay = getOrCreateOverlays(model); - return activeModelOverlay; - } - - public ModelOverlaySet getActiveModelOverlay() { - return activeModelOverlay; - } - - public ISimulationEventListener getSimulationEventListener() { - return simulationEventListener; - } - - public IPartListener getPartListener() { - return partListener; - } - - public ModelOverlaySet getOrCreateOverlays(ModelType model) { - Object key = model.getId(); - if (!knownModelOverlays.containsKey(key)) - knownModelOverlays.put(key, new ModelOverlaySet(this)); - return (ModelOverlaySet)knownModelOverlays.get(key); - } - - public ModelOverlaySet getOrCreateOverlays(IModel model) { - Object key = model.getId(); - if (!knownModelOverlays.containsKey(key)) - knownModelOverlays.put(key, new ModelOverlaySet(this)); - return (ModelOverlaySet)knownModelOverlays.get(key); - } - - public void dispose() { - // TODO - } - - public void updatePosition(long timeOffset, SimulationStatisticsHistoryEntry historyEntry) { - ModelOverlaySet modelOverlays = getActiveModelOverlay(); - if (modelOverlays != null) { - if (modelOverlays.updatePosition(timeOffset, historyEntry)) { - modelOverlays.fireRepaintAllChanged(); - } - } - } - - public void resetOverlays() { - for (Iterator itr = knownModelOverlays.values().iterator(); itr.hasNext();) { - ModelOverlaySet modelOverlays = (ModelOverlaySet) itr.next(); - modelOverlays.resetOverlays(); - modelOverlays.fireRepaintAllChanged(); - } - -// ModelOverlaySet modelOverlays = getActiveModelOverlay(); -// modelOverlays.updateIncremental( alreadyKnownHistory ); - } +public class OverlayManager +{ + + boolean enabled = false; + + Configuration configuration; + + Map knownModelOverlays; + + ModelOverlaySet activeModelOverlay; + + OverlaysSimulationEventListener simulationEventListener; + + OverlaysPartListener partListener; + + public OverlayManager() + { + + configuration = Configuration.createDefault(); + configuration.setMarginTop(1); + configuration.setMarginBottom(1); + configuration.setMarginLeft(1); + configuration.setMarginRight(1); + configuration.setGridColor(configuration.getCurveColors()[2]); + configuration.getCurveColors()[2] = ColorUtils.brighter(configuration + .getCurveColors()[2]); + configuration.setAxesColor(configuration.getCurveColors()[1]); + configuration.setTextColor(configuration.getCurveColors()[1]); + configuration.setTextFont(JFaceResources.getFontRegistry() + .get(JFaceResources.DIALOG_FONT).getFontData()[0]); + + knownModelOverlays = new HashMap(); + activeModelOverlay = null; + simulationEventListener = new OverlaysSimulationEventListener(this); + partListener = new OverlaysPartListener(this); + } + + public Configuration getConfiguration() + { + return configuration; + } + + public boolean isEnabled() + { + return enabled; + } + + public void enableOverlays() + { + this.enabled = true; + partListener.setAllEditorsEnabled(true); + + // repaint results on show + ModelOverlaySet modelOverlays = getActiveModelOverlay(); + if (modelOverlays != null) + { + modelOverlays.fireRepaintAllChanged(); + } + } + + public void disableOverlays() + { + this.enabled = false; + partListener.setAllEditorsEnabled(false); + } + + public ModelOverlaySet activateModelOverlays(IModel model) + { + activeModelOverlay = getOrCreateOverlays(model); + partListener.setAllEditorsEnabled(true); + + return activeModelOverlay; + } + + public ModelOverlaySet getActiveModelOverlay() + { + return activeModelOverlay; + } + + public ISimulationEventListener getSimulationEventListener() + { + return simulationEventListener; + } + + public IPartListener getPartListener() + { + return partListener; + } + + public ModelOverlaySet getOrCreateOverlays(ModelType model) + { + Object key = model.getId(); + if (!knownModelOverlays.containsKey(key)) + knownModelOverlays.put(key, new ModelOverlaySet(this)); + return (ModelOverlaySet) knownModelOverlays.get(key); + } + + public ModelOverlaySet getOrCreateOverlays(IModel model) + { + Object key = model.getId(); + if (!knownModelOverlays.containsKey(key)) + knownModelOverlays.put(key, new ModelOverlaySet(this)); + return (ModelOverlaySet) knownModelOverlays.get(key); + } + + public void dispose() + { + // TODO + } + + public void updatePosition(long timeOffset, + SimulationStatisticsHistoryEntry historyEntry) + { + ModelOverlaySet modelOverlays = getActiveModelOverlay(); + if (modelOverlays != null) + { + if (modelOverlays.updatePosition(timeOffset, historyEntry)) + { + modelOverlays.fireRepaintAllChanged(); + } + } + } + + public void resetOverlays() + { + for (Iterator itr = knownModelOverlays.values().iterator(); itr.hasNext();) + { + ModelOverlaySet modelOverlays = (ModelOverlaySet) itr.next(); + modelOverlays.resetOverlays(); + modelOverlays.fireRepaintAllChanged(); + } + + // ModelOverlaySet modelOverlays = getActiveModelOverlay(); + // modelOverlays.updateIncremental( alreadyKnownHistory ); + } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfiguration.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfiguration.java index cf97bba..4f722ae 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfiguration.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.ui.PlatformUI; @@ -42,16 +42,16 @@ public class OverlaysConfiguration { // These message IDs are build dynamicaly, so here is a dummy, // to avoid confusing entries in the log file String[] dummy = { - Messages.OVERLAYS_CONFIG_PARTICIPANT, - Messages.OVERLAYS_CONFIG_PARTICIPANT_CURRENTQUEUELENGTH, - Messages.OVERLAYS_CONFIG_PARTICIPANT_AVERAGEQUEUELENGTH, - Messages.OVERLAYS_CONFIG_APPLICATION, - Messages.OVERLAYS_CONFIG_APPLICATION_CURRENTQUEUELENGTH, - Messages.OVERLAYS_CONFIG_APPLICATION_AVERAGEQUEUELENGTH, - Messages.OVERLAYS_CONFIG_ACTIVITY, - Messages.OVERLAYS_CONFIG_ACTIVITY_ACTIVATETIME, - Messages.OVERLAYS_CONFIG_ACTIVITY_SUSPENDTIME, - Messages.OVERLAYS_CONFIG_TRANSITION, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_PARTICIPANT, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_PARTICIPANT_CURRENTQUEUELENGTH, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_PARTICIPANT_AVERAGEQUEUELENGTH, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_APPLICATION, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_APPLICATION_CURRENTQUEUELENGTH, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_APPLICATION_AVERAGEQUEUELENGTH, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_ACTIVITY, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_ACTIVITY_ACTIVATETIME, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_ACTIVITY_SUSPENDTIME, + Simulation_Runtime_Messages.OVERLAYS_CONFIG_TRANSITION, }; } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfigurationPage.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfigurationPage.java index 3d9de92..a5bb46f 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfigurationPage.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysConfigurationPage.java @@ -17,7 +17,7 @@ import java.util.Map; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -40,7 +40,7 @@ public class OverlaysConfigurationPage Composite composite = new Composite(parent, SWT.NONE); - PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), Messages.OVERLAYS_CONFIGURATION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), Simulation_Runtime_Messages.OVERLAYS_CONFIGURATION); GridLayoutFactory.fillDefaults().margins(10, 10).numColumns(1).applyTo(parent); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(composite); @@ -48,7 +48,7 @@ public class OverlaysConfigurationPage GridLayoutFactory.fillDefaults().margins(0, 0).numColumns(3).applyTo(composite); Label label = new Label(composite, SWT.NULL); - label.setText(Messages.OVERLAYS_CONFIG_TITLE); + label.setText(Simulation_Runtime_Messages.OVERLAYS_CONFIG_TITLE); GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.CENTER).grab(true, false).span(3, 1).applyTo(label); createMainCheckBox(composite, OverlaysConfiguration.PARTICIPANT); @@ -115,9 +115,51 @@ public class OverlaysConfigurationPage return result; } - private String getCheckBoxLabel(String id) { - return Messages.getString("OVERLAYS_CONFIG_" + id.toUpperCase().replace('.', '_')); //$NON-NLS-1$ - } + private String getCheckBoxLabel(String id) + { + String idString = id.toUpperCase().replace('.', '_'); + if (idString.equalsIgnoreCase("PARTICIPANT")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_PARTICIPANT; + } + if (idString.equalsIgnoreCase("PARTICIPANT_CURRENTQUEUELENGTH")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_PARTICIPANT_CURRENTQUEUELENGTH; + } + if (idString.equalsIgnoreCase("PARTICIPANT_AVERAGEQUEUELENGTH")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_PARTICIPANT_AVERAGEQUEUELENGTH; + } + if (idString.equalsIgnoreCase("APPLICATION")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_APPLICATION; + } + if (idString.equalsIgnoreCase("APPLICATION_CURRENTQUEUELENGTH")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_APPLICATION_CURRENTQUEUELENGTH; + } + if (idString.equalsIgnoreCase("APPLICATION_AVERAGEQUEUELENGTH")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_APPLICATION_AVERAGEQUEUELENGTH; + } + if (idString.equalsIgnoreCase("ACTIVITY")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_ACTIVITY; + } + if (idString.equalsIgnoreCase("ACTIVITY_ACTIVATETIME")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_ACTIVITY_ACTIVATETIME; + } + if (idString.equalsIgnoreCase("ACTIVITY_SUSPENDTIME")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_ACTIVITY_SUSPENDTIME; + } + if (idString.equalsIgnoreCase("TRANSITION")) //$NON-NLS-1$ + { + return Simulation_Runtime_Messages.OVERLAYS_CONFIG_TRANSITION; + } + return ""; //$NON-NLS-1$ + } private Button getCheckBox(String id) { return (Button) checkBoxes.get(id); diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysSimulationEventListener.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysSimulationEventListener.java index eabe1bd..2376193 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysSimulationEventListener.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/OverlaysSimulationEventListener.java @@ -17,8 +17,8 @@ import org.eclipse.stardust.ide.simulation.rt.plugin.SimulationRuntimePlugin; import org.eclipse.stardust.ide.simulation.rt.runtime.ISimulationEventListener; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.SimulationStatistics; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; public class OverlaysSimulationEventListener implements ISimulationEventListener { @@ -32,15 +32,11 @@ public class OverlaysSimulationEventListener implements ISimulationEventListener public void simulationEngineStarted(SimulationRuntimeConfiguration simulationRuntimeConfiguration) { try { ModelOverlaySet modelOverlays = overlayManager.activateModelOverlays(simulationRuntimeConfiguration.getModel()); - if (modelOverlays != null) { - if (modelOverlays.resetOverlays()) { - modelOverlays.fireRepaintAllChanged(); - } - } + modelOverlays.resetOverlays(); } catch (CoreException e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationRuntimePlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_INITIALIZING_OVERLAY, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_INITIALIZING_OVERLAY, e )); } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ParticipantOverlayData.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ParticipantOverlayData.java index ba1c801..adc4a08 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ParticipantOverlayData.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ParticipantOverlayData.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; import java.util.ArrayList; import java.util.List; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.drawing.Layer; import org.eclipse.stardust.ide.simulation.ui.curves.layers.HorizontalMarkerLayer; import org.eclipse.stardust.ide.simulation.ui.curves.layers.StrokedCurveLayer; @@ -27,11 +27,11 @@ public class ParticipantOverlayData extends ResourceOverlayData { } public String getMeasureName() { - return Messages.OVERLAY_PARTICIPANT_QUEUE_LENGTH; + return Simulation_Runtime_Messages.OVERLAY_PARTICIPANT_QUEUE_LENGTH; } public String getToolTipHeadline() { - return Messages.OVERLAY_PARTICIPANT_PARTICIPANT_PREFIX + identifiable.getName(); + return Simulation_Runtime_Messages.OVERLAY_PARTICIPANT_PARTICIPANT_PREFIX + identifiable.getName(); } public Layer[] getCurveDrawings() { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlay.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlay.java index 596e9fa..463d240 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlay.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlay.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.MarginBorder; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.draw2d.ColoredLabel; import org.eclipse.stardust.ide.simulation.ui.curves.drawing.Configuration; @@ -29,10 +29,10 @@ public abstract class ResourceOverlay extends ModelElementOverlayWithCurves { result.setFont(getConfiguration().getTextFontObject()); result.setBorder(new MarginBorder(5)); result.addTextLine(getOverlayData().getToolTipHeadline()); - result.addText(getConfiguration().getCurveColorObject(1), Messages.OVERLAYS_CURVE); - result.addTextLine(ColorConstants.black, " - " + Messages.OVERLAYS_CURRENT_QUEUE); //$NON-NLS-1$ - result.addText(getConfiguration().getCurveColorObject(2), Messages.OVERLAYS_CURVE); - result.addTextLine(ColorConstants.black, " - " + Messages.OVERLAYS_AVERAGE_QUEUE); //$NON-NLS-1$ + result.addText(getConfiguration().getCurveColorObject(1), Simulation_Runtime_Messages.OVERLAYS_CURVE); + result.addTextLine(ColorConstants.black, " - " + Simulation_Runtime_Messages.OVERLAYS_CURRENT_QUEUE); //$NON-NLS-1$ + result.addText(getConfiguration().getCurveColorObject(2), Simulation_Runtime_Messages.OVERLAYS_CURVE); + result.addTextLine(ColorConstants.black, " - " + Simulation_Runtime_Messages.OVERLAYS_AVERAGE_QUEUE); //$NON-NLS-1$ return result; } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlayData.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlayData.java index 7653124..653f50b 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlayData.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/ResourceOverlayData.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.overlays; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ResourceStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.history.SimulationStatisticsHistoryEntry; import org.eclipse.stardust.ide.simulation.rt.util.StatisticsFormat; @@ -29,12 +29,12 @@ public abstract class ResourceOverlayData extends ModelElementOverlayWithCurvesD // values String[] avgQueueLengthValue = { - Messages.OVERLAYS_AVERAGE_QUEUE, + Simulation_Runtime_Messages.OVERLAYS_AVERAGE_QUEUE, OverlayConstants.VALUE_SEPARATOR, OverlayConstants.VALUE_EMPTY }; String[] maxQueueLengthValue = { - Messages.OVERLAYS_MAXIMUM_QUEUE, + Simulation_Runtime_Messages.OVERLAYS_MAXIMUM_QUEUE, OverlayConstants.VALUE_SEPARATOR, OverlayConstants.VALUE_EMPTY }; diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/TransitionOverlayData.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/TransitionOverlayData.java index 0a286f2..7be9537 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/TransitionOverlayData.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/overlays/TransitionOverlayData.java @@ -14,7 +14,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ActivityStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.TransitionStatistics; @@ -47,9 +47,9 @@ public class TransitionOverlayData extends ModelElementOverlayData { } counterValue = new String[] { OverlayConstants.VALUE_EMPTY, //$NON-NLS-1$ - " (", + " (", //$NON-NLS-1$ OverlayConstants.VALUE_EMPTY, //$NON-NLS-1$ - "%)", + "%)", //$NON-NLS-1$ }; } @@ -115,7 +115,7 @@ public class TransitionOverlayData extends ModelElementOverlayData { } public String getToolTipHeadline() { - return Messages.OVERLAY_TRANSITION_TRANSITION_PREFIX + identifiable.getName(); + return Simulation_Runtime_Messages.OVERLAY_TRANSITION_TRANSITION_PREFIX + identifiable.getName(); } public boolean hasValue() { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTable.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTable.java index 9ab582b..99a4d9c 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTable.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTable.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.StatisticsExporterFactory; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.history.SimulationStatisticsHistory; @@ -44,7 +44,7 @@ public class ProcessTable { table.setHeaderVisible(true); TableColumn processDefinitionColumn = new TableColumn(table,SWT.LEFT); - processDefinitionColumn.setText(Messages.STATISTICS_PROCESS_COLUMN_PROCESS_DEFINITION); + processDefinitionColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_COLUMN_PROCESS_DEFINITION); processDefinitionColumn.setWidth(200); processDefinitionColumn.setMoveable(true); TableColumnSorter cSorter = new TableColumnSorter(tableViewer, processDefinitionColumn) { @@ -57,7 +57,7 @@ public class ProcessTable { cSorter.setSorter(cSorter, TableColumnSorter.ASC); TableColumn createdInstancesColumn = new TableColumn(table,SWT.RIGHT); - createdInstancesColumn.setText(Messages.STATISTICS_PROCESS_COLUMN_CREATED_INSTANCES); + createdInstancesColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_COLUMN_CREATED_INSTANCES); createdInstancesColumn.setWidth(150); createdInstancesColumn.setMoveable(true); new TableColumnSorter(tableViewer, createdInstancesColumn) { @@ -69,7 +69,7 @@ public class ProcessTable { }; TableColumn totalInstancesColumn = new TableColumn(table,SWT.RIGHT); - totalInstancesColumn.setText(Messages.STATISTICS_PROCESS_COLUMN_COMPLETED_INSTANCES); + totalInstancesColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_COLUMN_COMPLETED_INSTANCES); totalInstancesColumn.setWidth(150); totalInstancesColumn.setMoveable(true); new TableColumnSorter(tableViewer, totalInstancesColumn) { @@ -81,7 +81,7 @@ public class ProcessTable { }; TableColumn averageLifeTimeColumn = new TableColumn(table,SWT.RIGHT); - averageLifeTimeColumn.setText(Messages.STATISTICS_PROCESS_COLUMN_AVG_DURATION); + averageLifeTimeColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_COLUMN_AVG_DURATION); averageLifeTimeColumn.setWidth(150); averageLifeTimeColumn.setMoveable(true); new TableColumnSorter(tableViewer, averageLifeTimeColumn) { @@ -93,7 +93,7 @@ public class ProcessTable { }; TableColumn minLifeTimeColumn = new TableColumn(table,SWT.RIGHT); - minLifeTimeColumn.setText(Messages.STATISTICS_PROCESS_COLUMN_MIN_DURATION); + minLifeTimeColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_COLUMN_MIN_DURATION); minLifeTimeColumn.setWidth(150); minLifeTimeColumn.setMoveable(true); new TableColumnSorter(tableViewer, minLifeTimeColumn) { @@ -105,7 +105,7 @@ public class ProcessTable { }; TableColumn maxLifeTimeColumn = new TableColumn(table,SWT.RIGHT); - maxLifeTimeColumn.setText(Messages.STATISTICS_PROCESS_COLUMN_MAX_DURATION); + maxLifeTimeColumn.setText(Simulation_Runtime_Messages.STATISTICS_PROCESS_COLUMN_MAX_DURATION); maxLifeTimeColumn.setWidth(150); maxLifeTimeColumn.setMoveable(true); new TableColumnSorter(tableViewer, maxLifeTimeColumn) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTableLabelProvider.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTableLabelProvider.java index 74b219f..2547b5f 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTableLabelProvider.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/processtable/ProcessTableLabelProvider.java @@ -17,7 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.IExportableTableLabelProvider; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.StatisticsImages; @@ -65,7 +65,7 @@ public class ProcessTableLabelProvider implements ITableLabelProvider, IExportab private void mergeNumbers(String[] numbers, String[] oldNumbers) { for (int i=1; i<numbers.length; i++) { - numbers[i] = numbers[i]+Messages.STATISITICS_PROCESS_REFERENCE_VALUE_START+oldNumbers[i]+Messages.STATISITICS_PROCESS_REFERENCE_VALUE_END; + numbers[i] = numbers[i]+Simulation_Runtime_Messages.STATISITICS_PROCESS_REFERENCE_VALUE_START+oldNumbers[i]+Simulation_Runtime_Messages.STATISITICS_PROCESS_REFERENCE_VALUE_END; } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTable.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTable.java index 729cde4..18a9454 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTable.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTable.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ResourceStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.StatisticsExporterFactory; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.history.SimulationStatisticsHistory; @@ -44,7 +44,7 @@ public class ResourceTable { table.setHeaderVisible(true); TableColumn resourceColumn = new TableColumn(table,SWT.LEFT); - resourceColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_RESOURCE_NAME); + resourceColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_RESOURCE_NAME); resourceColumn.setWidth(150); resourceColumn.setMoveable(true); TableColumnSorter cSorter = new TableColumnSorter(tableViewer, resourceColumn) { @@ -57,7 +57,7 @@ public class ResourceTable { cSorter.setSorter(cSorter, TableColumnSorter.ASC); TableColumn totalActivatedColumn = new TableColumn(table,SWT.RIGHT); - totalActivatedColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_TOTAL_INSTANCES); + totalActivatedColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_TOTAL_INSTANCES); totalActivatedColumn.setWidth(100); totalActivatedColumn.setMoveable(true); new TableColumnSorter(tableViewer, totalActivatedColumn) { @@ -69,7 +69,7 @@ public class ResourceTable { }; TableColumn averageQueueLengthColumn = new TableColumn(table,SWT.RIGHT); - averageQueueLengthColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_AVG_QUEUE_LENGTH); + averageQueueLengthColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_AVG_QUEUE_LENGTH); averageQueueLengthColumn.setWidth(150); averageQueueLengthColumn.setMoveable(true); new TableColumnSorter(tableViewer, averageQueueLengthColumn) { @@ -81,7 +81,7 @@ public class ResourceTable { }; TableColumn maxQueueLengthColumn = new TableColumn(table,SWT.RIGHT); - maxQueueLengthColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_MAX_QUEUE_LENGTH); + maxQueueLengthColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_MAX_QUEUE_LENGTH); maxQueueLengthColumn.setWidth(150); maxQueueLengthColumn.setMoveable(true); new TableColumnSorter(tableViewer, maxQueueLengthColumn) { @@ -92,7 +92,7 @@ public class ResourceTable { } }; TableColumn averageDurationColumn = new TableColumn(table,SWT.RIGHT); - averageDurationColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_AVG_EXECUTION_DURATION); + averageDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_AVG_EXECUTION_DURATION); averageDurationColumn.setWidth(150); averageDurationColumn.setMoveable(true); new TableColumnSorter(tableViewer, averageDurationColumn) { @@ -104,7 +104,7 @@ public class ResourceTable { }; TableColumn minDurationColumn = new TableColumn(table,SWT.RIGHT); - minDurationColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_MIN_EXECUTION_DURATION); + minDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_MIN_EXECUTION_DURATION); minDurationColumn.setWidth(150); minDurationColumn.setMoveable(true); new TableColumnSorter(tableViewer, minDurationColumn) { @@ -116,7 +116,7 @@ public class ResourceTable { }; TableColumn maxDurationColumn = new TableColumn(table,SWT.RIGHT); - maxDurationColumn.setText(Messages.STATISTICS_RESOURCE_COLUMN_MAX_EXECUTION_DURATION); + maxDurationColumn.setText(Simulation_Runtime_Messages.STATISTICS_RESOURCE_COLUMN_MAX_EXECUTION_DURATION); maxDurationColumn.setWidth(150); maxDurationColumn.setMoveable(true); new TableColumnSorter(tableViewer, maxDurationColumn) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTableLabelProvider.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTableLabelProvider.java index 1070dcb..99d4f99 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTableLabelProvider.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/resourcetable/ResourceTableLabelProvider.java @@ -23,7 +23,7 @@ import org.eclipse.stardust.engine.api.model.IOrganization; import org.eclipse.stardust.engine.api.model.IRole; import org.eclipse.stardust.engine.core.model.utils.Identifiable; import org.eclipse.stardust.engine.core.model.utils.Nameable; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ResourceStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.export.IExportableTableLabelProvider; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.gui.StatisticsImages; @@ -82,7 +82,7 @@ public class ResourceTableLabelProvider implements ITableLabelProvider, IExporta private void mergeNumbers(String[] numbers, String[] oldNumbers) { for (int i=1; i<numbers.length; i++) { - numbers[i] = numbers[i]+Messages.STATISTICS_RESOURCE_REFERENCE_VALUE_START+oldNumbers[i]+Messages.STATISTICS_RESOURCE_REFERENCE_VALUE_END; + numbers[i] = numbers[i]+Simulation_Runtime_Messages.STATISTICS_RESOURCE_REFERENCE_VALUE_START+oldNumbers[i]+Simulation_Runtime_Messages.STATISTICS_RESOURCE_REFERENCE_VALUE_END; } } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTree.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTree.java index 350b985..f908eac 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTree.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTree.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ActivityStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.TransitionStatistics; @@ -46,7 +46,7 @@ public class TransitionTree { tree.setHeaderVisible(true); TreeColumn transitionNameColumn = new TreeColumn(tree,SWT.LEFT); - transitionNameColumn.setText(Messages.STATISTICS_TRANSITION_COLUMN_TRANSITION_NAME); + transitionNameColumn.setText(Simulation_Runtime_Messages.STATISTICS_TRANSITION_COLUMN_TRANSITION_NAME); transitionNameColumn.setWidth(300); transitionNameColumn.setMoveable(true); TreeColumnSorter cSorter = new TransitionBaseTreeColumnSorter(treeViewer, transitionNameColumn, false) { @@ -57,7 +57,7 @@ public class TransitionTree { cSorter.setSorter(cSorter, TableColumnSorter.ASC); TreeColumn inOutColumn = new TreeColumn(tree,SWT.CENTER); - inOutColumn.setText(Messages.STATISTICS_TRANSITION_COLUMN_IN_OUT); + inOutColumn.setText(Simulation_Runtime_Messages.STATISTICS_TRANSITION_COLUMN_IN_OUT); inOutColumn.setWidth(80); inOutColumn.setMoveable(true); new TransitionBaseTreeColumnSorter(treeViewer, inOutColumn, true) { @@ -75,7 +75,7 @@ public class TransitionTree { }; TreeColumn activityNameColumn = new TreeColumn(tree,SWT.LEFT); - activityNameColumn.setText(Messages.STATISTICS_TRANSITION_COLUMN_SOURCE_TARGET); + activityNameColumn.setText(Simulation_Runtime_Messages.STATISTICS_TRANSITION_COLUMN_SOURCE_TARGET); activityNameColumn.setWidth(250); activityNameColumn.setMoveable(true); new TransitionBaseTreeColumnSorter(treeViewer, activityNameColumn, true) { @@ -85,7 +85,7 @@ public class TransitionTree { }; TreeColumn cpTraversalCountColumn = new TreeColumn(tree,SWT.RIGHT); - cpTraversalCountColumn.setText(Messages.STATISTICS_TRANSITION_COLUMN_TRAVERSAL_COUNT); + cpTraversalCountColumn.setText(Simulation_Runtime_Messages.STATISTICS_TRANSITION_COLUMN_TRAVERSAL_COUNT); cpTraversalCountColumn.setWidth(120); cpTraversalCountColumn.setMoveable(true); new TransitionBaseTreeColumnSorter(treeViewer, cpTraversalCountColumn, true) { @@ -95,7 +95,7 @@ public class TransitionTree { }; TreeColumn cpTraversalRateColumn = new TreeColumn(tree,SWT.RIGHT); - cpTraversalRateColumn.setText(Messages.STATISTICS_TRANSITION_COLUMN_TRAVERSAL_RATE); + cpTraversalRateColumn.setText(Simulation_Runtime_Messages.STATISTICS_TRANSITION_COLUMN_TRAVERSAL_RATE); cpTraversalRateColumn.setWidth(120); cpTraversalRateColumn.setMoveable(true); new TransitionBaseTreeColumnSorter(treeViewer, cpTraversalRateColumn, true) { diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTreeLabelProvider.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTreeLabelProvider.java index 218c0bf..a3f252a 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTreeLabelProvider.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/runtime/statistics/gui/transitiontree/TransitionTreeLabelProvider.java @@ -18,7 +18,7 @@ import org.apache.commons.logging.LogFactory; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.stardust.engine.api.model.ImplementationType; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ActivityStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.ProcessDefinitionStatistics; import org.eclipse.stardust.ide.simulation.rt.runtime.statistics.TransitionStatistics; @@ -119,7 +119,7 @@ public class TransitionTreeLabelProvider implements ITableLabelProvider, IExport private void mergeNumbers(String[] numbers, String[] oldNumbers) { for (int i=3; i<numbers.length; i++) { - numbers[i] = numbers[i]+Messages.STATISTICS_TRANSITION_REFERENCE_VALUE_START+oldNumbers[i]+Messages.STATISTICS_TRANSITION_REFERENCE_VALUE_END; + numbers[i] = numbers[i]+Simulation_Runtime_Messages.STATISTICS_TRANSITION_REFERENCE_VALUE_START+oldNumbers[i]+Simulation_Runtime_Messages.STATISTICS_TRANSITION_REFERENCE_VALUE_END; } } @@ -127,10 +127,10 @@ public class TransitionTreeLabelProvider implements ITableLabelProvider, IExport String inOutString; String otherActivityName; if (transitionStatisticsWrapper.isOutgoing() == true) { - inOutString = Messages.STATISTICS_TRANSITION_OUT_TRANSITION; + inOutString = Simulation_Runtime_Messages.STATISTICS_TRANSITION_OUT_TRANSITION; otherActivityName = transitionStatisticsWrapper.getToActivityDefinition().getActivityDefinitionModel().getName(); } else { - inOutString = Messages.STATISTICS_TRANSITION_IN_TRANSITION; + inOutString = Simulation_Runtime_Messages.STATISTICS_TRANSITION_IN_TRANSITION; otherActivityName = transitionStatisticsWrapper.getFromActivityDefinition().getActivityDefinitionModel().getName(); } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/EclipseUtils.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/EclipseUtils.java index 6be29a2..7d2488d 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/EclipseUtils.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/EclipseUtils.java @@ -27,8 +27,8 @@ import org.eclipse.jdt.launching.StandardClasspathProvider; import org.eclipse.stardust.ide.simulation.rt.definition.ModelDefinitionRepository; import org.eclipse.stardust.ide.simulation.rt.definition.ProcessDefinition; import org.eclipse.stardust.ide.simulation.rt.plugin.SimulationRuntimePlugin; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; import org.eclipse.stardust.ide.simulation.rt.runtime.configuration.SimulationRuntimeConfiguration; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationCoreException; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationException; import org.eclipse.stardust.model.xpdl.carnot.DiagramType; @@ -59,7 +59,7 @@ public class EclipseUtils { else // all uexpected exceptions return new Status(Status.ERROR, SimulationRuntimePlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_GOT_EXCEPTION+exception.getClass().getName(), exception); + IStatus.OK, Simulation_Runtime_Messages.ERROR_GOT_EXCEPTION+exception.getClass().getName(), exception); } public static URL[] parseClasspath(ILaunchConfiguration configuration) throws CoreException { @@ -69,7 +69,7 @@ public class EclipseUtils { for (int i=0; i<runtimeClasspathEntries.length; i++) { try { - result[i] = new URL("file", "", runtimeClasspathEntries[i].getLocation()); + result[i] = new URL("file", "", runtimeClasspathEntries[i].getLocation()); //$NON-NLS-1$ //$NON-NLS-2$ } catch (MalformedURLException e) { throw new CoreException(EclipseUtils.createErrorStatus(e)); } @@ -105,20 +105,20 @@ public class EclipseUtils { // project IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); if (null == project) { - throw new SimulationCoreException(Messages.RC_ERR_ProjectDoesNotExist1, projectName, null); + throw new SimulationCoreException(Simulation_Runtime_Messages.RC_ERR_ProjectDoesNotExist1, projectName, null); } // model file name IFile file = project.getFile(new Path(modelFile)); if (!file.exists()) { - throw new SimulationCoreException(Messages.RC_ERR_ModelFileDoesNotExist1, file.getFullPath().toString(), null); + throw new SimulationCoreException(Simulation_Runtime_Messages.RC_ERR_ModelFileDoesNotExist1, file.getFullPath().toString(), null); } UiAccessor.loadModel(file, true); if ( !UiAccessor.isModelLoaded(file)) { - throw new SimulationCoreException(Messages.RC_ERR_ModelFileNeedsToBeLoaded1, file.getFullPath().toString(), null); + throw new SimulationCoreException(Simulation_Runtime_Messages.RC_ERR_ModelFileNeedsToBeLoaded1, file.getFullPath().toString(), null); } ModelType model = null; @@ -127,7 +127,7 @@ public class EclipseUtils { WorkflowModelEditor editor = (WorkflowModelEditor) editPart; model = editor.getWorkflowModel(); } else { - throw new SimulationCoreException(Messages.RC_ERR_ModelFileNeedsToBeLoaded1, file.getFullPath().toString(), null); + throw new SimulationCoreException(Simulation_Runtime_Messages.RC_ERR_ModelFileNeedsToBeLoaded1, file.getFullPath().toString(), null); } return model; } diff --git a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/TerminationConditions.java b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/TerminationConditions.java index 1f09646..ea047a8 100644 --- a/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/TerminationConditions.java +++ b/org.eclipse.stardust.ide.simulation.rt/src/org/eclipse/stardust/ide/simulation/rt/util/TerminationConditions.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.rt.util; import java.util.HashMap; import java.util.Iterator; -import org.eclipse.stardust.ide.simulation.rt.runtime.i18n.Messages; +import org.eclipse.stardust.ide.simulation.rt.runtime.Simulation_Runtime_Messages; public class TerminationConditions { @@ -27,11 +27,11 @@ public class TerminationConditions { private HashMap termConditionsMap = new HashMap(); public TerminationConditions() { - termConditionsMap.put(END_OF_TIME_INTERVAL_ID, Messages.END_OF_TIME_INTERVAL); - termConditionsMap.put(NUMBER_OF_PI_REACHED_ID, Messages.NUMBER_OF_PI_REACHED); - termConditionsMap.put(APPLICATION_QUEUE_LENGTH_ID, Messages.APPLICATION_QUEUE_LENGTH); - termConditionsMap.put(PARTICIPANT_QUEUE_LENGTH_ID, Messages.PARTICIPANT_QUEUE_LENGTH); - termConditionsMap.put(TRANSITION_TRAVERSED_COUNT_ID, Messages.TRANSITIONS_TRAVERSED); + termConditionsMap.put(END_OF_TIME_INTERVAL_ID, Simulation_Runtime_Messages.END_OF_TIME_INTERVAL); + termConditionsMap.put(NUMBER_OF_PI_REACHED_ID, Simulation_Runtime_Messages.NUMBER_OF_PI_REACHED); + termConditionsMap.put(APPLICATION_QUEUE_LENGTH_ID, Simulation_Runtime_Messages.APPLICATION_QUEUE_LENGTH); + termConditionsMap.put(PARTICIPANT_QUEUE_LENGTH_ID, Simulation_Runtime_Messages.PARTICIPANT_QUEUE_LENGTH); + termConditionsMap.put(TRANSITION_TRAVERSED_COUNT_ID, Simulation_Runtime_Messages.TRANSITIONS_TRAVERSED); } diff --git a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/draw2d/ValueFigure.java b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/draw2d/ValueFigure.java index f0c241b..f61fc25 100644 --- a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/draw2d/ValueFigure.java +++ b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/draw2d/ValueFigure.java @@ -52,7 +52,7 @@ public class ValueFigure extends Label { super.paint(graphics); } catch (RuntimeException e) { // TODO Auto-generated catch block - System.out.println("ERROR: "+getText()); + System.out.println("ERROR: "+getText()); //$NON-NLS-1$ } } } diff --git a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/drawing/Metrics.java b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/drawing/Metrics.java index 17a33d1..5a90d3e 100644 --- a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/drawing/Metrics.java +++ b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/drawing/Metrics.java @@ -12,7 +12,6 @@ package org.eclipse.stardust.ide.simulation.ui.curves.drawing; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Rectangle2D; -import org.eclipse.swt.graphics.Rectangle; public class Metrics { diff --git a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/editor/EditorController.java b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/editor/EditorController.java index 0fbaa0f..77bc44b 100644 --- a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/editor/EditorController.java +++ b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/editor/EditorController.java @@ -12,7 +12,6 @@ package org.eclipse.stardust.ide.simulation.ui.curves.editor; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Rectangle2D; -import org.eclipse.stardust.ide.simulation.ui.curves.timeline.TimelineEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; diff --git a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/timeline/CurveAreaCompensationHelper.java b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/timeline/CurveAreaCompensationHelper.java index 5fcb3bd..2be4fed 100644 --- a/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/timeline/CurveAreaCompensationHelper.java +++ b/org.eclipse.stardust.ide.simulation.ui.curves/src/main/java/org/eclipse/stardust/ide/simulation/ui/curves/timeline/CurveAreaCompensationHelper.java @@ -79,7 +79,7 @@ public class CurveAreaCompensationHelper { } private void changeCurveToRight(double areaDiff, int index) { - System.out.println("*** changeCurveToRight"); + System.out.println("*** changeCurveToRight"); //$NON-NLS-1$ Coord2DList oldPointsPlus = new Coord2DList(oldPoints); Coord2DList newPointsPlus = new Coord2DList(newPoints); @@ -109,7 +109,7 @@ public class CurveAreaCompensationHelper { newPoints = newPointsPlus.toArray(); } private void changeCurveToRightAndLeft(double areaDiff, int firstIndex, int lastIndex) { - System.out.println("*** changeCurveToRight"); + System.out.println("*** changeCurveToRight"); //$NON-NLS-1$ Coord2DList oldPointsPlus = new Coord2DList(oldPoints); Coord2DList newPointsPlus = new Coord2DList(newPoints); diff --git a/org.eclipse.stardust.ide.simulation.ui/plugin.properties b/org.eclipse.stardust.ide.simulation.ui/plugin.properties index 0b03a6d..4306961 100644 --- a/org.eclipse.stardust.ide.simulation.ui/plugin.properties +++ b/org.eclipse.stardust.ide.simulation.ui/plugin.properties @@ -18,3 +18,25 @@ simulationDurationPropertyPage=Duration simulationProbabilityPropertyPage=Probability simulationDataValuePropertyPage=Data Value Generation simulationBehaviourPropertyPage=Behaviour +infinityOptimizer=Infinity Optimizer +infinityCategory=Infinity +stateBadenWuerttemberg=Baden-Württemberg +stateBayern=Bayern +stateBerlin=Berlin +stateBrandenburg=Brandenburg +stateBremen=Bremen +stateHamburg=Hamburg +stateHessen=Hessen +stateMecklenburgVorpommern=Mecklenburg-Vorpommern +stateNiedersachsen=Niedersachsen +stateNordrheinWestfalen=Nordrhein-Westfalen +stateRheinlandPfalz=Rheinland-Pfalz +stateSachsen=Sachsen +stateSachsenAnhalt=Sachsen-Anhalt +stateSaarland=Saarland +stateSchleswigHolstein=Schleswig-Holstein +stateThueringen=Thüringen +nationwideHolidays=Nationwide Holidays +saturdays=Saturdays +sundays=Sundays +germany=Germany
\ No newline at end of file diff --git a/org.eclipse.stardust.ide.simulation.ui/plugin.xml b/org.eclipse.stardust.ide.simulation.ui/plugin.xml index e146625..227a86d 100644 --- a/org.eclipse.stardust.ide.simulation.ui/plugin.xml +++ b/org.eclipse.stardust.ide.simulation.ui/plugin.xml @@ -237,14 +237,14 @@ point="org.eclipse.ui.views"> <category id="org.eclipse.stardust.modeling.core.viewcategory" - name="Infinity"/> + name="%infinityCategory"/> <view allowMultiple="false" category="org.eclipse.stardust.modeling.core.viewcategory" class="org.eclipse.stardust.ide.simulation.ui.slider.gui.SliderView" icon="icons/simulation.gif" id="org.eclipse.stardust.ide.simulation.ui.runtime.gui.SliderView" - name="Infinity Optimizer"/> + name="%infinityOptimizer"/> </extension> <extension id="StandardHolidays" @@ -253,82 +253,82 @@ <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.SaturdayHolidays" id="Saturday" - name="Saturdays"/> + name="%saturdays"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.SundayHolidays" id="Sunday" - name="Sundays"/> + name="%sundays"/> <separator/> - <category name="Germany"> + <category name="%germany"> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.NationwideHolidays" id="NationwideHolidays" - name="Nationwide Holidays"/> + name="%nationwideHolidays"/> <separator/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.BadenWuerttemberg" id="BadenWuerttemberg" - name="Baden-Württemberg"/> + name="%stateBadenWuerttemberg"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Bayern" id="Bayern" - name="Bayern"/> + name="%stateBayern"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Berlin" id="Berlin" - name="Berlin"/> + name="%stateBerlin"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Brandenburg" id="Brandenburg" - name="Brandenburg"/> + name="%stateBrandenburg"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Bremen" id="Bremen" - name="Bremen"/> + name="%stateBremen"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Hamburg" id="Hamburg" - name="Hamburg"/> + name="%stateHamburg"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Hessen" id="Hessen" - name="Hessen"/> + name="%stateHessen"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.MecklenburgVorpommern" id="Mecklenburg-Vorpommern" - name="Mecklenburg-Vorpommern"/> + name="%stateMecklenburgVorpommern"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Niedersachsen" id="Niedersachsen" - name="Niedersachsen"/> + name="%stateNiedersachsen"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.NordrheinWestfalen" id="Nordrhein-Westfalen" - name="Nordrhein-Westfalen"/> + name="%stateNordrheinWestfalen"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.RheinlandPfalz" id="RheinlandPfalz" - name="Rheinland-Pfalz"/> + name="%stateRheinlandPfalz"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Sachsen" id="Sachsen" - name="Sachsen"/> + name="%stateSachsen"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.SachsenAnhalt" id="Sachsen-Anhalt" - name="Sachsen-Anhalt"/> + name="%stateSachsenAnhalt"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Saarland" id="Saarland" - name="Saarland"/> + name="%stateSaarland"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.SchleswigHolstein" id="Schleswig-Holstein" - name="Schleswig-Holstein"/> + name="%stateSchleswigHolstein"/> <holidays class="org.eclipse.stardust.ide.simulation.ui.timeutils.standardholidays.Thueringen" id="Thueringen" - name="Thüringen"/> + name="%stateThueringen"/> </category> </extension> <extension diff --git a/org.eclipse.stardust.ide.simulation.ui/src/ag/carnot/modeling/simulation/i18n/.gitignore b/org.eclipse.stardust.ide.simulation.ui/src/ag/carnot/modeling/simulation/i18n/.gitignore new file mode 100644 index 0000000..e69de29 --- a/dev/null +++ b/org.eclipse.stardust.ide.simulation.ui/src/ag/carnot/modeling/simulation/i18n/.gitignore diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationConfigurationList.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationConfigurationList.java index 486a64f..7109183 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationConfigurationList.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationConfigurationList.java @@ -177,7 +177,7 @@ public class SimulationConfigurationList { Calendar endDate = Calendar.getInstance(); endDate.setTime(new Date()); endDate.add(Calendar.YEAR, 1); - SimulationConfiguration simulationConfiguration = new SimulationConfiguration(id, Messages.SIMULATION_CONFIGURATION_DEFAULT_NAME+id, Messages.SIMULATION_CONFIGURATION_DEFAULT_DESCRIPTION+id, new Date(), endDate.getTime()); + SimulationConfiguration simulationConfiguration = new SimulationConfiguration(id, Simulation_Modeling_Messages.SIMULATION_CONFIGURATION_DEFAULT_NAME+id, Simulation_Modeling_Messages.SIMULATION_CONFIGURATION_DEFAULT_DESCRIPTION+id, new Date(), endDate.getTime()); this.simulationConfigurations.put(new Integer(id), simulationConfiguration); // last added is made active now, this is what the user usually wants. if not, he can change the active one using the "active" checkbox this.setCurrentSimulationConfiguration(simulationConfiguration); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationPlugin.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationPlugin.java index a02c0d0..f8b6c2f 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationPlugin.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/SimulationPlugin.java @@ -44,7 +44,7 @@ public class SimulationPlugin extends AbstractUIPlugin // CRNT-6277: redirect logging to system temporary folder Map locals = new HashMap(); - locals.put("Logging.Directory", System.getProperty("java.io.tmpdir", "./")); + locals.put("Logging.Directory", System.getProperty("java.io.tmpdir", "./")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ParametersFacade.pushLayer(locals); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/Simulation_Modeling_Messages.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/Simulation_Modeling_Messages.java new file mode 100644 index 0000000..7f50375 --- a/dev/null +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/Simulation_Modeling_Messages.java @@ -0,0 +1,265 @@ +/* + * $Id$ + * (C) 2000 - 2006 CARNOT AG + */ +package org.eclipse.stardust.ide.simulation.ui; + +import org.eclipse.osgi.util.NLS; + +public class Simulation_Modeling_Messages extends NLS +{ + private static final String BUNDLE_NAME = "org.eclipse.stardust.ide.simulation.ui.simulation-modeling-messages"; //$NON-NLS-1$ + + static + { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Simulation_Modeling_Messages.class); + } + + public static String EMPTY_STRING; + + public static String BUSINESS_CALENDAR_POPUP_REMOVE_ALL; + + public static String BUSINESS_CALENDAR_POPUP_RESET_TO_SELECTED; + + public static String TIMELINE_POPUP_REMOVE_ALL_POINTS; + + public static String TIMELINE_POPUP_RESET_TO_ZERO; + + public static String TIMELINE_POPUP_OPTIMIZE_CURVE; + + public static String TIMELINE_POPUP_RESET_TO_DEFAULT; + + public static String TIMELINE_POPUP_EDIT_DETAILS; + + public static String CREATE_SLIDER_DELETE_BUTTON; + + public static String CREATE_SLIDER_LABEL; + + public static String CREATE_SLIDER_LOWER_VALUE; + + public static String CREATE_SLIDER_RESOLUTION; + + public static String CREATE_SLIDER_UPPER_VALUE; + + public static String DATA_GENERATOR_OPTIONS; + + public static String DATA_GENERATION_RESOURCE_FILE_FIRST_LINE_IN_HEADER; + + public static String DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL; + + public static String DATA_GENERATOR_BOOLEAN; + + public static String DATA_GENERATOR_DATE; + + public static String DATA_GENERATOR_CHARACTER; + + public static String DATA_GENERATOR_FILE; + + public static String DATA_GENERATOR_NORMAL_RANDOM_DOUBLE0; + + public static String DATA_GENERATOR_POISSON_INTEGER; + + public static String DATA_GENERATOR_UNIFORM_DOUBLE; + + public static String DATA_GENERATOR_UNIFORM_INTEGER; + + public static String INPUT_VALUE_DIALOG_LABEL; + + public static String INPUT_VALUE_DIALOG_TITLE; + + public static String IS_CURRENT_CONFIGURATION; + + public static String CONFIGURATION_NAME; + + public static String CONFIGURATION_DESCRIPTION; + + public static String CONFIGURATION_INTERVAL_START; + + public static String CONFIGURATION_INTERVAL_END; + + public static String CONFIGURATION_NOT_SELECTED; + + public static String CURRENT_CONFIGURATION; + + public static String DERIVED_FROM_AUDIT_TRAIL; + + public static String CONFIGURATION_ALL_RETRIVEAUDITTRAIL; + + public static String CONFIGURATION_ALL_RETRIVEAUDITTRAIL_ON; + + public static String CONFIGURATION_ALL_RETRIVEAUDITTRAIL_OFF; + + public static String DURATION; + + public static String AVAILABILITY; + + public static String PROBABILITY; + + public static String ARRIVAL_RATE; + + public static String MSG_CONFIGURATION_IS_NOT_COMPLETE; + + public static String MSG_PROBABILITY_GT_100; + + public static String MSG_TOTAL_PROBABILITY_GT_100; + + public static String MSG_ARRIVAL_RATE_GT; + + public static String MSG_INVALID_DATA_GENERATOR; + + public static String PROPERTY_PAGE_MODEL_BUTTON_ADD; + + public static String PROPERTY_PAGE_MODEL_BUTTON_COPY; + + public static String PROPERTY_PAGE_MODEL_BUTTON_DELETE; + + public static String PROPERTY_PAGE_MODEL_COLUMN_CURRENT; + + public static String PROPERTY_PAGE_MODEL_COLUMN_NAME; + + public static String DISTRIBUTION_TYPE; + + public static String EMPTY_DISTRIBUTION; + + public static String UNLIMITED_DISTRIBUTION; + + public static String NORMAL_DISTRIBUTION; + + public static String POISSON_DISTRIBUTION; + + public static String UNIFORM_DISTRIBUTION; + + public static String CUSTOM_DISTRIBUTION; + + public static String DISTRIBUTION_SETTINGS; + + public static String UNIT; + + public static String UNIT_DAY; + + public static String UNIT_HOUR; + + public static String UNIT_MINUTE; + + public static String UNIT_SECOND; + + public static String UNIT_MILLI; + + public static String SYMBOL_DAY; + + public static String SYMBOL_HOUR; + + public static String SYMBOL_MINUTE; + + public static String SYMBOL_SECOND; + + public static String SYMBOL_MILLI; + + public static String LAMBDA; + + public static String MJU; + + public static String SIGMA; + + public static String START_POINT; + + public static String END_POINT; + + public static String START_DATE; + + public static String END_DATE; + + public static String UNLIMITED_AVAILABILITY; + + public static String DAILY_AVAILABILITY; + + public static String CALENDAR_AVAILABILITY; + + public static String AVAILABLE_RESOURCE; + + public static String DAILY_ARRIVAL_RATE; + + public static String CALENDAR_ARRIVAL_RATE; + + public static String NUMBER_OF_PROCESSES; + + public static String PROBABILITY_CURVE; + + public static String PROBABILITY_COLUMN; + + public static String PROBABILITY_SUBOBJECTS; + + public static String MAX_TRAVERSAL_COUNT; + + public static String MAX_TRAVERSAL_COUNT_MIN; + + public static String MAX_TRAVERSAL_COUNT_MAX; + + public static String CREATE_SLIDER_TITLE; + + public static String CREATE_SLIDER_TEXT; + + public static String EFFICIENCY_RATE; + + public static String DATA_VALUE_GENERATOR_NULL; + + public static String DATA_VALUE_GENERATOR_TYPE; + + public static String DATA_VALUE_GENERATOR_PRECISION; + + public static String DATA_VALUE_GENERATOR_MULTIPLICATOR; + + public static String DATA_VALUE_BOOLEAN_PROBABILITY; + + public static String DATA_VALUE_CHARACTERS; + + public static String DurationAuditTrailQuery_1; + + public static String ERROR_INCOMPLETE_VALUE; + + public static String ERROR_VALUE_OUTSIDE_OF_RANGE; + + public static String ERROR_VALUE_IS_NOT_VALID; + + public static String ERROR_TRAY_OTHER_TIME_UNIT; + + public static String ERROR_NOTIFICATION_FAILED; + + public static String ERROR_IN_DATA_GENERATOR; + + public static String ERROR_READING_CONFIGURATION; + + public static String ERROR_INITIALIZING_OVERLAY; + + public static String ERROR_FILE_NOT_FOUND; + + public static String ERROR_DATAGENERATOR_RESETED_INFO; + + public static String ERROR_DATAGENERATOR_RESETED_WARN; + + public static String ERROR_DISTRIBUTION_SET_TO_DEFAULT_INFO; + + public static String FILE_SELECTION_MESSAGE; + + public static String FILE_SELECTION_BROWSE_BUTTON; + + public static String SIMULATION_CONFIGURATION_DEFAULT_DESCRIPTION; + + public static String SIMULATION_CONFIGURATION_DEFAULT_NAME; + + public static String AUDITTRAIL_ERR_INSUFFICIENT_DATA; + + public static String AUDITTRAIL_ERR_INSUFFICIENT_DATA_WARN; + + public static String AUDITTRAIL_ERR_DRIVER; + + public static String AUDITTRAIL_ERR_CONNECTION; + + public static String AUDITTRAIL_ERR_SQL; + + public static String AUDITTRAIL_ERR_CONNECTION_CLOSE; + + public static String AUDITTRAIL_ERR_CONFIGURATION_INIT; + +} diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ActivityTerminationAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ActivityTerminationAuditTrailQuery.java index e9b9301..b357195 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ActivityTerminationAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ActivityTerminationAuditTrailQuery.java @@ -25,10 +25,10 @@ public class ActivityTerminationAuditTrailQuery extends AppearanceAuditTrailQuer protected ActivityTerminationAuditTrailQuery(String objectHint, ActivityType activity, long startDate, long endDate, String schemaPrefix, String partitionId) { super(objectHint); this.sql = "SELECT I.lastmodificationtime" //$NON-NLS-1$ - + " FROM "+schemaPrefix+"activity_instance I" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"activity A ON A.model=I.model and A.oid=I.activity" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ + + " FROM "+schemaPrefix+"activity_instance I" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"activity A ON A.model=I.model and A.oid=I.activity" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ //$NON-NLS-2$ + makePartitionJoin(schemaPrefix, partitionId) + " WHERE I.state=2 AND I.lastmodificationtime >= " + startDate + " AND I.lastmodificationtime <= " + endDate //$NON-NLS-1$ //$NON-NLS-2$ + " AND ( A.id='" + activity.getId() + "'" //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AppearanceAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AppearanceAuditTrailQuery.java index ceec034..ad35b8a 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AppearanceAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AppearanceAuditTrailQuery.java @@ -14,7 +14,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.timeutils.Interval; import org.eclipse.stardust.ide.simulation.ui.timeutils.IntervalList; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; @@ -29,8 +29,8 @@ public class AppearanceAuditTrailQuery implements IAuditTrailQuery { } protected String makePartitionJoin(String schemaPrefix, String partitionId) { - return StringUtils.isEmpty(partitionId) ? "": - " INNER JOIN "+schemaPrefix+"partition R ON R.oid=M.partition and R.id='" + partitionId + "'"; //$NON-NLS-1$ //$NON-NLS-2$ + return StringUtils.isEmpty(partitionId) ? "": //$NON-NLS-1$ + " INNER JOIN "+schemaPrefix+"partition R ON R.oid=M.partition and R.id='" + partitionId + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } public IntervalList execute(DatabaseFacade database) { @@ -45,7 +45,7 @@ public class AppearanceAuditTrailQuery implements IAuditTrailQuery { } database.dispose(rs); } catch (SQLException e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_SQL, e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_SQL, e); } return result; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ArrivalRateAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ArrivalRateAuditTrailQuery.java index 1eaea63..942f655 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ArrivalRateAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/ArrivalRateAuditTrailQuery.java @@ -14,7 +14,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.timeutils.Interval; import org.eclipse.stardust.ide.simulation.ui.timeutils.IntervalList; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; @@ -29,17 +29,17 @@ public class ArrivalRateAuditTrailQuery implements IAuditTrailQuery { protected ArrivalRateAuditTrailQuery(String objectHint, ProcessDefinitionType process, long startDate, long endDate, String schemaPrefix, String partitionId) { this.objectHint = objectHint; this.sql = "SELECT I.starttime" //$NON-NLS-1$ - + " FROM "+schemaPrefix+"process_instance I" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=I.model and P.oid=I.processdefinition" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ + + " FROM "+schemaPrefix+"process_instance I" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=I.model and P.oid=I.processdefinition" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ //$NON-NLS-2$ + makePartitionJoin(schemaPrefix, partitionId) + " WHERE I.starttime >= " + startDate + " AND I.starttime <= " + endDate //$NON-NLS-1$ //$NON-NLS-2$ + makeProcessFilter(process); //$NON-NLS-1$ } private String makePartitionJoin(String schemaPrefix, String partitionId) { - return StringUtils.isEmpty(partitionId) ? "": - " INNER JOIN "+schemaPrefix+"partition R ON R.oid=M.partition and R.id='" + partitionId + "'"; //$NON-NLS-1$ //$NON-NLS-2$ + return StringUtils.isEmpty(partitionId) ? "": //$NON-NLS-1$ + " INNER JOIN "+schemaPrefix+"partition R ON R.oid=M.partition and R.id='" + partitionId + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } private String makeProcessFilter(ProcessDefinitionType process) { @@ -61,7 +61,7 @@ public class ArrivalRateAuditTrailQuery implements IAuditTrailQuery { } database.dispose(rs); } catch (SQLException e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_SQL, e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_SQL, e); } return result; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AuditTrailEvaluator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AuditTrailEvaluator.java index 998712e..4b95416 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AuditTrailEvaluator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/AuditTrailEvaluator.java @@ -16,8 +16,8 @@ import java.util.Date; import java.util.List; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.AvailabilityConfiguration; import org.eclipse.stardust.ide.simulation.ui.distributions.CustomDistributionConfiguration; import org.eclipse.stardust.ide.simulation.ui.distributions.DistributionFactory; @@ -100,7 +100,7 @@ public class AuditTrailEvaluator { public void retrieveArrivalRate(AvailabilityConfiguration result, IAuditTrailQuery query) { // get activity intervals IntervalList processTimes = query.execute(configuration.getDatabase()); - verifyEnoughData(Messages.ARRIVAL_RATE, query.getObjectHint(), 1, 100, processTimes.size()); + verifyEnoughData(Simulation_Modeling_Messages.ARRIVAL_RATE, query.getObjectHint(), 1, 100, processTimes.size()); // remove holidays @@ -199,7 +199,7 @@ public class AuditTrailEvaluator { // get activity intervals IntervalList activityTimes = query.execute(configuration.getDatabase()); - verifyEnoughData(Messages.AVAILABILITY, query.getObjectHint(), 1, 100, activityTimes.size()); //$NON-NLS-1$ + verifyEnoughData(Simulation_Modeling_Messages.AVAILABILITY, query.getObjectHint(), 1, 100, activityTimes.size()); //$NON-NLS-1$ // count number of parallel runnig activities TimestampValueList availabilityCurve = activityTimes.createQuantityCurve(); @@ -322,7 +322,7 @@ public class AuditTrailEvaluator { CustomDistributionConfiguration test = (CustomDistributionConfiguration) result.getDistribution(); List points = test.getPoints(); if (points.size() >= 2) { - addWarning(MessageFormat.format(Messages.ERROR_DISTRIBUTION_SET_TO_DEFAULT_INFO, new Object[]{ query.getObjectHint() })); + addWarning(MessageFormat.format(Simulation_Modeling_Messages.ERROR_DISTRIBUTION_SET_TO_DEFAULT_INFO, new Object[]{ query.getObjectHint() })); } else { // restore old state if retrieval failed! @@ -333,7 +333,7 @@ public class AuditTrailEvaluator { public void retrieve(DurationConfiguration duration, PoissonDistributionConfiguration result, IAuditTrailQuery query) { IntervalList activityTimes = query.execute(configuration.getDatabase()); - verifyEnoughData(Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); + verifyEnoughData(Simulation_Modeling_Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); double average = activityTimes.averageDuration(); @@ -345,7 +345,7 @@ public class AuditTrailEvaluator { public void retrieve(DurationConfiguration duration, NormalDistributionConfiguration result, IAuditTrailQuery query) { IntervalList activityTimes = query.execute(configuration.getDatabase()); - verifyEnoughData(Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); //$NON-NLS-1$ + verifyEnoughData(Simulation_Modeling_Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); //$NON-NLS-1$ double average = activityTimes.averageDuration(); double variance = activityTimes.varianceDuration(average); @@ -359,7 +359,7 @@ public class AuditTrailEvaluator { public void retrieve(DurationConfiguration duration, UniformDistributionConfiguration result, IAuditTrailQuery query) { IntervalList activityTimes = query.execute(configuration.getDatabase()); - verifyEnoughData(Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); + verifyEnoughData(Simulation_Modeling_Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); long min = activityTimes.minDuration(); long max = activityTimes.maxDuration(); @@ -373,7 +373,7 @@ public class AuditTrailEvaluator { public void retrieve(DurationConfiguration duration, CustomDistributionConfiguration result, IAuditTrailQuery query) { IntervalList activityTimes = query.execute(configuration.getDatabase()); - verifyEnoughData(Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); //$NON-NLS-1$ + verifyEnoughData(Simulation_Modeling_Messages.DURATION, query.getObjectHint(), 1, 100, activityTimes.size()); //$NON-NLS-1$ long max = activityTimes.maxDuration(); @@ -433,7 +433,7 @@ public class AuditTrailEvaluator { public void retrieve(ProbabilityConfiguration result, IAuditTrailQuery transitionQuery, IAuditTrailQuery activityQuery) { // "transition" probability = number of "itransitions" activations / number of commited "in-activities" IntervalList transitionTimes = transitionQuery.execute(configuration.getDatabase()); - verifyEnoughData(Messages.PROBABILITY, transitionQuery.getObjectHint(), 1, 100, transitionTimes.size()); + verifyEnoughData(Simulation_Modeling_Messages.PROBABILITY, transitionQuery.getObjectHint(), 1, 100, transitionTimes.size()); IntervalList activityTimes = activityQuery.execute(configuration.getDatabase()); long duration = result.getInterval().getDurationInMillis(); double probability = (100.0 * transitionTimes.size()) / activityTimes.size(); @@ -522,14 +522,14 @@ public class AuditTrailEvaluator { public void addWarning(String text) { if (hasWarning()) - warning.append("\n"); + warning.append("\n"); //$NON-NLS-1$ warning.append(text); } public void verifyEnoughData(String parameterName, String elementId, int required, int sufficiend, int found) { if (BREAK_ON_INSUFFICIENT_DATA && found < required) - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_INSUFFICIENT_DATA, parameterName, parameterName.toLowerCase(), elementId, null); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_INSUFFICIENT_DATA, parameterName, parameterName.toLowerCase(), elementId, null); else if (found < sufficiend) - addWarning(MessageFormat.format(Messages.AUDITTRAIL_ERR_INSUFFICIENT_DATA_WARN, new Object[]{ parameterName, parameterName.toLowerCase(), elementId})); + addWarning(MessageFormat.format(Simulation_Modeling_Messages.AUDITTRAIL_ERR_INSUFFICIENT_DATA_WARN, new Object[]{ parameterName, parameterName.toLowerCase(), elementId})); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/DurationAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/DurationAuditTrailQuery.java index 65982fc..be2df99 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/DurationAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/DurationAuditTrailQuery.java @@ -15,7 +15,7 @@ import java.sql.SQLException; import org.eclipse.stardust.common.StringUtils; import org.eclipse.stardust.engine.api.runtime.ActivityInstanceState; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.timeutils.Interval; import org.eclipse.stardust.ide.simulation.ui.timeutils.IntervalList; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; @@ -30,13 +30,13 @@ public class DurationAuditTrailQuery implements IAuditTrailQuery { protected DurationAuditTrailQuery(String objectHint, ActivityType[] activities, long startDate, long endDate, String schemaPrefix, String partitionId) { this.objectHint = objectHint; this.sql = "SELECT H.fromtimestamp, H.untiltimestamp-H.fromtimestamp" //$NON-NLS-1$ - + " FROM "+schemaPrefix+"activity_instance I" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"activity A ON A.model=I.model and A.oid=I.activity" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ + + " FROM "+schemaPrefix+"activity_instance I" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+Simulation_Modeling_Messages.DurationAuditTrailQuery_1 //$NON-NLS-1$ + + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ //$NON-NLS-2$ + makePartitionJoin(schemaPrefix, partitionId) - + " INNER JOIN "+schemaPrefix+"act_inst_history H ON H.activityinstance=I.oid and H.state = "+ActivityInstanceState.APPLICATION+"" //$NON-NLS-1$ - + " WHERE I.state="+ActivityInstanceState.COMPLETED+" AND I.starttime >= " + startDate + " AND I.starttime <= " + endDate; //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"act_inst_history H ON H.activityinstance=I.oid and H.state = "+ActivityInstanceState.APPLICATION+"" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " WHERE I.state="+ActivityInstanceState.COMPLETED+" AND I.starttime >= " + startDate + " AND I.starttime <= " + endDate; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (activities.length > 0) { sql += " AND (" + makeActiviteFilter(activities[0]); //$NON-NLS-1$ @@ -53,8 +53,8 @@ public class DurationAuditTrailQuery implements IAuditTrailQuery { } private String makePartitionJoin(String schemaPrefix, String partitionId) { - return StringUtils.isEmpty(partitionId) ? "": - " INNER JOIN "+schemaPrefix+"partition R ON R.oid=M.partition and R.id='" + partitionId + "'"; //$NON-NLS-1$ //$NON-NLS-2$ + return StringUtils.isEmpty(partitionId) ? "": //$NON-NLS-1$ + " INNER JOIN "+schemaPrefix+"partition R ON R.oid=M.partition and R.id='" + partitionId + "'"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } private String makeActiviteFilter(ActivityType activity) { @@ -79,7 +79,7 @@ public class DurationAuditTrailQuery implements IAuditTrailQuery { } database.dispose(rs); } catch (SQLException e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_SQL, e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_SQL, e); } return result; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/OccurrenceAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/OccurrenceAuditTrailQuery.java index 2f57547..dc3c3ab 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/OccurrenceAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/OccurrenceAuditTrailQuery.java @@ -15,7 +15,7 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.timeutils.Interval; import org.eclipse.stardust.ide.simulation.ui.timeutils.IntervalList; import org.eclipse.stardust.ide.simulation.ui.validation.SimulationFailedException; @@ -67,7 +67,7 @@ public class OccurrenceAuditTrailQuery extends DurationAuditTrailQuery { } database.dispose(rs); } catch (SQLException e) { - throw new SimulationFailedException(Messages.AUDITTRAIL_ERR_SQL, e); + throw new SimulationFailedException(Simulation_Modeling_Messages.AUDITTRAIL_ERR_SQL, e); } return result; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionAuditTrailQuery.java index a3a1513..bf3071d 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionAuditTrailQuery.java @@ -20,12 +20,12 @@ public class TransitionAuditTrailQuery extends AppearanceAuditTrailQuery { protected TransitionAuditTrailQuery(String objectHint, TransitionType transition, long startDate, long endDate, String schemaPrefix, String partitionId) { super(objectHint); this.sql = "SELECT AI.lastmodificationtime" //$NON-NLS-1$ - + " FROM "+schemaPrefix+"trans_inst TI" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"transition T ON T.model=TI.model and T.oid=TI.transition" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"activity_instance AI ON AI.model=TI.model and AI.oid=TI.source" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"activity A ON A.model=AI.model and A.oid=AI.activity" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ + + " FROM "+schemaPrefix+"trans_inst TI" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"transition T ON T.model=TI.model and T.oid=TI.transition" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"activity_instance AI ON AI.model=TI.model and AI.oid=TI.source" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"activity A ON A.model=AI.model and A.oid=AI.activity" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ //$NON-NLS-2$ + makePartitionJoin(schemaPrefix, partitionId) + " WHERE AI.state=2 AND AI.starttime >= " + startDate + " AND AI.starttime <= " + endDate //$NON-NLS-1$ //$NON-NLS-2$ + " AND T.id='" + transition.getId() + "'" //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionWorkaroundAuditTrailQuery.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionWorkaroundAuditTrailQuery.java index e41db45..c657dc0 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionWorkaroundAuditTrailQuery.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/audittrail/TransitionWorkaroundAuditTrailQuery.java @@ -25,10 +25,10 @@ public class TransitionWorkaroundAuditTrailQuery extends AppearanceAuditTrailQue protected TransitionWorkaroundAuditTrailQuery(String objectHint, TransitionType transition, long startDate, long endDate, String schemaPrefix, String partitionId) { super(objectHint); this.sql = "SELECT I.starttime" //$NON-NLS-1$ - + " FROM "+schemaPrefix+"activity_instance I" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"activity A ON A.model=I.model and A.oid=I.activity" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ - + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ + + " FROM "+schemaPrefix+"activity_instance I" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"activity A ON A.model=I.model and A.oid=I.activity" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"process_definition P ON P.model=A.model and P.oid=A.processdefinition" //$NON-NLS-1$ //$NON-NLS-2$ + + " INNER JOIN "+schemaPrefix+"model M ON M.oid=P.model" //$NON-NLS-1$ //$NON-NLS-2$ + makePartitionJoin(schemaPrefix, partitionId) + " WHERE I.starttime >= " + startDate + " AND I.starttime <= " + endDate //$NON-NLS-1$ //$NON-NLS-2$ + " AND ( A.id='" + transition.getTo().getId() + "'" //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoubleMinMax.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoubleMinMax.java index 97c1b63..e814dfe 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoubleMinMax.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoubleMinMax.java @@ -28,7 +28,7 @@ public class VerifyDoubleMinMax extends VerifyDoubleFormat { } protected boolean isValid(String text) { - if (min >= 0.0 && text.startsWith("-")) + if (min >= 0.0 && text.startsWith("-")) //$NON-NLS-1$ return false; return super.isValid(text); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoublePositive.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoublePositive.java index 19a62f9..6cfcfac 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoublePositive.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyDoublePositive.java @@ -21,6 +21,6 @@ public class VerifyDoublePositive extends VerifyDoubleFormat { } protected boolean isValid(String text) { - return text.startsWith("-") ? false : super.isValid(text); + return text.startsWith("-") ? false : super.isValid(text); //$NON-NLS-1$ } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerMinMax.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerMinMax.java index f19c0af..8fdcb49 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerMinMax.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerMinMax.java @@ -29,7 +29,7 @@ public class VerifyIntegerMinMax extends VerifyIntegerFormat { } protected boolean isValid(String text) { - if (min >= 0 && text.startsWith("-")) + if (min >= 0 && text.startsWith("-")) //$NON-NLS-1$ return false; return super.isValid(text); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerPositive.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerPositive.java index 5f525fc..90d8006 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerPositive.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/commongui/VerifyIntegerPositive.java @@ -22,6 +22,6 @@ public class VerifyIntegerPositive extends VerifyIntegerFormat { } protected boolean isValid(String text) { - return text.startsWith("-") ? false : super.isValid(text); + return text.startsWith("-") ? false : super.isValid(text); //$NON-NLS-1$ } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGenerator.java index 185cacc..312c14a 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGenerator.java @@ -12,14 +12,14 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Random; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public class BooleanGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_BOOLEAN; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_BOOLEAN; public static final String OPTION_PROBABILITY = "probability"; //$NON-NLS-1$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGeneratorPanel.java index 2fbeb7f..992c46e 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/BooleanGeneratorPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.ScaleTextSynchronizer; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.swt.SWT; @@ -29,7 +29,7 @@ public class BooleanGeneratorPanel extends RandomDataGeneratorPanel { protected BooleanGeneratorPanel(Composite parent, BooleanGenerator configuration) { super(parent, configuration); - Label label = FormBuilder.createLabel(getInnerBody(), Messages.DATA_VALUE_BOOLEAN_PROBABILITY); + Label label = FormBuilder.createLabel(getInnerBody(), Simulation_Modeling_Messages.DATA_VALUE_BOOLEAN_PROBABILITY); Composite probabilityBox = FormBuilder.createComposite(getInnerBody(), 3); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGenerator.java index 74ddd24..a041f25 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGenerator.java @@ -13,13 +13,13 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Random; import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public class CharacterGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_CHARACTER; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_CHARACTER; public static final String OPTION_CHARACTERS = "characters"; //$NON-NLS-1$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGeneratorPanel.java index 8c1d324..67dc046 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/CharacterGeneratorPanel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.datagen; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.stardust.modeling.common.ui.jface.utils.LabeledText; import org.eclipse.swt.widgets.Composite; @@ -23,7 +23,7 @@ public class CharacterGeneratorPanel extends RandomDataGeneratorPanel { protected CharacterGeneratorPanel(Composite parent, CharacterGenerator configuration) { super(parent, configuration); - characters = FormBuilder.createLabeledText(getInnerBody(), Messages.DATA_VALUE_CHARACTERS); + characters = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.DATA_VALUE_CHARACTERS); characters.getText().setText(configuration.getCharacters()); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGenerator.java index 673f322..db3fe72 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGenerator.java @@ -12,13 +12,13 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Random; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; public abstract class NormalDistributionDataGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_NORMAL_RANDOM_DOUBLE0; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_NORMAL_RANDOM_DOUBLE0; public static final String OPTION_SIGMA = "sigma"; //$NON-NLS-1$ public static final String OPTION_MJU = "mju"; //$NON-NLS-1$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGeneratorPanel.java index 026098b..2195907 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDataGeneratorPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerificationStatusHandler; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyDoubleMinMax; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDoubleFunction; @@ -49,13 +49,13 @@ public class NormalDistributionDataGeneratorPanel extends RandomDataGeneratorPan protected NormalDistributionDataGeneratorPanel(Composite parent, NormalDistributionDataGenerator configuration) { super(parent, configuration); - mju = FormBuilder.createLabeledText(getInnerBody(), Messages.MJU); + mju = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.MJU); mju.getText().setText(configuration.getOption(NormalDistributionDataGenerator.OPTION_MJU)); mju.getText().addVerifyListener(new VerifyDoubleMinMax(-999999, 999999, new VerificationStatusHandler() { public void onInvalidValue(String s) { mju.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); - mju.getLabel().setToolTipText(Messages.ERROR_VALUE_OUTSIDE_OF_RANGE); + mju.getLabel().setToolTipText(Simulation_Modeling_Messages.ERROR_VALUE_OUTSIDE_OF_RANGE); } public void onValidValue(String s) { mju.getLabel().setValidationStatus(IQuickValidationStatus.OK); @@ -63,13 +63,13 @@ public class NormalDistributionDataGeneratorPanel extends RandomDataGeneratorPan } })); - sigmaSqr = FormBuilder.createLabeledText(getInnerBody(), Messages.SIGMA); + sigmaSqr = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.SIGMA); sigmaSqr.getText().setText(configuration.getOption(NormalDistributionDataGenerator.OPTION_SIGMA)); sigmaSqr.getText().addVerifyListener(new VerifyDoubleMinMax(0, 999999, new VerificationStatusHandler() { public void onInvalidValue(String s) { sigmaSqr.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); - sigmaSqr.getLabel().setToolTipText(Messages.ERROR_VALUE_OUTSIDE_OF_RANGE); + sigmaSqr.getLabel().setToolTipText(Simulation_Modeling_Messages.ERROR_VALUE_OUTSIDE_OF_RANGE); } public void onValidValue(String s) { sigmaSqr.getLabel().setValidationStatus(IQuickValidationStatus.OK); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDoubleGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDoubleGeneratorPanel.java index 925e596..4e6614b 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDoubleGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionDoubleGeneratorPanel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.datagen; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerificationStatusHandler; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerFormat; import org.eclipse.stardust.modeling.common.platform.validation.IQuickValidationStatus; @@ -28,12 +28,12 @@ public class NormalDistributionDoubleGeneratorPanel extends NormalDistributionDa } protected void initAdditionalControls() { - precision = FormBuilder.createLabeledText(getInnerBody(), Messages.DATA_VALUE_GENERATOR_PRECISION); + precision = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.DATA_VALUE_GENERATOR_PRECISION); precision.getText().setText(configuration.getOption(NormalDistributionDoubleGenerator.OPTION_PRECISION)); precision.getText().addVerifyListener(new VerifyIntegerFormat(new VerificationStatusHandler() { public void onInvalidValue(String s) { precision.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); - precision.getLabel().setToolTipText(Messages.ERROR_INCOMPLETE_VALUE); + precision.getLabel().setToolTipText(Simulation_Modeling_Messages.ERROR_INCOMPLETE_VALUE); } public void onValidValue(String s) { precision.getLabel().setValidationStatus(IQuickValidationStatus.OK); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionIntegerGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionIntegerGeneratorPanel.java index 9355e79..89cbb0f 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionIntegerGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NormalDistributionIntegerGeneratorPanel.java @@ -14,7 +14,7 @@ import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.Arrays; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.stardust.modeling.common.ui.jface.utils.LabeledCombo; import org.eclipse.swt.widgets.Composite; @@ -32,7 +32,7 @@ public class NormalDistributionIntegerGeneratorPanel extends NormalDistributionD } protected void initAdditionalControls() { - multiplicator = FormBuilder.createLabeledCombo(getInnerBody(), Messages.DATA_VALUE_GENERATOR_MULTIPLICATOR); + multiplicator = FormBuilder.createLabeledCombo(getInnerBody(), Simulation_Modeling_Messages.DATA_VALUE_GENERATOR_MULTIPLICATOR); multiplicator.getCombo().setItems(multiplicatorSuggestions); // make a better formatting diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NullDataGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NullDataGenerator.java index 017c305..c7285a9 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NullDataGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/NullDataGenerator.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.datagen; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public class NullDataGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_VALUE_GENERATOR_NULL; + public static final String NAME = Simulation_Modeling_Messages.DATA_VALUE_GENERATOR_NULL; public NullDataGenerator(SimulationInterval interval) { super(interval); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGenerator.java index 9482079..c38d4ce 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGenerator.java @@ -12,14 +12,14 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Random; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public class PoissonDistributionDataGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_POISSON_INTEGER; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_POISSON_INTEGER; public static final String OPTION_LAMBDA = "lambda"; //$NON-NLS-1$ public static final String OPTION_MULTIPLICATOR = "multiplicator"; //$NON-NLS-1$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGeneratorPanel.java index 04e4a71..4c58127 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/PoissonDistributionDataGeneratorPanel.java @@ -16,7 +16,7 @@ import java.util.Arrays; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerificationStatusHandler; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyDoubleMinMax; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDoubleFunction; @@ -58,12 +58,12 @@ public class PoissonDistributionDataGeneratorPanel extends RandomDataGeneratorPa protected PoissonDistributionDataGeneratorPanel(Composite parent, PoissonDistributionDataGenerator configuration) { super(parent, configuration); - lambda = FormBuilder.createLabeledText(getInnerBody(), Messages.LAMBDA); + lambda = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.LAMBDA); lambda.getText().setText(configuration.getOption(PoissonDistributionDataGenerator.OPTION_LAMBDA)); lambda.getText().addVerifyListener(new VerifyDoubleMinMax(0.1, 100.0, new VerificationStatusHandler() { public void onInvalidValue(String s) { lambda.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); - lambda.getLabel().setToolTipText(Messages.ERROR_VALUE_OUTSIDE_OF_RANGE); + lambda.getLabel().setToolTipText(Simulation_Modeling_Messages.ERROR_VALUE_OUTSIDE_OF_RANGE); } public void onValidValue(String s) { lambda.getLabel().setValidationStatus(IQuickValidationStatus.OK); @@ -71,7 +71,7 @@ public class PoissonDistributionDataGeneratorPanel extends RandomDataGeneratorPa } })); - multiplicator = FormBuilder.createLabeledCombo(getInnerBody(), Messages.DATA_VALUE_GENERATOR_MULTIPLICATOR); + multiplicator = FormBuilder.createLabeledCombo(getInnerBody(), Simulation_Modeling_Messages.DATA_VALUE_GENERATOR_MULTIPLICATOR); multiplicator.getCombo().setItems(multiplicatorSuggestions); // make a better formatting diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/RandomDataGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/RandomDataGeneratorPanel.java index e207e2c..93bd6a2 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/RandomDataGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/RandomDataGeneratorPanel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.datagen; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; @@ -30,7 +30,7 @@ public abstract class RandomDataGeneratorPanel extends Composite { layout.numColumns = 1; setLayout(layout); - body = FormBuilder.createGroup(this, Messages.DATA_GENERATOR_OPTIONS, 2); //$NON-NLS-1$ + body = FormBuilder.createGroup(this, Simulation_Modeling_Messages.DATA_GENERATOR_OPTIONS, 2); //$NON-NLS-1$ layout = (GridLayout)body.getLayout(); layout.horizontalSpacing = 5; body.setLayout(layout); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileCalendarGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileCalendarGenerator.java index c6be97b..5935d69 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileCalendarGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileCalendarGenerator.java @@ -20,7 +20,7 @@ import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; public class ResourceFileCalendarGenerator extends ResourceFileDataGenerator { - DateFormat df = new SimpleDateFormat("dd.MM.yyyy HH:mm"); + DateFormat df = new SimpleDateFormat("dd.MM.yyyy HH:mm"); //$NON-NLS-1$ public ResourceFileCalendarGenerator(SimulationInterval interval) { super(interval); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGenerator.java index e5148a4..eaa0a50 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGenerator.java @@ -19,16 +19,16 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.datagen.IResourceReader.CsvReader; import org.eclipse.swt.widgets.Composite; public abstract class ResourceFileDataGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_FILE; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_FILE; public static final String OPTION_FILENAME = "filename"; //$NON-NLS-1$ public static final String OPTION_WITH_HEADER = "header"; //$NON-NLS-1$ @@ -42,7 +42,7 @@ public abstract class ResourceFileDataGenerator extends RandomDataGenerator { public ResourceFileDataGenerator(SimulationInterval interval) { super(interval); - options.put(OPTION_FILENAME, ""); + options.put(OPTION_FILENAME, ""); //$NON-NLS-1$ options.put(OPTION_WITH_HEADER, "true"); //$NON-NLS-1$ reader.put("text/plain", new CsvReader()); //$NON-NLS-1$ @@ -66,13 +66,13 @@ public abstract class ResourceFileDataGenerator extends RandomDataGenerator { } catch (Exception e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_IN_DATA_GENERATOR, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_IN_DATA_GENERATOR, e )); } } else { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_IN_DATA_GENERATOR, null )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_IN_DATA_GENERATOR, null )); } } try { @@ -80,7 +80,7 @@ public abstract class ResourceFileDataGenerator extends RandomDataGenerator { } catch (RuntimeException e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_IN_DATA_GENERATOR, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_IN_DATA_GENERATOR, e )); return null; } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGeneratorPanel.java index de379bd..46a8749 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/ResourceFileDataGeneratorPanel.java @@ -23,7 +23,7 @@ import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.window.Window; import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.validation.ValidationUtils; import org.eclipse.stardust.modeling.common.platform.validation.IQuickValidationStatus; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; @@ -41,8 +41,8 @@ import org.eclipse.ui.dialogs.ResourceListSelectionDialog; public class ResourceFileDataGeneratorPanel extends RandomDataGeneratorPanel { - static final String SUPPORTED_FILE_EXTENSIONS = "txt, csv, dat"; - static final Set SUPPORTED_FILE_EXTENSIONS_SET = new HashSet(Arrays.asList(SUPPORTED_FILE_EXTENSIONS.split(" *, *"))); + static final String SUPPORTED_FILE_EXTENSIONS = "txt, csv, dat"; //$NON-NLS-1$ + static final Set SUPPORTED_FILE_EXTENSIONS_SET = new HashSet(Arrays.asList(SUPPORTED_FILE_EXTENSIONS.split(" *, *"))); //$NON-NLS-1$ LabeledText fileName; Button fileNameBrowse; @@ -51,14 +51,14 @@ public class ResourceFileDataGeneratorPanel extends RandomDataGeneratorPanel { protected ResourceFileDataGeneratorPanel(Composite parent, ResourceFileDataGenerator configuration) { super(parent, configuration); - LabelWithStatus fileNameLabel = FormBuilder.createLabelWithLeftAlignedStatus(getInnerBody(), Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL); + LabelWithStatus fileNameLabel = FormBuilder.createLabelWithLeftAlignedStatus(getInnerBody(), Simulation_Modeling_Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL); Composite composite1 = new Composite(getInnerBody(), SWT.NULL); GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(false).margins(0,0).spacing(5, 0).applyTo(composite1); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(composite1); Text fileNameText = FormBuilder.createText(composite1); - fileNameBrowse = FormBuilder.createButton(composite1, Messages.FILE_SELECTION_BROWSE_BUTTON, + fileNameBrowse = FormBuilder.createButton(composite1, Simulation_Modeling_Messages.FILE_SELECTION_BROWSE_BUTTON, new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { String result = browseFiles(); @@ -77,8 +77,8 @@ public class ResourceFileDataGeneratorPanel extends RandomDataGeneratorPanel { }); FormBuilder.createLabel(getInnerBody(), ""); //$NON-NLS-1$ - withHeader = FormBuilder.createCheckBox(getInnerBody(), Messages.DATA_GENERATION_RESOURCE_FILE_FIRST_LINE_IN_HEADER); - withHeader.setSelection("true".equals(configuration.getOption(ResourceFileDataGenerator.OPTION_WITH_HEADER))); + withHeader = FormBuilder.createCheckBox(getInnerBody(), Simulation_Modeling_Messages.DATA_GENERATION_RESOURCE_FILE_FIRST_LINE_IN_HEADER); + withHeader.setSelection("true".equals(configuration.getOption(ResourceFileDataGenerator.OPTION_WITH_HEADER))); //$NON-NLS-1$ verifyFile(); } @@ -94,14 +94,14 @@ public class ResourceFileDataGeneratorPanel extends RandomDataGeneratorPanel { if (StringUtils.isEmpty(fileNameValue)) { fileName.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); fileName.getLabel().setToolTipText( - ValidationUtils.format(Messages.ERROR_VALUE_IS_NOT_VALID, Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL, fileName.getText().getText())); + ValidationUtils.format(Simulation_Modeling_Messages.ERROR_VALUE_IS_NOT_VALID, Simulation_Modeling_Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL, fileName.getText().getText())); } else { try { if (!ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileNameValue)).exists()) { fileName.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); fileName.getLabel().setToolTipText( - ValidationUtils.format(Messages.ERROR_FILE_NOT_FOUND, Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL, fileName.getText().getText())); + ValidationUtils.format(Simulation_Modeling_Messages.ERROR_FILE_NOT_FOUND, Simulation_Modeling_Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL, fileName.getText().getText())); } else { fileName.getLabel().setValidationStatus(IQuickValidationStatus.OK); @@ -110,7 +110,7 @@ public class ResourceFileDataGeneratorPanel extends RandomDataGeneratorPanel { } catch (RuntimeException e) { fileName.getLabel().setValidationStatus(IQuickValidationStatus.ERRORS); fileName.getLabel().setToolTipText( - ValidationUtils.format(Messages.ERROR_VALUE_IS_NOT_VALID, Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL, fileName.getText().getText())); + ValidationUtils.format(Simulation_Modeling_Messages.ERROR_VALUE_IS_NOT_VALID, Simulation_Modeling_Messages.DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL, fileName.getText().getText())); } } } @@ -123,7 +123,7 @@ public class ResourceFileDataGeneratorPanel extends RandomDataGeneratorPanel { return SUPPORTED_FILE_EXTENSIONS_SET.contains(((IFile)resource).getFileExtension()); return super.select(resource); }}; - dialog.setTitle(MessageFormat.format(Messages.FILE_SELECTION_MESSAGE, new Object[] {SUPPORTED_FILE_EXTENSIONS})); + dialog.setTitle(MessageFormat.format(Simulation_Modeling_Messages.FILE_SELECTION_MESSAGE, new Object[] {SUPPORTED_FILE_EXTENSIONS})); if (dialog.open() == Window.OK) { Object[] files = dialog.getResult(); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGenerator.java index 2b2586e..a4d4630 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGenerator.java @@ -13,14 +13,14 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Calendar; import java.util.Random; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public abstract class TimestampBaseGenerator extends RandomDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_DATE; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_DATE; public static final String OPTION_START_POINT = "startPoint"; //$NON-NLS-1$ public static final String OPTION_END_POINT = "endPoint"; //$NON-NLS-1$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGeneratorPanel.java index 1c6d00c..9ae8464 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/TimestampBaseGeneratorPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Date; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.utils.SimulationDateFormat; import org.eclipse.stardust.ide.simulation.ui.validation.ValidationUtils; import org.eclipse.stardust.modeling.common.platform.validation.IQuickValidationStatus; @@ -38,7 +38,7 @@ public class TimestampBaseGeneratorPanel extends RandomDataGeneratorPanel { protected TimestampBaseGeneratorPanel(Composite parent, TimestampBaseGenerator configuration) { super(parent, configuration); - startPointLabel = FormBuilder.createLabelWithRightAlignedStatus(getInnerBody(), Messages.START_DATE); + startPointLabel = FormBuilder.createLabelWithRightAlignedStatus(getInnerBody(), Simulation_Modeling_Messages.START_DATE); startPoint = new DatePickerCombo(getInnerBody(), SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); startPoint.setDateFormat(SimulationDateFormat.getInteractiveDateFormatInstance()); @@ -54,7 +54,7 @@ public class TimestampBaseGeneratorPanel extends RandomDataGeneratorPanel { } }); - endPointLabel = FormBuilder.createLabelWithRightAlignedStatus(getInnerBody(), Messages.END_DATE); + endPointLabel = FormBuilder.createLabelWithRightAlignedStatus(getInnerBody(), Simulation_Modeling_Messages.END_DATE); endPoint = new DatePickerCombo(getInnerBody(), SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); endPoint.setDateFormat(SimulationDateFormat.getInteractiveDateFormatInstance()); @@ -81,7 +81,7 @@ public class TimestampBaseGeneratorPanel extends RandomDataGeneratorPanel { if (startPoint.getDate() == null) { startPointLabel.setValidationStatus(IQuickValidationStatus.ERRORS); startPointLabel.setToolTipText( - ValidationUtils.format(Messages.ERROR_VALUE_IS_NOT_VALID, Messages.START_DATE, startPoint.getText())); + ValidationUtils.format(Simulation_Modeling_Messages.ERROR_VALUE_IS_NOT_VALID, Simulation_Modeling_Messages.START_DATE, startPoint.getText())); } else { startPointLabel.setValidationStatus(IQuickValidationStatus.OK); @@ -91,7 +91,7 @@ public class TimestampBaseGeneratorPanel extends RandomDataGeneratorPanel { if (endPoint.getDate() == null) { endPointLabel.setValidationStatus(IQuickValidationStatus.ERRORS); endPointLabel.setToolTipText( - ValidationUtils.format(Messages.ERROR_VALUE_IS_NOT_VALID, Messages.END_DATE, endPoint.getText())); + ValidationUtils.format(Simulation_Modeling_Messages.ERROR_VALUE_IS_NOT_VALID, Simulation_Modeling_Messages.END_DATE, endPoint.getText())); } else { endPointLabel.setValidationStatus(IQuickValidationStatus.OK); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDataGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDataGeneratorPanel.java index ec9cd4b..e60f006 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDataGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDataGeneratorPanel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.datagen; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.stardust.modeling.common.ui.jface.utils.LabeledText; import org.eclipse.swt.widgets.Composite; @@ -24,10 +24,10 @@ public class UniformDistributionDataGeneratorPanel extends RandomDataGeneratorPa protected UniformDistributionDataGeneratorPanel(Composite parent, UniformDistributionDataGenerator configuration) { super(parent, configuration); - startPoint = FormBuilder.createLabeledText(getInnerBody(), Messages.START_POINT); + startPoint = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.START_POINT); startPoint.getText().setText(configuration.getOption(UniformDistributionDataGenerator.OPTION_START_POINT)); - endPoint = FormBuilder.createLabeledText(getInnerBody(), Messages.END_POINT); + endPoint = FormBuilder.createLabeledText(getInnerBody(), Simulation_Modeling_Messages.END_POINT); endPoint.getText().setText(configuration.getOption(UniformDistributionDataGenerator.OPTION_END_POINT)); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDoubleGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDoubleGenerator.java index 6921d67..11c9a7f 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDoubleGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionDoubleGenerator.java @@ -12,14 +12,14 @@ package org.eclipse.stardust.ide.simulation.ui.datagen; import java.util.Random; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public class UniformDistributionDoubleGenerator extends UniformDistributionDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_UNIFORM_DOUBLE; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_UNIFORM_DOUBLE; Random random = new Random(System.currentTimeMillis()); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionIntegerGenerator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionIntegerGenerator.java index d1b0b91..69cf100 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionIntegerGenerator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/datagen/UniformDistributionIntegerGenerator.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.datagen; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.swt.widgets.Composite; public class UniformDistributionIntegerGenerator extends UniformDistributionDataGenerator { - public static final String NAME = Messages.DATA_GENERATOR_UNIFORM_INTEGER; + public static final String NAME = Simulation_Modeling_Messages.DATA_GENERATOR_UNIFORM_INTEGER; public UniformDistributionIntegerGenerator(SimulationInterval interval) { super(interval); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/AvailabilityConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/AvailabilityConfiguration.java index 3cca7e3..d040f4c 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/AvailabilityConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/AvailabilityConfiguration.java @@ -18,8 +18,8 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDoubleRange; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableMultiplicator; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; @@ -78,7 +78,7 @@ public class AvailabilityConfiguration extends AbstractRetrievableSimulationSubC } String yearString = attributes.getAttibute(Constants.AVAILABILITY_YEAR, DEFAULT_YEAR_STRING - .replaceAll("@enddate@", Long.toString(interval.getDurationInMillis()))); + .replaceAll("@enddate@", Long.toString(interval.getDurationInMillis()))); //$NON-NLS-1$ yearString = stripUnit(yearString); TimestampValue.stringToList(year, yearString); @@ -94,7 +94,7 @@ public class AvailabilityConfiguration extends AbstractRetrievableSimulationSubC multiplicator.read(attributes); } catch (RuntimeException e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/CustomDistributionConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/CustomDistributionConfiguration.java index 1c4f238..22fd971 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/CustomDistributionConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/CustomDistributionConfiguration.java @@ -15,8 +15,8 @@ import java.util.Arrays; import java.util.List; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDouble; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.AttributeAccessAdapter; @@ -53,7 +53,7 @@ public class CustomDistributionConfiguration extends AbstractSimulationSubConfig DistributionUtils.getDefaultFor(getFullAttributName(Constants.POINTS)))); } catch (Exception e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DataValueGeneratorConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DataValueGeneratorConfiguration.java index d3896b7..81a4a17 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DataValueGeneratorConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DataValueGeneratorConfiguration.java @@ -13,9 +13,9 @@ package org.eclipse.stardust.ide.simulation.ui.distributions; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.datagen.BooleanGenerator; import org.eclipse.stardust.ide.simulation.ui.datagen.CharacterGenerator; import org.eclipse.stardust.ide.simulation.ui.datagen.NormalDistributionDoubleGenerator; @@ -105,11 +105,11 @@ public class DataValueGeneratorConfiguration extends AbstractRetrievableSimulati if (showInfo) SimulationPlugin.getDefault().getLog().log(new Status(IStatus.INFO, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_DATAGENERATOR_RESETED_INFO, null )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_DATAGENERATOR_RESETED_INFO, null )); } catch (RuntimeException e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_DATAGENERATOR_RESETED_WARN, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_DATAGENERATOR_RESETED_WARN, e )); } } } @@ -248,7 +248,7 @@ public class DataValueGeneratorConfiguration extends AbstractRetrievableSimulati } catch (Exception e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_DATAGENERATOR_RESETED_WARN, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_DATAGENERATOR_RESETED_WARN, e )); return new NullDataGenerator(getInterval()); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DistributionFactory.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DistributionFactory.java index 3a8beaa..c7f2645 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DistributionFactory.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DistributionFactory.java @@ -13,8 +13,8 @@ package org.eclipse.stardust.ide.simulation.ui.distributions; import java.util.HashMap; import java.util.Iterator; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; public class DistributionFactory { @@ -29,10 +29,10 @@ public class DistributionFactory { public DistributionFactory(SimulationInterval interval) { this.interval = interval; - distributionsMap.put(NORMAL_DISTRIBUTION_ID, Messages.NORMAL_DISTRIBUTION); - distributionsMap.put(POISSON_DISTRIBUTION_ID, Messages.POISSON_DISTRIBUTION); - distributionsMap.put(UNIFORM_DISTRIBUTION_ID, Messages.UNIFORM_DISTRIBUTION); - distributionsMap.put(CUSTOM_DISTRIBUTION_ID, Messages.CUSTOM_DISTRIBUTION); + distributionsMap.put(NORMAL_DISTRIBUTION_ID, Simulation_Modeling_Messages.NORMAL_DISTRIBUTION); + distributionsMap.put(POISSON_DISTRIBUTION_ID, Simulation_Modeling_Messages.POISSON_DISTRIBUTION); + distributionsMap.put(UNIFORM_DISTRIBUTION_ID, Simulation_Modeling_Messages.UNIFORM_DISTRIBUTION); + distributionsMap.put(CUSTOM_DISTRIBUTION_ID, Simulation_Modeling_Messages.CUSTOM_DISTRIBUTION); } public IDistributionConfiguration create(String distributionTypeId) { diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DurationConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DurationConfiguration.java index a2e188b..710891c 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DurationConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/DurationConfiguration.java @@ -11,8 +11,8 @@ package org.eclipse.stardust.ide.simulation.ui.distributions; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.AttributeAccessAdapter; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.DistributionUtils; @@ -57,7 +57,7 @@ public class DurationConfiguration extends AbstractRetrievableSimulationSubConfi } catch (Exception e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/NormalDistributionConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/NormalDistributionConfiguration.java index 944b509..55bd9b2 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/NormalDistributionConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/NormalDistributionConfiguration.java @@ -11,8 +11,8 @@ package org.eclipse.stardust.ide.simulation.ui.distributions; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDouble; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.AttributeAccessAdapter; @@ -44,7 +44,7 @@ public class NormalDistributionConfiguration extends AbstractSimulationSubConfig } catch (Exception e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/PoissonDistributionConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/PoissonDistributionConfiguration.java index f625f0b..d062277 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/PoissonDistributionConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/PoissonDistributionConfiguration.java @@ -11,8 +11,8 @@ package org.eclipse.stardust.ide.simulation.ui.distributions; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDouble; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.AttributeAccessAdapter; @@ -36,7 +36,7 @@ public class PoissonDistributionConfiguration extends AbstractSimulationSubConfi lambda.read(attributes); } catch (Exception e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/ProbabilityConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/ProbabilityConfiguration.java index 142198a..0002ffc 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/ProbabilityConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/ProbabilityConfiguration.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDoubleRange; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableMultiplicator; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; @@ -57,8 +57,8 @@ public class ProbabilityConfiguration extends AbstractRetrievableSimulationSubCo && attributes.getAttibute(Constants.DISTRIBUTION_TYPE, null) == null; String curveString = attributes.getAttibute(Constants.PROBABILITY_CURVE, DEFAULT_YEAR_STRING - .replaceAll("@enddate@", Long.toString(interval.getDurationInMillis())) - .replaceAll("@probability@", Double.toString(defaultProbability))); + .replaceAll("@enddate@", Long.toString(interval.getDurationInMillis())) //$NON-NLS-1$ + .replaceAll("@probability@", Double.toString(defaultProbability))); //$NON-NLS-1$ curveString = stripUnit(curveString); TimestampValue.stringToList(curve, curveString); multiplicator.read(attributes); @@ -81,7 +81,7 @@ public class ProbabilityConfiguration extends AbstractRetrievableSimulationSubCo } } catch (Exception e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/UniformDistributionConfiguration.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/UniformDistributionConfiguration.java index 5d341a7..1ca5174 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/UniformDistributionConfiguration.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/UniformDistributionConfiguration.java @@ -11,8 +11,8 @@ package org.eclipse.stardust.ide.simulation.ui.distributions; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDouble; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableValue; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.AttributeAccessAdapter; @@ -44,7 +44,7 @@ public class UniformDistributionConfiguration extends AbstractSimulationSubConfi } catch (Exception e) { setNull(); - reportConfigurationReadingError(Messages.ERROR_READING_CONFIGURATION, e); + reportConfigurationReadingError(Simulation_Modeling_Messages.ERROR_READING_CONFIGURATION, e); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/utils/TimeUnitHelper.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/utils/TimeUnitHelper.java index 940a72b..28bce47 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/utils/TimeUnitHelper.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/distributions/utils/TimeUnitHelper.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.stardust.ide.simulation.ui.Constants; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.timeutils.TimestampHelper; @@ -69,32 +69,32 @@ public class TimeUnitHelper { byCalenderType = new HashMap(); addInfo(new TimeUnitHelper(Constants.MILLISECOND, - Messages.UNIT_MILLI, - Messages.SYMBOL_MILLI, + Simulation_Modeling_Messages.UNIT_MILLI, + Simulation_Modeling_Messages.SYMBOL_MILLI, Calendar.MILLISECOND, 1L)); addInfo(new TimeUnitHelper(Constants.SECOND, - Messages.UNIT_SECOND, - Messages.SYMBOL_SECOND, + Simulation_Modeling_Messages.UNIT_SECOND, + Simulation_Modeling_Messages.SYMBOL_SECOND, Calendar.SECOND, 1000L)); addInfo(new TimeUnitHelper(Constants.MINUTE, - Messages.UNIT_MINUTE, - Messages.SYMBOL_MINUTE, + Simulation_Modeling_Messages.UNIT_MINUTE, + Simulation_Modeling_Messages.SYMBOL_MINUTE, Calendar.MINUTE, 1000L * 60L)); addInfo(new TimeUnitHelper(Constants.HOUR, - Messages.UNIT_HOUR, - Messages.SYMBOL_HOUR, + Simulation_Modeling_Messages.UNIT_HOUR, + Simulation_Modeling_Messages.SYMBOL_HOUR, Calendar.HOUR, 1000L * 60L * 60L)); addInfo(new TimeUnitHelper(Constants.DAY, - Messages.UNIT_DAY, - Messages.SYMBOL_DAY, + Simulation_Modeling_Messages.UNIT_DAY, + Simulation_Modeling_Messages.SYMBOL_DAY, Calendar.DAY_OF_YEAR, 1000L * 60L * 60L * 24L)); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationArrivalRatePropertyPage.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationArrivalRatePropertyPage.java index e491b3f..4f0a961 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationArrivalRatePropertyPage.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationArrivalRatePropertyPage.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.propertypages; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.timeline.TimelineEditor; import org.eclipse.stardust.ide.simulation.ui.propertypages.gui.AvailabilityPanel; import org.eclipse.swt.SWT; @@ -24,7 +24,7 @@ public class DefaultSimulationArrivalRatePropertyPage extends DefaultSimulation public Control createCommonBody(Composite parent) { availabilityPanel = new AvailabilityPanel(parent, SWT.NULL, - null, Messages.DAILY_ARRIVAL_RATE, Messages.CALENDAR_ARRIVAL_RATE, Messages.NUMBER_OF_PROCESSES, + null, Simulation_Modeling_Messages.DAILY_ARRIVAL_RATE, Simulation_Modeling_Messages.CALENDAR_ARRIVAL_RATE, Simulation_Modeling_Messages.NUMBER_OF_PROCESSES, TimelineEditor.TYPE_ARRIVAL_RATE); return availabilityPanel; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationAvailabilityPropertyPage.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationAvailabilityPropertyPage.java index 4345511..76f9112 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationAvailabilityPropertyPage.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationAvailabilityPropertyPage.java @@ -13,9 +13,9 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationConfigurationList; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.timeline.TimelineEditor; import org.eclipse.stardust.ide.simulation.ui.distributions.AvailabilityConfiguration; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDoubleRange; @@ -89,7 +89,7 @@ public class DefaultSimulationAvailabilityPropertyPage extends AbstractModelElem public Control createCommonBody(Composite parent) { availabilityPanel = new AvailabilityPanel(parent, SWT.NULL, - Messages.UNLIMITED_AVAILABILITY, Messages.DAILY_AVAILABILITY, Messages.CALENDAR_AVAILABILITY, Messages.AVAILABLE_RESOURCE, + Simulation_Modeling_Messages.UNLIMITED_AVAILABILITY, Simulation_Modeling_Messages.DAILY_AVAILABILITY, Simulation_Modeling_Messages.CALENDAR_AVAILABILITY, Simulation_Modeling_Messages.AVAILABLE_RESOURCE, TimelineEditor.TYPE_PERCENTAGE); return availabilityPanel; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationGatewayProbabilityPropertyPage.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationGatewayProbabilityPropertyPage.java index 548a4f4..d0b5db5 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationGatewayProbabilityPropertyPage.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/DefaultSimulationGatewayProbabilityPropertyPage.java @@ -24,9 +24,9 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationConfigurationList; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.editor.DragListener; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; import org.eclipse.stardust.ide.simulation.ui.distributions.ProbabilityConfiguration; @@ -96,9 +96,9 @@ public class DefaultSimulationGatewayProbabilityPropertyPage extends AbstractMod } else { ProbabilityConfiguration configuration = owner.getConfiguration(transition); - return configuration == null || !configuration.isAnyValue() ? "": - !configuration.isSimpleValue() ? "curve": - Long.toString((long)configuration.getValue())+"%"; + return configuration == null || !configuration.isAnyValue() ? "": //$NON-NLS-1$ + !configuration.isSimpleValue() ? "curve": //$NON-NLS-1$ + Long.toString((long)configuration.getValue())+"%"; //$NON-NLS-1$ } } } @@ -186,7 +186,7 @@ public class DefaultSimulationGatewayProbabilityPropertyPage extends AbstractMod TableUtil.createColumns(table, new String[] { Diagram_Messages.COL_NAME_Id, Diagram_Messages.COL_NAME_Activity, - Messages.PROBABILITY_COLUMN + Simulation_Modeling_Messages.PROBABILITY_COLUMN }); TableUtil.setInitialColumnSizes(table, new int[] { 40, 40, 20 }); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/ModelSimulationPropertyPage.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/ModelSimulationPropertyPage.java index a4e890f..d91f3a4 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/ModelSimulationPropertyPage.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/ModelSimulationPropertyPage.java @@ -15,9 +15,9 @@ import java.util.Iterator; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.InvalidRegistryObjectException; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationConfigurationList; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.model.xpdl.carnot.IModelElement; import org.eclipse.stardust.model.xpdl.carnot.IModelElementNodeSymbol; import org.eclipse.stardust.model.xpdl.carnot.spi.IApplicationPropertyPage; @@ -111,7 +111,7 @@ public class ModelSimulationPropertyPage extends tableManager = new TableManager(tree); tableManager.setColumnSizes(new int[] {70, 30}); - tableManager.setColumnNames(new String[] {Messages.PROPERTY_PAGE_MODEL_COLUMN_NAME, Messages.PROPERTY_PAGE_MODEL_COLUMN_CURRENT}); + tableManager.setColumnNames(new String[] {Simulation_Modeling_Messages.PROPERTY_PAGE_MODEL_COLUMN_NAME, Simulation_Modeling_Messages.PROPERTY_PAGE_MODEL_COLUMN_CURRENT}); tableManager.setAttributeNames(new String[] {"name", "currentString"}); //$NON-NLS-1$ //$NON-NLS-2$ return composite; @@ -126,7 +126,7 @@ public class ModelSimulationPropertyPage extends { final Button[] buttons = new Button[3]; - buttons[0] = FormBuilder.createButton(parent, Messages.PROPERTY_PAGE_MODEL_BUTTON_ADD, new SelectionAdapter() + buttons[0] = FormBuilder.createButton(parent, Simulation_Modeling_Messages.PROPERTY_PAGE_MODEL_BUTTON_ADD, new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -134,7 +134,7 @@ public class ModelSimulationPropertyPage extends } }); - buttons[1] = FormBuilder.createButton(parent, Messages.PROPERTY_PAGE_MODEL_BUTTON_DELETE, new SelectionAdapter() + buttons[1] = FormBuilder.createButton(parent, Simulation_Modeling_Messages.PROPERTY_PAGE_MODEL_BUTTON_DELETE, new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -142,7 +142,7 @@ public class ModelSimulationPropertyPage extends } }); - buttons[2] = FormBuilder.createButton(parent, Messages.PROPERTY_PAGE_MODEL_BUTTON_COPY, new SelectionAdapter() + buttons[2] = FormBuilder.createButton(parent, Simulation_Modeling_Messages.PROPERTY_PAGE_MODEL_BUTTON_COPY, new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/NotificationWorkaround.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/NotificationWorkaround.java index 988e45b..f880b51 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/NotificationWorkaround.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/NotificationWorkaround.java @@ -17,8 +17,8 @@ import java.util.List; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.utils.SimulationNotification; import org.eclipse.stardust.model.xpdl.carnot.IModelElement; import org.eclipse.stardust.modeling.core.editors.parts.NotificationAdapter; @@ -56,7 +56,7 @@ public class NotificationWorkaround { } catch (RuntimeException e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_NOTIFICATION_FAILED, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_NOTIFICATION_FAILED, e )); } } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/SimulationConfigurationPropertyPage.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/SimulationConfigurationPropertyPage.java index 1672237..c5a8d72 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/SimulationConfigurationPropertyPage.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/SimulationConfigurationPropertyPage.java @@ -12,11 +12,11 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; import org.eclipse.stardust.ide.simulation.ui.SimulationConfigurationList; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.propertypages.utils.AttributeAccessForModel; import org.eclipse.stardust.ide.simulation.ui.propertypages.visitors.ChangeRetrieveFromAuditTrailVisitor; import org.eclipse.stardust.ide.simulation.ui.propertypages.visitors.UpdateSimulationIntervalVisitor; @@ -163,26 +163,26 @@ public class SimulationConfigurationPropertyPage extends AbstractModelElementPro { Composite composite = FormBuilder.createComposite(parent, 2); - currentConfigurationCheckBox = FormBuilder.createCheckBox(composite, Messages.IS_CURRENT_CONFIGURATION, 2); - configurationNameText = FormBuilder.createLabeledText(composite, Messages.CONFIGURATION_NAME); - descriptionTextArea = FormBuilder.createLabeledTextArea(composite, Messages.CONFIGURATION_DESCRIPTION); + currentConfigurationCheckBox = FormBuilder.createCheckBox(composite, Simulation_Modeling_Messages.IS_CURRENT_CONFIGURATION, 2); + configurationNameText = FormBuilder.createLabeledText(composite, Simulation_Modeling_Messages.CONFIGURATION_NAME); + descriptionTextArea = FormBuilder.createLabeledTextArea(composite, Simulation_Modeling_Messages.CONFIGURATION_DESCRIPTION); // Configuration interval - FormBuilder.createLabel(composite, Messages.CONFIGURATION_INTERVAL_START, 1); + FormBuilder.createLabel(composite, Simulation_Modeling_Messages.CONFIGURATION_INTERVAL_START, 1); fromDatePicker = new DatePickerCombo(composite, SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); fromDatePicker.setDateFormat(SimulationDateFormat.getInteractiveDateFormatInstance()); fromDatePicker.setLayoutData(FormBuilder.createDefaultSingleLineWidgetGridData()); - FormBuilder.createLabel(composite, Messages.CONFIGURATION_INTERVAL_END, 1); + FormBuilder.createLabel(composite, Simulation_Modeling_Messages.CONFIGURATION_INTERVAL_END, 1); toDatePicker = new DatePickerCombo(composite, SWT.BORDER, DatePickerStyle.BUTTONS_ON_BOTTOM); toDatePicker.setDateFormat(SimulationDateFormat.getInteractiveDateFormatInstance()); toDatePicker.setLayoutData(FormBuilder.createDefaultSingleLineWidgetGridData()); FormBuilder.createHorizontalSeparator(composite, 2); - FormBuilder.createLabel(composite, Messages.CONFIGURATION_ALL_RETRIVEAUDITTRAIL, 2); - enableRetrieveFromAuditTrailOnAll = FormBuilder.createCheckBox(composite, Messages.CONFIGURATION_ALL_RETRIVEAUDITTRAIL_ON, 2); - disableRetrieveFromAuditTrailOnAll = FormBuilder.createCheckBox(composite, Messages.CONFIGURATION_ALL_RETRIVEAUDITTRAIL_OFF, 2); + FormBuilder.createLabel(composite, Simulation_Modeling_Messages.CONFIGURATION_ALL_RETRIVEAUDITTRAIL, 2); + enableRetrieveFromAuditTrailOnAll = FormBuilder.createCheckBox(composite, Simulation_Modeling_Messages.CONFIGURATION_ALL_RETRIVEAUDITTRAIL_ON, 2); + disableRetrieveFromAuditTrailOnAll = FormBuilder.createCheckBox(composite, Simulation_Modeling_Messages.CONFIGURATION_ALL_RETRIVEAUDITTRAIL_OFF, 2); enableRetrieveFromAuditTrailOnAll.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AbstractSimulationPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AbstractSimulationPanel.java index 9f0b764..376aff8 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AbstractSimulationPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AbstractSimulationPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyDoubleFormat; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerMinMax; import org.eclipse.stardust.ide.simulation.ui.curves.data.DiscreteIntegral; @@ -60,7 +60,7 @@ public class AbstractSimulationPanel extends Composite { configStackBox = new StackLayoutComposite(this, SWT.NULL); emptyConfigPanel = new Composite(configStackBox, SWT.NONE); - Label emptyConfigLabel = FormBuilder.createLabel(emptyConfigPanel, Messages.CONFIGURATION_NOT_SELECTED); + Label emptyConfigLabel = FormBuilder.createLabel(emptyConfigPanel, Simulation_Modeling_Messages.CONFIGURATION_NOT_SELECTED); configPanel = new Composite(configStackBox, SWT.NONE); @@ -71,7 +71,7 @@ public class AbstractSimulationPanel extends Composite { } if (showAuditCheckBox()) { - auditCheckBox = FormBuilder.createCheckBox(configPanel, Messages.DERIVED_FROM_AUDIT_TRAIL); + auditCheckBox = FormBuilder.createCheckBox(configPanel, Simulation_Modeling_Messages.DERIVED_FROM_AUDIT_TRAIL); auditCheckBox.addSelectionListener(new SelectionAdapter() {public void widgetSelected(SelectionEvent e) { onAuditCheckBoxChange(); }}); @@ -135,7 +135,7 @@ public class AbstractSimulationPanel extends Composite { } protected double enterDoubleValue(double d) { - InputValueDialog dialog = new InputValueDialog(getShell(), Messages.INPUT_VALUE_DIALOG_TITLE, Double.toString(d), new VerifyDoubleFormat()); + InputValueDialog dialog = new InputValueDialog(getShell(), Simulation_Modeling_Messages.INPUT_VALUE_DIALOG_TITLE, Double.toString(d), new VerifyDoubleFormat()); if (dialog.open() == InputValueDialog.OK) return Double.parseDouble(dialog.getValue()); else @@ -143,7 +143,7 @@ public class AbstractSimulationPanel extends Composite { } protected double enterPCentValue(double d, double pcentFactor) { - InputValueDialog dialog = new InputValueDialog(getShell(), Messages.INPUT_VALUE_DIALOG_TITLE, Long.toString(Math.round(d*pcentFactor)), new VerifyIntegerMinMax(0, 100)); + InputValueDialog dialog = new InputValueDialog(getShell(), Simulation_Modeling_Messages.INPUT_VALUE_DIALOG_TITLE, Long.toString(Math.round(d*pcentFactor)), new VerifyIntegerMinMax(0, 100)); if (dialog.open() == InputValueDialog.OK) return Integer.parseInt(dialog.getValue()) / pcentFactor; else diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCalendarPopupMenu.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCalendarPopupMenu.java index 6bbdef9..6001be6 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCalendarPopupMenu.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCalendarPopupMenu.java @@ -21,7 +21,7 @@ import java.util.Map; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.Platform; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; import org.eclipse.stardust.ide.simulation.ui.curves.timeline.TimelineEditor; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AvailabilityCalendarUtility; @@ -75,7 +75,7 @@ public class AdapterForCalendarPopupMenu implements SelectionListener { MenuItem resetUserDefinedItem = new MenuItem (menu, SWT.PUSH); resetUserDefinedItem.setData(RESET_TO_SELECTED_HOLIDAYS); - resetUserDefinedItem.setText(Messages.BUSINESS_CALENDAR_POPUP_RESET_TO_SELECTED); + resetUserDefinedItem.setText(Simulation_Modeling_Messages.BUSINESS_CALENDAR_POPUP_RESET_TO_SELECTED); resetUserDefinedItem.addSelectionListener(new SelectionListener () { public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); @@ -99,7 +99,7 @@ public class AdapterForCalendarPopupMenu implements SelectionListener { MenuItem removeAllItem = new MenuItem (menu, SWT.PUSH); removeAllItem.setData(REMOVE_ALL_HOLIDAYS); - removeAllItem.setText(Messages.BUSINESS_CALENDAR_POPUP_REMOVE_ALL); + removeAllItem.setText(Simulation_Modeling_Messages.BUSINESS_CALENDAR_POPUP_REMOVE_ALL); removeAllItem.addSelectionListener(this); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCurvePopupMenu.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCurvePopupMenu.java index 7fb1890..2508c2a 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCurvePopupMenu.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForCurvePopupMenu.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import java.text.MessageFormat; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2DList; import org.eclipse.stardust.ide.simulation.ui.curves.timeline.TimelineEditor; @@ -72,7 +72,7 @@ public class AdapterForCurvePopupMenu { if (showRemoveAll) { item = new MenuItem (menu, SWT.PUSH); - item.setText(Messages.TIMELINE_POPUP_REMOVE_ALL_POINTS); + item.setText(Simulation_Modeling_Messages.TIMELINE_POPUP_REMOVE_ALL_POINTS); item.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { onRemoveAllPoints(); @@ -82,7 +82,7 @@ public class AdapterForCurvePopupMenu { if (showResetToZero) { item = new MenuItem(menu, SWT.PUSH); - item.setText(Messages.TIMELINE_POPUP_RESET_TO_ZERO); + item.setText(Simulation_Modeling_Messages.TIMELINE_POPUP_RESET_TO_ZERO); item.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { onResetValue(0.0); @@ -92,7 +92,7 @@ public class AdapterForCurvePopupMenu { if (showResetToDefaultValue) { item = new MenuItem(menu, SWT.PUSH); - item.setText(MessageFormat.format(Messages.TIMELINE_POPUP_RESET_TO_DEFAULT, new Object[] {defaultValueLabel})); + item.setText(MessageFormat.format(Simulation_Modeling_Messages.TIMELINE_POPUP_RESET_TO_DEFAULT, new Object[] {defaultValueLabel})); item.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { onResetValue(defaultValue); @@ -102,7 +102,7 @@ public class AdapterForCurvePopupMenu { if (showResetToDefaultArea) { item = new MenuItem(menu, SWT.PUSH); - item.setText(MessageFormat.format(Messages.TIMELINE_POPUP_RESET_TO_DEFAULT, new Object[] {defaultValueLabel})); + item.setText(MessageFormat.format(Simulation_Modeling_Messages.TIMELINE_POPUP_RESET_TO_DEFAULT, new Object[] {defaultValueLabel})); item.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { onResetToDefaultArea(); @@ -112,7 +112,7 @@ public class AdapterForCurvePopupMenu { if (showOptimize) { item = new MenuItem(menu, SWT.PUSH); - item.setText(Messages.TIMELINE_POPUP_OPTIMIZE_CURVE); + item.setText(Simulation_Modeling_Messages.TIMELINE_POPUP_OPTIMIZE_CURVE); item.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { onOptimize(); @@ -124,7 +124,7 @@ public class AdapterForCurvePopupMenu { item = new MenuItem(menu, SWT.SEPARATOR); item = new MenuItem(menu, SWT.PUSH); - item.setText(Messages.TIMELINE_POPUP_EDIT_DETAILS); + item.setText(Simulation_Modeling_Messages.TIMELINE_POPUP_EDIT_DETAILS); item.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { onOpenMoreOptions(); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForDoubleWidget.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForDoubleWidget.java index 5dd8cb8..9517e23 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForDoubleWidget.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForDoubleWidget.java @@ -14,7 +14,7 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyDoubleFormat; import org.eclipse.stardust.modeling.common.platform.validation.IQuickValidationStatus; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; @@ -84,7 +84,7 @@ public class AdapterForDoubleWidget { public double verify(double value) { if (value < minValue || value > maxValue) { label.setValidationStatus(IQuickValidationStatus.ERRORS); - label.setToolTipText(Messages.ERROR_VALUE_OUTSIDE_OF_RANGE + " " + Messages.ERROR_TRAY_OTHER_TIME_UNIT); //$NON-NLS-1$ + label.setToolTipText(Simulation_Modeling_Messages.ERROR_VALUE_OUTSIDE_OF_RANGE + " " + Simulation_Modeling_Messages.ERROR_TRAY_OTHER_TIME_UNIT); //$NON-NLS-1$ return Math.max(minValue, Math.min(maxValue, value)); } label.setValidationStatus(IQuickValidationStatus.OK); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForIntegerWidget.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForIntegerWidget.java index ce3c571..4387b51 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForIntegerWidget.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForIntegerWidget.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyIntegerFormat; import org.eclipse.stardust.modeling.common.platform.validation.IQuickValidationStatus; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; @@ -78,7 +78,7 @@ public class AdapterForIntegerWidget { public double verify(double value) { if (value < minValue || value > maxValue) { label.setValidationStatus(IQuickValidationStatus.ERRORS); - label.setToolTipText(Messages.ERROR_VALUE_OUTSIDE_OF_RANGE + " " + Messages.ERROR_TRAY_OTHER_TIME_UNIT); //$NON-NLS-1$ + label.setToolTipText(Simulation_Modeling_Messages.ERROR_VALUE_OUTSIDE_OF_RANGE + " " + Simulation_Modeling_Messages.ERROR_TRAY_OTHER_TIME_UNIT); //$NON-NLS-1$ return Math.max(minValue, Math.min(maxValue, value)); } label.setValidationStatus(IQuickValidationStatus.OK); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForSliderButton.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForSliderButton.java index 99c6c2a..4a154d0 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForSliderButton.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AdapterForSliderButton.java @@ -15,7 +15,7 @@ import java.text.NumberFormat; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDoubleRange; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -83,13 +83,13 @@ public class AdapterForSliderButton implements SelectionListener { if (sliderRange != null) currentRange = sliderRange; else if (currentRange == null) - currentRange = new AdjustableDoubleRange(initialRange.getLabel()+" "+counter, + currentRange = new AdjustableDoubleRange(initialRange.getLabel()+" "+counter, //$NON-NLS-1$ initialRange.getMinValue(), initialRange.getMaxValue(), initialRange.getIncrement()); CreateSliderDialog dialog = new CreateSliderDialog(hasSliderButton.getShell(), - Messages.CREATE_SLIDER_TITLE, Messages.CREATE_SLIDER_TEXT, + Simulation_Modeling_Messages.CREATE_SLIDER_TITLE, Simulation_Modeling_Messages.CREATE_SLIDER_TEXT, currentRange, sliderRange != null); hasSliderButton.setToolTipText(""); //$NON-NLS-1$ diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AvailabilityPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AvailabilityPanel.java index ab2c842..8ec8ad8 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AvailabilityPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/AvailabilityPanel.java @@ -16,8 +16,8 @@ import java.util.HashMap; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.data.DiscreteIntegral; import org.eclipse.stardust.ide.simulation.ui.curves.editor.DragListener; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; @@ -286,7 +286,7 @@ public class AvailabilityPanel extends AbstractSimulationPanel { TimeCalculator.fromNow(Calendar.MONTH, 1).toDate()); AvailabilityPanel panel = new AvailabilityPanel(shell, SWT.NULL, - "Some Text", Messages.DAILY_AVAILABILITY, Messages.CALENDAR_AVAILABILITY, Messages.AVAILABLE_RESOURCE, TimelineEditor.TYPE_PERCENTAGE); //$NON-NLS-1$ + "Some Text", Simulation_Modeling_Messages.DAILY_AVAILABILITY, Simulation_Modeling_Messages.CALENDAR_AVAILABILITY, Simulation_Modeling_Messages.AVAILABLE_RESOURCE, TimelineEditor.TYPE_PERCENTAGE); //$NON-NLS-1$ AvailabilityConfiguration ac1 = new AvailabilityConfiguration(intervalConfiguration); ac1.read(new HashMap(), configurationId); panel.setConfiguration(ac1); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/BehaviourPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/BehaviourPanel.java index acb1eb9..84eb7b9 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/BehaviourPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/BehaviourPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.ScaleTextSynchronizer; import org.eclipse.stardust.ide.simulation.ui.distributions.BehaviourConfiguration; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDoubleRange; @@ -44,7 +44,7 @@ public class BehaviourPanel extends AbstractSimulationPanel { Composite efficiencyRatePanel = new Composite(behaviourPanel, SWT.NONE); Label efficiencyRateLabel = new Label(efficiencyRatePanel, SWT.NULL); - efficiencyRateLabel.setText(Messages.EFFICIENCY_RATE); + efficiencyRateLabel.setText(Simulation_Modeling_Messages.EFFICIENCY_RATE); efficiencyRate = new Text(efficiencyRatePanel, SWT.BORDER | SWT.RIGHT); @@ -59,7 +59,7 @@ public class BehaviourPanel extends AbstractSimulationPanel { efficiencyRate.addModifyListener(synchronizer); efficiencyRate.addSelectionListener(synchronizer); - efficiencyRateSlider = new AdapterForSliderButton(efficiencyRatePanel, new AdjustableDoubleRange(Messages.EFFICIENCY_RATE, 0, 100, 10)); + efficiencyRateSlider = new AdapterForSliderButton(efficiencyRatePanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.EFFICIENCY_RATE, 0, 100, 10)); efficiencyRateSlider.addDependentComponent(efficiencyRate); efficiencyRateSlider.addDependentComponent(efficiencyRateScale); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CreateSliderDialog.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CreateSliderDialog.java index 711aa50..d1e7875 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CreateSliderDialog.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CreateSliderDialog.java @@ -17,8 +17,8 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyDoubleFormat; import org.eclipse.stardust.ide.simulation.ui.distributions.utils.AdjustableDoubleRange; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; @@ -60,25 +60,25 @@ public class CreateSliderDialog extends TitleAreaDialog { Composite area = (Composite)super.createDialogArea(parent); Composite panel = FormBuilder.createComposite(area, 2); - Label labelLabel = FormBuilder.createLabel(panel,Messages.CREATE_SLIDER_LABEL); + Label labelLabel = FormBuilder.createLabel(panel,Simulation_Modeling_Messages.CREATE_SLIDER_LABEL); labelText = FormBuilder.createText(panel); labelText.setText(slider.getLabel()); VerifyDoubleFormat verifyFormat = new VerifyDoubleFormat(); - final LabelWithStatus minLabel = FormBuilder.createLabelWithRightAlignedStatus(panel,Messages.CREATE_SLIDER_LOWER_VALUE); + final LabelWithStatus minLabel = FormBuilder.createLabelWithRightAlignedStatus(panel,Simulation_Modeling_Messages.CREATE_SLIDER_LOWER_VALUE); minText = FormBuilder.createText(panel); minText.setText(Double.toString(slider.getMinValue())); minText.addVerifyListener(verifyFormat); minText.addFocusListener(verifyFormat); - final LabelWithStatus maxLabel = FormBuilder.createLabelWithRightAlignedStatus(panel,Messages.CREATE_SLIDER_UPPER_VALUE); + final LabelWithStatus maxLabel = FormBuilder.createLabelWithRightAlignedStatus(panel,Simulation_Modeling_Messages.CREATE_SLIDER_UPPER_VALUE); maxText = FormBuilder.createText(panel); maxText.setText(Double.toString(slider.getMaxValue())); maxText.addVerifyListener(verifyFormat); maxText.addFocusListener(verifyFormat); - final LabelWithStatus incLabel = FormBuilder.createLabelWithRightAlignedStatus(panel,Messages.CREATE_SLIDER_RESOLUTION); + final LabelWithStatus incLabel = FormBuilder.createLabelWithRightAlignedStatus(panel,Simulation_Modeling_Messages.CREATE_SLIDER_RESOLUTION); incText = FormBuilder.createText(panel); incText.setText(Double.toString(slider.getIncrement())); incText.addVerifyListener(verifyFormat); @@ -122,7 +122,7 @@ public class CreateSliderDialog extends TitleAreaDialog { protected void createButtonsForButtonBar(Composite parent) { if (withDelete) { - createButton(parent, IDialogConstants.OK_ID, Messages.CREATE_SLIDER_DELETE_BUTTON, false).addSelectionListener(new SelectionAdapter() { + createButton(parent, IDialogConstants.OK_ID, Simulation_Modeling_Messages.CREATE_SLIDER_DELETE_BUTTON, false).addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { slider = null; } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CurrentConfigurationInfoWidget.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CurrentConfigurationInfoWidget.java index 4e8e448..db72cf4 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CurrentConfigurationInfoWidget.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/CurrentConfigurationInfoWidget.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -30,7 +30,7 @@ public class CurrentConfigurationInfoWidget extends Composite { public CurrentConfigurationInfoWidget(Composite parent, int style) { super(parent, style); - Label label = FormBuilder.createLabel(this, Messages.CURRENT_CONFIGURATION); + Label label = FormBuilder.createLabel(this, Simulation_Modeling_Messages.CURRENT_CONFIGURATION); configurationText = new Text(this, SWT.READ_ONLY); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DataValueGeneratorPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DataValueGeneratorPanel.java index c94a6d3..8cd8214 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DataValueGeneratorPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DataValueGeneratorPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.datagen.RandomDataGenerator; import org.eclipse.stardust.ide.simulation.ui.datagen.RandomDataGeneratorPanel; import org.eclipse.stardust.ide.simulation.ui.distributions.DataValueGeneratorConfiguration; @@ -41,7 +41,7 @@ public class DataValueGeneratorPanel extends AbstractSimulationPanel { Composite generatorBox = new Composite(configPanel, SWT.NONE); - Label generatorLabel = FormBuilder.createLabel(generatorBox, Messages.DATA_VALUE_GENERATOR_TYPE); + Label generatorLabel = FormBuilder.createLabel(generatorBox, Simulation_Modeling_Messages.DATA_VALUE_GENERATOR_TYPE); // TODO: temp generatorLabel.addMouseListener(new MouseAdapter() {public void mouseDoubleClick(MouseEvent e) { diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DistributionsCombo.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DistributionsCombo.java index 56fd3ac..62da9f9 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DistributionsCombo.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DistributionsCombo.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.stardust.modeling.common.ui.jface.utils.LabeledCombo; import org.eclipse.swt.widgets.Combo; @@ -21,8 +21,8 @@ public class DistributionsCombo { private LabeledCombo distributionTypeCombo; - private String[] distributions = { Messages.NORMAL_DISTRIBUTION, Messages.POISSON_DISTRIBUTION, - Messages.UNIFORM_DISTRIBUTION, Messages.CUSTOM_DISTRIBUTION}; + private String[] distributions = { Simulation_Modeling_Messages.NORMAL_DISTRIBUTION, Simulation_Modeling_Messages.POISSON_DISTRIBUTION, + Simulation_Modeling_Messages.UNIFORM_DISTRIBUTION, Simulation_Modeling_Messages.CUSTOM_DISTRIBUTION}; public DistributionsCombo(Composite composite, String type) { distributionTypeCombo = FormBuilder.createLabeledCombo(composite, type); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DurationPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DurationPanel.java index 278411e..1721f4c 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DurationPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/DurationPanel.java @@ -19,7 +19,7 @@ import java.util.Locale; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDiscreteArray; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDoubleFunction; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDoubleFunction.Function; @@ -119,11 +119,11 @@ public class DurationPanel extends AbstractSimulationPanel { Composite distributionPanel = new Composite(configPanel, SWT.NONE); - Label distributionLabel = FormBuilder.createLabel(distributionPanel, Messages.DISTRIBUTION_TYPE); + Label distributionLabel = FormBuilder.createLabel(distributionPanel, Simulation_Modeling_Messages.DISTRIBUTION_TYPE); distributionCombo = new Combo(distributionPanel, SWT.DROP_DOWN | SWT.READ_ONLY); distributionCombo.setItems(new String[] { - Messages.EMPTY_DISTRIBUTION, Messages.NORMAL_DISTRIBUTION, Messages.POISSON_DISTRIBUTION, Messages.UNIFORM_DISTRIBUTION, Messages.CUSTOM_DISTRIBUTION + Simulation_Modeling_Messages.EMPTY_DISTRIBUTION, Simulation_Modeling_Messages.NORMAL_DISTRIBUTION, Simulation_Modeling_Messages.POISSON_DISTRIBUTION, Simulation_Modeling_Messages.UNIFORM_DISTRIBUTION, Simulation_Modeling_Messages.CUSTOM_DISTRIBUTION }); distributionCombo.select(0); distributionCombo.addSelectionListener(new SelectionAdapter() { @@ -168,12 +168,12 @@ public class DurationPanel extends AbstractSimulationPanel { Composite mainPanel = new Composite(parent, SWT.NONE); Control hr0 = FormBuilder.createHorizontalSeparator(mainPanel, 1); - Label headline = FormBuilder.createLabel(mainPanel, Messages.NORMAL_DISTRIBUTION + Messages.DISTRIBUTION_SETTINGS); + Label headline = FormBuilder.createLabel(mainPanel, Simulation_Modeling_Messages.NORMAL_DISTRIBUTION + Simulation_Modeling_Messages.DISTRIBUTION_SETTINGS); headline.setFont(bold(headline.getFont(), headline.getDisplay())); Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - normalMju = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.MJU); + normalMju = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.MJU); normalMju.configure(1, 0, 100, 1); normalMju.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -182,16 +182,16 @@ public class DurationPanel extends AbstractSimulationPanel { }); - normalMjuSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.MJU, 0, 10, 1)); + normalMjuSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.MJU, 0, 10, 1)); normalMjuSlider.addDependentComponent(normalMju.getControl()); - Label normalUnitLabel = FormBuilder.createLabel(settingsPanel, Messages.UNIT); + Label normalUnitLabel = FormBuilder.createLabel(settingsPanel, Simulation_Modeling_Messages.UNIT); normalUnit = new AdapterForTimeUnitWidget(settingsPanel, SWT.NULL); createFill(settingsPanel); - normalSigmaSqr = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.SIGMA); + normalSigmaSqr = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.SIGMA); normalSigmaSqr.configure(1, 0.1, 100, 1); normalSigmaSqr.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -199,7 +199,7 @@ public class DurationPanel extends AbstractSimulationPanel { } }); - normalSigmaSqrSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.SIGMA, 1, 5, 1)); + normalSigmaSqrSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.SIGMA, 1, 5, 1)); normalSigmaSqrSlider.addDependentComponent(normalSigmaSqr.getControl()); normalCanvas = new Canvas(mainPanel, SWT.BORDER); @@ -237,12 +237,12 @@ public class DurationPanel extends AbstractSimulationPanel { Composite mainPanel = new Composite(parent, SWT.NONE); Control hr0 = FormBuilder.createHorizontalSeparator(mainPanel, 1); - Label headline = FormBuilder.createLabel(mainPanel, Messages.POISSON_DISTRIBUTION + Messages.DISTRIBUTION_SETTINGS); + Label headline = FormBuilder.createLabel(mainPanel, Simulation_Modeling_Messages.POISSON_DISTRIBUTION + Simulation_Modeling_Messages.DISTRIBUTION_SETTINGS); headline.setFont(bold(headline.getFont(), headline.getDisplay())); Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - poissonLambda = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.LAMBDA); + poissonLambda = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.LAMBDA); poissonLambda.configure(1, 0.1, 100, 1); poissonLambda.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -250,10 +250,10 @@ public class DurationPanel extends AbstractSimulationPanel { } }); - poissonLambdaSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.LAMBDA, 1, 10, 1)); + poissonLambdaSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.LAMBDA, 1, 10, 1)); poissonLambdaSlider.addDependentComponent(poissonLambda.getControl()); - Label poissonUnitLabel = FormBuilder.createLabel(settingsPanel, Messages.UNIT); + Label poissonUnitLabel = FormBuilder.createLabel(settingsPanel, Simulation_Modeling_Messages.UNIT); poissonUnitLabel.setAlignment(SWT.RIGHT); poissonUnit = new AdapterForTimeUnitWidget(settingsPanel, SWT.NULL); @@ -290,12 +290,12 @@ public class DurationPanel extends AbstractSimulationPanel { Composite mainPanel = new Composite(parent, SWT.NONE); Control hr0 = FormBuilder.createHorizontalSeparator(mainPanel, 1); - Label headline = FormBuilder.createLabel(mainPanel, Messages.UNIFORM_DISTRIBUTION + Messages.DISTRIBUTION_SETTINGS); + Label headline = FormBuilder.createLabel(mainPanel, Simulation_Modeling_Messages.UNIFORM_DISTRIBUTION + Simulation_Modeling_Messages.DISTRIBUTION_SETTINGS); headline.setFont(bold(headline.getFont(), headline.getDisplay())); Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - uniformStart = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.START_POINT); + uniformStart = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.START_POINT); uniformStart.configure(1, 0.0, 500, 1); uniformStart.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -304,10 +304,10 @@ public class DurationPanel extends AbstractSimulationPanel { } }); - uniformStartSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.START_POINT, 0, 10, 1)); + uniformStartSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.START_POINT, 0, 10, 1)); uniformStartSlider.addDependentComponent(uniformStart.getControl()); - Label uniformUnitLabel = FormBuilder.createLabel(settingsPanel, Messages.UNIT); + Label uniformUnitLabel = FormBuilder.createLabel(settingsPanel, Simulation_Modeling_Messages.UNIT); uniformUnitLabel.setAlignment(SWT.RIGHT); uniformUnit = new AdapterForTimeUnitWidget(settingsPanel, SWT.NULL); @@ -319,7 +319,7 @@ public class DurationPanel extends AbstractSimulationPanel { createFill(settingsPanel); - uniformEnd = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.END_POINT); + uniformEnd = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.END_POINT); uniformEnd.configure(1, 0.0, 1500, 1); uniformEnd.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -328,7 +328,7 @@ public class DurationPanel extends AbstractSimulationPanel { } }); - uniformEndSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.END_POINT, 0, 10, 1)); + uniformEndSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.END_POINT, 0, 10, 1)); uniformEndSlider.addDependentComponent(uniformEnd.getControl()); uniformCanvas = new Canvas(mainPanel, SWT.BORDER); @@ -365,12 +365,12 @@ public class DurationPanel extends AbstractSimulationPanel { Composite mainPanel = new Composite(parent, SWT.NONE); Control hr0 = FormBuilder.createHorizontalSeparator(mainPanel, 1); - Label headline = FormBuilder.createLabel(mainPanel, Messages.CUSTOM_DISTRIBUTION + Messages.DISTRIBUTION_SETTINGS); + Label headline = FormBuilder.createLabel(mainPanel, Simulation_Modeling_Messages.CUSTOM_DISTRIBUTION + Simulation_Modeling_Messages.DISTRIBUTION_SETTINGS); headline.setFont(bold(headline.getFont(), headline.getDisplay())); Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - customEnd = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.END_POINT); + customEnd = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.END_POINT); customEnd.configure(1, 0.1, 1500, 1); customEnd.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -378,10 +378,10 @@ public class DurationPanel extends AbstractSimulationPanel { } }); - customEndSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.END_POINT, 1, 10, 1)); + customEndSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.END_POINT, 1, 10, 1)); customEndSlider.addDependentComponent(customEnd.getControl()); - Label customUnitLabel = FormBuilder.createLabel(settingsPanel, Messages.UNIT); + Label customUnitLabel = FormBuilder.createLabel(settingsPanel, Simulation_Modeling_Messages.UNIT); customUnitLabel.setAlignment(SWT.RIGHT); customUnit = new AdapterForTimeUnitWidget(settingsPanel, SWT.NULL); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/EmbeddedDistributionPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/EmbeddedDistributionPanel.java index 5bb1239..fb93b6c 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/EmbeddedDistributionPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/EmbeddedDistributionPanel.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDiscreteArray; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDoubleFunction; import org.eclipse.stardust.ide.simulation.ui.curves.data.DataProviderForDoubleFunction.Function; @@ -92,11 +92,11 @@ public class EmbeddedDistributionPanel extends Composite { public EmbeddedDistributionPanel(Composite parent, int style) { super(parent, style); - Label distributionLabel = FormBuilder.createLabel(this, Messages.DISTRIBUTION_TYPE); + Label distributionLabel = FormBuilder.createLabel(this, Simulation_Modeling_Messages.DISTRIBUTION_TYPE); distributionCombo = new Combo(this, SWT.DROP_DOWN | SWT.READ_ONLY); distributionCombo.setItems(new String[] { - Messages.UNLIMITED_DISTRIBUTION, Messages.NORMAL_DISTRIBUTION, Messages.POISSON_DISTRIBUTION, Messages.UNIFORM_DISTRIBUTION + Simulation_Modeling_Messages.UNLIMITED_DISTRIBUTION, Simulation_Modeling_Messages.NORMAL_DISTRIBUTION, Simulation_Modeling_Messages.POISSON_DISTRIBUTION, Simulation_Modeling_Messages.UNIFORM_DISTRIBUTION }); distributionCombo.select(0); distributionCombo.addSelectionListener(new SelectionAdapter() { @@ -177,7 +177,7 @@ public class EmbeddedDistributionPanel extends Composite { Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - normalMju = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.MJU); + normalMju = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.MJU); normalMju.configure(1, 1, 100, 1); normalMju.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -185,10 +185,10 @@ public class EmbeddedDistributionPanel extends Composite { } }); - normalMjuSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.MJU, 0, 10, 1)); + normalMjuSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.MJU, 0, 10, 1)); normalMjuSlider.addDependentComponent(normalMju.getControl()); - normalSigmaSqr = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.SIGMA); + normalSigmaSqr = new AdapterForDoubleWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.SIGMA); normalSigmaSqr.configure(1, 0.1, 100, 1); normalSigmaSqr.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -196,7 +196,7 @@ public class EmbeddedDistributionPanel extends Composite { } }); - normalSigmaSqrSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.SIGMA, 1, 5, 1)); + normalSigmaSqrSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.SIGMA, 1, 5, 1)); normalSigmaSqrSlider.addDependentComponent(normalSigmaSqr.getControl()); normalCanvas = new Canvas(mainPanel, SWT.BORDER); @@ -231,7 +231,7 @@ public class EmbeddedDistributionPanel extends Composite { Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - poissonLambda = new AdapterForIntegerWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.LAMBDA); + poissonLambda = new AdapterForIntegerWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.LAMBDA); poissonLambda.configure(1, 100, 1); poissonLambda.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -239,7 +239,7 @@ public class EmbeddedDistributionPanel extends Composite { } }); - poissonLambdaSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.LAMBDA, 1, 10, 1)); + poissonLambdaSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.LAMBDA, 1, 10, 1)); poissonLambdaSlider.addDependentComponent(poissonLambda.getControl()); poissonCanvas = new Canvas(mainPanel, SWT.BORDER); @@ -269,7 +269,7 @@ public class EmbeddedDistributionPanel extends Composite { Composite settingsPanel = new Composite(mainPanel, SWT.NONE); - uniformStart = new AdapterForIntegerWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.MAX_TRAVERSAL_COUNT_MIN); + uniformStart = new AdapterForIntegerWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT_MIN); uniformStart.configure(1, 500, 1); uniformStart.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -278,10 +278,10 @@ public class EmbeddedDistributionPanel extends Composite { } }); - uniformStartSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.MAX_TRAVERSAL_COUNT +" " +Messages.MAX_TRAVERSAL_COUNT_MIN, 0, 10, 1)); //$NON-NLS-1$ + uniformStartSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT +" " +Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT_MIN, 0, 10, 1)); //$NON-NLS-1$ uniformStartSlider.addDependentComponent(uniformStart.getControl()); - uniformEnd = new AdapterForIntegerWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Messages.MAX_TRAVERSAL_COUNT_MAX); + uniformEnd = new AdapterForIntegerWidget(settingsPanel, SWT.BORDER | SWT.RIGHT, Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT_MAX); uniformEnd.configure(1, 1500, 1); uniformEnd.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { @@ -290,7 +290,7 @@ public class EmbeddedDistributionPanel extends Composite { } }); - uniformEndSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Messages.MAX_TRAVERSAL_COUNT +" " +Messages.MAX_TRAVERSAL_COUNT_MAX, 0, 10, 1)); //$NON-NLS-1$ + uniformEndSlider = new AdapterForSliderButton(settingsPanel, new AdjustableDoubleRange(Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT +" " +Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT_MAX, 0, 10, 1)); //$NON-NLS-1$ uniformEndSlider.addDependentComponent(uniformEnd.getControl()); uniformCanvas = new Canvas(mainPanel, SWT.BORDER); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/InputValueDialog.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/InputValueDialog.java index fa850c7..3352624 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/InputValueDialog.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/InputValueDialog.java @@ -13,7 +13,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyFormatBase; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.swt.SWT; @@ -43,7 +43,7 @@ public class InputValueDialog extends TrayDialog { final Composite area = (Composite)super.createDialogArea(parent); - Label label= FormBuilder.createLabel(area, Messages.INPUT_VALUE_DIALOG_LABEL); + Label label= FormBuilder.createLabel(area, Simulation_Modeling_Messages.INPUT_VALUE_DIALOG_LABEL); valueText = FormBuilder.createText(area); valueText.setText(value); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/MultiProbabilityPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/MultiProbabilityPanel.java index b07b4bc..ed49c54 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/MultiProbabilityPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/MultiProbabilityPanel.java @@ -12,7 +12,7 @@ package org.eclipse.stardust.ide.simulation.ui.propertypages.gui; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -28,7 +28,7 @@ public class MultiProbabilityPanel extends AbstractSimulationPanel { public MultiProbabilityPanel(Composite parent, int style) { super(parent, style); - Label headline = FormBuilder.createLabel(configPanel, Messages.PROBABILITY_SUBOBJECTS + Messages.DISTRIBUTION_SETTINGS); + Label headline = FormBuilder.createLabel(configPanel, Simulation_Modeling_Messages.PROBABILITY_SUBOBJECTS + Simulation_Modeling_Messages.DISTRIBUTION_SETTINGS); headline.setFont(bold(headline.getFont(), headline.getDisplay())); detailsStackBox = new StackLayoutComposite(configPanel, SWT.NULL); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/ProbabilityPanel.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/ProbabilityPanel.java index 92fb979..c0348fa 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/ProbabilityPanel.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/propertypages/gui/ProbabilityPanel.java @@ -15,8 +15,8 @@ import java.util.HashMap; import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationInterval; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.curves.editor.DragListener; import org.eclipse.stardust.ide.simulation.ui.curves.geometry.Coord2D; import org.eclipse.stardust.ide.simulation.ui.curves.timeline.TimelineEditor; @@ -71,7 +71,7 @@ public class ProbabilityPanel extends AbstractSimulationPanel { protected void buildProbabilityPanel(Composite parent) { // TODO: give panels and widgets more meaningful names curveWidget = new TimelineWidget(parent, SWT.NULL, TimelineEditor.TYPE_PROBABILITY); - curveWidget.setTitleLabel(Messages.PROBABILITY_CURVE); + curveWidget.setTitleLabel(Simulation_Modeling_Messages.PROBABILITY_CURVE); curveWidget.getEditor().addDragListener(new DragListener.Stub() { public void onPopup(Coord2D source, int direction) { if ((direction & (SWT.HORIZONTAL | SWT.VERTICAL)) != 0) { @@ -88,7 +88,7 @@ public class ProbabilityPanel extends AbstractSimulationPanel { curvePopup = AdapterForCurvePopupMenu.createProbabilityMenu(getShell(), curveWidget.getEditor()); curveWidget.setPopupMenu(curvePopup.getMenu()); - multiplicatorSlider = new AdapterForSliderButton(curveWidget.getTitleSlot(), new AdjustableDoubleRange(Messages.PROBABILITY_COLUMN, 0, 100, 10)); + multiplicatorSlider = new AdapterForSliderButton(curveWidget.getTitleSlot(), new AdjustableDoubleRange(Simulation_Modeling_Messages.PROBABILITY_COLUMN, 0, 100, 10)); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).grab(false, false).hint(22, 20).applyTo(multiplicatorSlider.getControl()); multiplicatorStatusText = new Text(curveWidget.getTitleSlot(), SWT.BORDER | SWT.READ_ONLY); @@ -99,7 +99,7 @@ public class ProbabilityPanel extends AbstractSimulationPanel { protected void buildRepetitionDistributionPanel(Composite parent) { Label headline = new Label(parent, SWT.NULL); - headline.setText(Messages.MAX_TRAVERSAL_COUNT); + headline.setText(Simulation_Modeling_Messages.MAX_TRAVERSAL_COUNT); headline.setFont(bold(headline.getFont(), headline.getDisplay())); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(headline); diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/simulation-modeling-messages.properties b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/simulation-modeling-messages.properties new file mode 100644 index 0000000..104f0ee --- a/dev/null +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/simulation-modeling-messages.properties @@ -0,0 +1,141 @@ +CONFIGURATION_NOT_SELECTED=Simulation parameters can not be configured, since no Simulation Configuration \n is defined. Use Model Properties to define a Simulation Configuration. +CURRENT_CONFIGURATION=Current Configuration: + +DISTRIBUTION_TYPE=Distribution Type: +DERIVED_FROM_AUDIT_TRAIL=Derived From Audit Trail Data + +DURATION=Duration +AVAILABILITY=Availability +PROBABILITY=Probability +ARRIVAL_RATE=Arrival rate + +EMPTY_DISTRIBUTION=Select Distribution Type +UNLIMITED_DISTRIBUTION=Unlimited +NORMAL_DISTRIBUTION=Gaussian Distribution +POISSON_DISTRIBUTION=Poisson Distribution +UNIFORM_DISTRIBUTION=Uniform Distribution +CUSTOM_DISTRIBUTION=Custom Distribution +DISTRIBUTION_SETTINGS=\ Settings: + +UNIT=Unit: +UNIT_DAY=Day +UNIT_HOUR=Hour +UNIT_MINUTE=Minute +UNIT_SECOND=Second +UNIT_MILLI=Millisec. + +SYMBOL_DAY=day(s) +SYMBOL_HOUR=h +SYMBOL_MINUTE=min. +SYMBOL_SECOND=sec. +SYMBOL_MILLI=msec. + +LAMBDA=Number of occurrences && variance (\u03bb): +MJU=Expected Value (\u03bc): +SIGMA=Standard Deviation (\u03c3\u00b2 ): +START_POINT=Start Point: +END_POINT=End Point: +START_DATE=Start Date: +END_DATE=End Date: + +UNLIMITED_AVAILABILITY=Unlimited Availability +DAILY_AVAILABILITY=Daily Resource Availability +CALENDAR_AVAILABILITY=Business Calendar +AVAILABLE_RESOURCE=Available Number of Resources +DAILY_ARRIVAL_RATE=Daily Distribution +CALENDAR_ARRIVAL_RATE=Business Calendar +NUMBER_OF_PROCESSES=Arrival Rate + +PROBABILITY_CURVE=Probability (in %) +PROBABILITY_COLUMN=Probability +PROBABILITY_SUBOBJECTS=Transitions +MAX_TRAVERSAL_COUNT=Maximum Traversal Count Per Process Instance: +MAX_TRAVERSAL_COUNT_MIN=Min: +MAX_TRAVERSAL_COUNT_MAX=Max: + +EFFICIENCY_RATE=Efficiency Rate (in %): + +# Simulation configurations +IS_CURRENT_CONFIGURATION=Current Configuration +CONFIGURATION_NAME=Name: +CONFIGURATION_DESCRIPTION=Description: +CONFIGURATION_INTERVAL_START=Interval Start: +CONFIGURATION_INTERVAL_END=Interval End: +CONFIGURATION_ALL_RETRIVEAUDITTRAIL=Change "Derived from Audit Trail Data" Option For All Model Elements: +CONFIGURATION_ALL_RETRIVEAUDITTRAIL_ON=Turn On +CONFIGURATION_ALL_RETRIVEAUDITTRAIL_OFF=Turn Off + + +CREATE_SLIDER_TITLE=Create Slider +CREATE_SLIDER_LABEL=Label + +CREATE_SLIDER_LOWER_VALUE=Lower Value +CREATE_SLIDER_UPPER_VALUE=Upper Value +CREATE_SLIDER_RESOLUTION=Resolution +CREATE_SLIDER_DELETE_BUTTON=Delete +CREATE_SLIDER_TEXT=Create slider for this simulation parameter in order to adjust it during the simulation run. Sliders can be adjusted using the slider view. + +DATA_VALUE_GENERATOR_NULL=Generate null-Values +DATA_VALUE_GENERATOR_TYPE=Data Value Generator +DATA_VALUE_GENERATOR_PRECISION=Precision +DATA_VALUE_GENERATOR_MULTIPLICATOR=Multiplicator +DATA_VALUE_BOOLEAN_PROBABILITY=Probability of "true"-values in %: +DATA_VALUE_CHARACTERS=List of Valid Characters +DATA_GENERATOR_UNIFORM_DOUBLE=Floating-Point Value from Specifed Range +DATA_GENERATOR_FILE=Random Data From External File +DATA_GENERATOR_DATE=Random Date Generator +DATA_GENERATOR_CHARACTER=Random Character from List +DATA_GENERATOR_BOOLEAN=Random true/false Values +DATA_GENERATOR_UNIFORM_INTEGER=Integer Value from Specifed Range +DATA_GENERATOR_POISSON_INTEGER=Random Data According to Poisson Distribution +DATA_GENERATOR_NORMAL_RANDOM_DOUBLE0=Random Data According to Normal Distribution +DATA_GENERATOR_OPTIONS=Data Value Generator Options +DATA_GENERATION_RESOURCE_FILE_RESOURCE_FILE_LABEL=Resource File: +DATA_GENERATION_RESOURCE_FILE_FIRST_LINE_IN_HEADER=First Line is Header +DurationAuditTrailQuery_1=activity A ON A.model=I.model and A.oid=I.activity + +ERROR_INCOMPLETE_VALUE=incomplete value. +ERROR_VALUE_IS_NOT_VALID={0} is not a valid {1}. +ERROR_VALUE_OUTSIDE_OF_RANGE=Value outside of the valid range. +ERROR_TRAY_OTHER_TIME_UNIT=Try another time unit. +ERROR_NOTIFICATION_FAILED=Notification of model changes failed. +ERROR_IN_DATA_GENERATOR=Malfunction of random data generator. Default value returned. +ERROR_READING_CONFIGURATION=Loading configuration failed due to an internal error. +ERROR_INITIALIZING_OVERLAY=Initializing overlay chart failed due to an internal exception. +ERROR_FILE_NOT_FOUND=File {1} not found in workspace. +ERROR_DATAGENERATOR_RESETED_INFO=Configuration of random data generator reset to default values because of type change. +ERROR_DATAGENERATOR_RESETED_WARN=Configuration of random data generator failed because of internal errors. +ERROR_DISTRIBUTION_SET_TO_DEFAULT_INFO=Duration of {0} was probably not configured yet and was changed to custom distribution. +SIMULATION_CONFIGURATION_DEFAULT_NAME=Simulation Configuration +SIMULATION_CONFIGURATION_DEFAULT_DESCRIPTION=Simulation Configuration +FILE_SELECTION_MESSAGE=Select Resource File ({0}) +FILE_SELECTION_BROWSE_BUTTON=Browse... +PROPERTY_PAGE_MODEL_COLUMN_NAME=Name +PROPERTY_PAGE_MODEL_COLUMN_CURRENT=Current +PROPERTY_PAGE_MODEL_BUTTON_ADD=Add +PROPERTY_PAGE_MODEL_BUTTON_DELETE=Delete +PROPERTY_PAGE_MODEL_BUTTON_COPY=Copy +INPUT_VALUE_DIALOG_TITLE=Input value +INPUT_VALUE_DIALOG_LABEL=Input value: +BUSINESS_CALENDAR_POPUP_RESET_TO_SELECTED=Reset to Selected Holidays +TIMELINE_POPUP_REMOVE_ALL_POINTS=Remove All Points +TIMELINE_POPUP_RESET_TO_ZERO=Reset to Zero +TIMELINE_POPUP_OPTIMIZE_CURVE=Optimize Curve +TIMELINE_POPUP_RESET_TO_DEFAULT=Reset to {0} +TIMELINE_POPUP_EDIT_DETAILS=More... +BUSINESS_CALENDAR_POPUP_REMOVE_ALL=Remove All Holidays +MSG_CONFIGURATION_IS_NOT_COMPLETE=Simulation: Configuration is incomplete. See properties for more details. +MSG_INVALID_DATA_GENERATOR=Simulation: Selected random data generator us not suitable for type "{0}". +MSG_PROBABILITY_GT_100=Simulation: Probability exceeds 100% at {0,date} +MSG_TOTAL_PROBABILITY_GT_100=Simulation: Total probability of outgoing transitions exceeds 100% at {0,date} +MSG_ARRIVAL_RATE_GT=Simulation: Arrival rate exceeds 100.000/day at {0,date}, the simulation will require a big amount of memory +EMPTY_STRING=Date + +AUDITTRAIL_ERR_INSUFFICIENT_DATA=Failed to retrieve {0} of {2} from the audit trail database because of insufficient data. +AUDITTRAIL_ERR_INSUFFICIENT_DATA_WARN={0} of {2} retrieved from the audit trail database may by unsuitable because of insufficient data. +AUDITTRAIL_ERR_DRIVER=Driver initialization failed for "{0}" +AUDITTRAIL_ERR_CONNECTION=Connecting database "{0}" failed.\nMake sure your audit trail database is available\nor change the URL in the runtime configuration. +AUDITTRAIL_ERR_SQL=Unexpected error occurred while querying the audit trail database.\nSee error log for more details. +AUDITTRAIL_ERR_CONNECTION_CLOSE=Disconnecting from database failed. +AUDITTRAIL_ERR_CONFIGURATION_INIT=Initialising audit trail configuration failed.\nReason {0}\nSee error log for more details. + diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/ClassifiedTimestampList.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/ClassifiedTimestampList.java index 3425bd0..9da12af 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/ClassifiedTimestampList.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/ClassifiedTimestampList.java @@ -90,7 +90,7 @@ public class ClassifiedTimestampList extends TimestampValueList { } public String toString() { - return "INTERVAL: "+interval.toString()+"\n"+super.toString(); + return "INTERVAL: "+interval.toString()+"\n"+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/TimestampValueList.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/TimestampValueList.java index 9b70bb4..e40593b 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/TimestampValueList.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/timeutils/TimestampValueList.java @@ -221,7 +221,7 @@ public class TimestampValueList { } public String toString() { - return "SIZE: "+ size() + "\nVALUES: " + impl.toString(); + return "SIZE: "+ size() + "\nVALUES: " + impl.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationDateFormat.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationDateFormat.java index 851a868..efcc037 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationDateFormat.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationDateFormat.java @@ -22,8 +22,8 @@ public class SimulationDateFormat { // correct the year to be 4 digits String pattern = ((SimpleDateFormat)defaultShortDateFormat).toPattern(); - if (pattern.indexOf("yyyy") == -1 && pattern.indexOf("yy") != -1) { - pattern = pattern.replaceAll("yy", "yyyy"); + if (pattern.indexOf("yyyy") == -1 && pattern.indexOf("yy") != -1) { //$NON-NLS-1$ //$NON-NLS-2$ + pattern = pattern.replaceAll("yy", "yyyy"); //$NON-NLS-1$ //$NON-NLS-2$ } return new SimpleDateFormat(pattern); } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationModelUtils.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationModelUtils.java index dfa0777..a34267c 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationModelUtils.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/utils/SimulationModelUtils.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EObject; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationPlugin; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.model.xpdl.carnot.ActivityType; import org.eclipse.stardust.model.xpdl.carnot.IModelElement; import org.eclipse.stardust.model.xpdl.carnot.JoinSplitType; @@ -48,7 +48,7 @@ public class SimulationModelUtils { } catch (RuntimeException e) { SimulationPlugin.getDefault().getLog().log(new Status(IStatus.WARNING, SimulationPlugin.getDefault().getBundle().getSymbolicName(), - IStatus.OK, Messages.ERROR_NOTIFICATION_FAILED, e )); + IStatus.OK, Simulation_Modeling_Messages.ERROR_NOTIFICATION_FAILED, e )); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/SimulationConfigurationValidator.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/SimulationConfigurationValidator.java index 63660d7..c933494 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/SimulationConfigurationValidator.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/SimulationConfigurationValidator.java @@ -16,8 +16,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.eclipse.stardust.ide.simulation.ui.Messages; import org.eclipse.stardust.ide.simulation.ui.SimulationConfiguration; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.distributions.AbstractRetrievableSimulationSubConfiguration; import org.eclipse.stardust.ide.simulation.ui.distributions.AvailabilityConfiguration; import org.eclipse.stardust.ide.simulation.ui.distributions.DataValueGeneratorConfiguration; @@ -75,13 +75,13 @@ public class SimulationConfigurationValidator implements IModelElementValidator, if (overflowOffset >= 0) { Date overflowDate = new Date(simulationConfiguration.getInterval().getStartDate().getTime()+overflowOffset); issues.add(Issue.warning(element, - MessageFormat.format(Messages.MSG_ARRIVAL_RATE_GT, new Object[] {overflowDate}), + MessageFormat.format(Simulation_Modeling_Messages.MSG_ARRIVAL_RATE_GT, new Object[] {overflowDate}), ValidationService.PKG_CWM.getProcessDefinitionType())); } if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getProcessDefinitionType())); } } @@ -105,7 +105,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, if (overflowOffset >= 0) { Date overflowDate = new Date(simulationConfiguration.getInterval().getStartDate().getTime()+overflowOffset); issues.add(Issue.error((IModelElement) element.getOutTransitions().get(j), - MessageFormat.format(Messages.MSG_PROBABILITY_GT_100, new Object[] {overflowDate}), + MessageFormat.format(Simulation_Modeling_Messages.MSG_PROBABILITY_GT_100, new Object[] {overflowDate}), ValidationService.PKG_CWM.getTransitionType_To())); } } @@ -124,7 +124,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, if (overflowOffset >= 0) { Date overflowDate = new Date(simulationConfiguration.getInterval().getStartDate().getTime()+overflowOffset); issues.add(Issue.error(element, - MessageFormat.format(Messages.MSG_TOTAL_PROBABILITY_GT_100, new Object[] {overflowDate}), + MessageFormat.format(Simulation_Modeling_Messages.MSG_TOTAL_PROBABILITY_GT_100, new Object[] {overflowDate}), ValidationService.PKG_CWM.getTransitionType_To())); } } @@ -146,7 +146,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, configuration.read(element, simulationConfiguration.getId()); if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getActivityType())); } } @@ -158,7 +158,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, configuration.read(element, simulationConfiguration.getId()); if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getApplicationType())); } } @@ -167,7 +167,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, configuration.read(element, simulationConfiguration.getId()); if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getApplicationType())); } } @@ -177,7 +177,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, configuration.read(element, simulationConfiguration.getId()); if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getParticipantType())); } } @@ -187,7 +187,7 @@ public class SimulationConfigurationValidator implements IModelElementValidator, configuration.read(element, simulationConfiguration.getId()); if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getTransitionType())); } } @@ -201,12 +201,12 @@ public class SimulationConfigurationValidator implements IModelElementValidator, } else if (!configuration.getDataTypeClassId().equals(DataValueGeneratorConfiguration.retrieveDataTypeClass(element))) { issues.add(Issue.warning(element, - MessageFormat.format(Messages.MSG_INVALID_DATA_GENERATOR, new Object[]{DataValueGeneratorConfiguration.retrieveDataTypeClass(element)}), + MessageFormat.format(Simulation_Modeling_Messages.MSG_INVALID_DATA_GENERATOR, new Object[]{DataValueGeneratorConfiguration.retrieveDataTypeClass(element)}), ValidationService.PKG_CWM.getDataType())); } else if (!configuration.isComplete()) { issues.add(Issue.warning(element, - Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, + Simulation_Modeling_Messages.MSG_CONFIGURATION_IS_NOT_COMPLETE, ValidationService.PKG_CWM.getDataType())); } } diff --git a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/ValidationUtils.java b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/ValidationUtils.java index cd96ece..3bc7f84 100644 --- a/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/ValidationUtils.java +++ b/org.eclipse.stardust.ide.simulation.ui/src/org/eclipse/stardust/ide/simulation/ui/validation/ValidationUtils.java @@ -14,7 +14,7 @@ import java.text.MessageFormat; import java.util.Date; import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.ide.simulation.ui.Messages; +import org.eclipse.stardust.ide.simulation.ui.Simulation_Modeling_Messages; import org.eclipse.stardust.ide.simulation.ui.commongui.VerifyFormatBase; import org.eclipse.stardust.ide.simulation.ui.utils.SimulationDateFormat; import org.eclipse.swt.widgets.Combo; @@ -87,6 +87,6 @@ public class ValidationUtils { } public static String quote(String value) { - return StringUtils.isEmpty(value) ? Messages.EMPTY_STRING : "\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ + return StringUtils.isEmpty(value) ? Simulation_Modeling_Messages.EMPTY_STRING : "\""+value+"\""; //$NON-NLS-1$ //$NON-NLS-2$ } } |