diff options
846 files changed, 2012 insertions, 2007 deletions
diff --git a/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java b/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java index 5a9ac1478..8df659289 100644 --- a/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java +++ b/org.eclipse.jubula.app.autagent/src/org/eclipse/jubula/app/autagent/AutAgentApplication.java @@ -39,9 +39,9 @@ import org.eclipse.jubula.autagent.AutStarter.Verbosity; import org.eclipse.jubula.autagent.agent.AutAgent; import org.eclipse.jubula.autagent.desktop.DesktopIntegration; import org.eclipse.jubula.communication.connection.ConnectionState; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java index efd0c28aa..444a27004 100644 --- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java +++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java @@ -29,10 +29,10 @@ import org.apache.commons.lang.StringUtils; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.jubula.app.autrun.i18n.Messages; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java index 11618d482..842298caf 100644 --- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java +++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java @@ -24,8 +24,8 @@ import org.eclipse.jubula.app.autrun.i18n.Messages; import org.eclipse.jubula.autagent.commands.IStartAut; import org.eclipse.jubula.communication.connection.ConnectionState; import org.eclipse.jubula.communication.connection.RestartAutProtocol; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.app.dbtool/.project b/org.eclipse.jubula.app.dbtool/.project index a087a5e9f..2482605e3 100644 --- a/org.eclipse.jubula.app.dbtool/.project +++ b/org.eclipse.jubula.app.dbtool/.project @@ -31,6 +31,13 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </natures> + <linkedResources> + <link> + <name>.settings</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.7</locationURI> + </link> + </linkedResources> <filteredResources> <filter> <id>1409218333740</id> @@ -42,11 +49,4 @@ </matcher> </filter> </filteredResources> - <linkedResources> - <link> - <name>.settings</name> - <type>2</type> - <locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.7</locationURI> - </link> - </linkedResources> </projectDescription> diff --git a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java index f874d4f28..1a37fa30b 100644 --- a/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java +++ b/org.eclipse.jubula.app.dbtool/src/org/eclipse/jubula/app/dbtool/core/DBToolClient.java @@ -37,11 +37,11 @@ import org.eclipse.jubula.client.core.persistence.Persistor; import org.eclipse.jubula.client.core.persistence.ProjectPM; import org.eclipse.jubula.client.core.persistence.TestResultPM; import org.eclipse.jubula.client.core.persistence.TestResultSummaryPM; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.osgi.util.NLS; diff --git a/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java index c072b75f3..cc637b8d1 100644 --- a/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java +++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java @@ -23,9 +23,9 @@ import org.eclipse.jubula.client.cmd.i18n.Messages; import org.eclipse.jubula.client.core.businessprocess.ClientTestStrings; import org.eclipse.jubula.client.core.constants.Constants; import org.eclipse.jubula.client.core.constants.TestExecutionConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java index 48be82897..d6f0f417c 100644 --- a/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java +++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java @@ -74,16 +74,16 @@ import org.eclipse.jubula.client.core.utils.TreeTraverser; import org.eclipse.jubula.client.internal.AutAgentConnection; import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.FileUtils; -import org.eclipse.jubula.tools.utils.NetUtil; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.FileUtils; +import org.eclipse.jubula.tools.internal.utils.NetUtil; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java index 23066e458..6f182dfd7 100644 --- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java +++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchAdvisor.java @@ -31,10 +31,10 @@ import org.eclipse.jubula.client.ui.constants.Constants; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.Plugin.ClientStatus; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.JBRuntimeException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.JBRuntimeException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.service.datalocation.Location; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java index 07171dcf1..c975113e8 100644 --- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java +++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/core/JubulaWorkbenchWindowAdvisor.java @@ -38,7 +38,7 @@ import org.eclipse.jubula.client.ui.rcp.businessprocess.ProjectUIBP; import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.utils.CommandHelper; import org.eclipse.jubula.client.ui.utils.JobUtils; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchPage; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java index 0eca30fed..61cc1629e 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java @@ -35,14 +35,14 @@ import org.eclipse.jubula.communication.listener.ICommunicationErrorListener; import org.eclipse.jubula.communication.message.AutRegisteredMessage; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.StartAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.AUTServerExitConstants; -import org.eclipse.jubula.tools.constants.AUTStartResponse; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.DevNull; +import org.eclipse.jubula.tools.internal.constants.AUTServerExitConstants; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.DevNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java index 20c1965af..9dff22bb4 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java @@ -36,13 +36,13 @@ import org.eclipse.jubula.communication.message.ConnectToClientMessage; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.PrepareForShutdownMessage; import org.eclipse.jubula.communication.message.StartAUTServerMessage; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.StringParsing; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.StringParsing; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java index d918b1fe3..d55ca884a 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutAutRun.java @@ -16,7 +16,7 @@ import java.io.PrintWriter; import java.net.Socket; import org.eclipse.jubula.communication.connection.RestartAutProtocol; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java index e51cd1a84..190c88455 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/RestartAutConfiguration.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.autagent.agent; import org.eclipse.jubula.autagent.commands.StartAUTServerCommand; import org.eclipse.jubula.communication.message.StartAUTServerMessage; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** * Restarts an AUT that was started via an AUT Configuration. diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java index 0045c3e0a..651feac51 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java @@ -27,12 +27,12 @@ import org.eclipse.jubula.autagent.monitoring.IMonitoring; import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore; import org.eclipse.jubula.autagent.monitoring.MonitoringUtil; import org.eclipse.jubula.communication.message.StartAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.AUTStartResponse; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.constants.MonitoringConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.jarutils.MainClassLocator; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.MonitoringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.jarutils.MainClassLocator; import org.eclipse.osgi.service.datalocation.Location; import org.osgi.framework.Bundle; import org.slf4j.Logger; @@ -318,7 +318,7 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut { // set agent and locals sb.append(JAVA_OPTIONS_INTRO); - if (org.eclipse.jubula.tools.utils.MonitoringUtil + if (org.eclipse.jubula.tools.internal.utils.MonitoringUtil .shouldAndCanRunWithMonitoring(parameters)) { String monAgent = getMonitoringAgent(parameters); if (monAgent != null) { @@ -339,7 +339,7 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut { .append(locale.getLanguage()); } } else { - if (org.eclipse.jubula.tools.utils.MonitoringUtil + if (org.eclipse.jubula.tools.internal.utils.MonitoringUtil .shouldAndCanRunWithMonitoring(parameters)) { String monAgent = getMonitoringAgent(parameters); if (monAgent != null) { diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java index ce9a9a19a..266a97fcd 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java @@ -22,9 +22,9 @@ import java.util.Vector; import org.apache.commons.lang.StringUtils; import org.eclipse.jubula.autagent.AutStarter; import org.eclipse.jubula.communication.Communicator; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java index ab0b43fe3..28c770b65 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java @@ -5,7 +5,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.Map; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java index b48aa2fe2..55253eb70 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java @@ -28,12 +28,12 @@ import org.eclipse.jubula.autagent.AutStarter; import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore; import org.eclipse.jubula.autagent.monitoring.MonitoringUtil; import org.eclipse.jubula.communication.message.StartAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.AUTStartResponse; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.AutEnvironmentConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; -import org.eclipse.jubula.tools.utils.ZipUtil; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.AutEnvironmentConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.utils.ZipUtil; import org.osgi.framework.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java index 8d0894c6d..8dbd4e2a9 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/GetRegisteredAutListCommand.java @@ -18,7 +18,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.GetRegisteredAutListMessage; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.RegisteredAutListMessage; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java index 472998437..436ed0b0c 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java @@ -15,8 +15,8 @@ import java.util.Map; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.StartAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.AUTStartResponse; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java index b620c49cb..8a6444c8f 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RecordActionCommand.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.CAPRecordedMessage; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.RecordActionMessage; -import org.eclipse.jubula.tools.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java index 2f372e214..3bedf9cc1 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/RestartAutCommand.java @@ -17,8 +17,8 @@ import org.eclipse.jubula.autagent.monitoring.MonitoringDataStore; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.RestartAutMessage; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java index ff2ff40a3..8d6a85105 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/ShowObservInfoCommand.java @@ -14,7 +14,7 @@ import org.eclipse.jubula.autagent.remote.dialogs.ObservationConsoleBP; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.ShowObservInfoMessage; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java index c5199699e..2a652d190 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java @@ -17,7 +17,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.StartAUTServerMessage; import org.eclipse.jubula.communication.message.StartAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java index 3aacf7471..3c8227589 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java @@ -15,8 +15,8 @@ import java.util.Map; import java.util.Vector; import org.eclipse.jubula.autagent.AutStarter; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; /**
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java index 78599e38a..898204730 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java @@ -15,9 +15,9 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.utils.MonitoringUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.utils.MonitoringUtil; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java index 104a48619..2eb171309 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java @@ -18,12 +18,12 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.constants.RcpAccessorConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; -import org.eclipse.jubula.tools.utils.MonitoringUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.RcpAccessorConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.utils.MonitoringUtil; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java index 8a0f8a6de..3915aa570 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java @@ -15,9 +15,9 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.utils.MonitoringUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.utils.MonitoringUtil; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java index 5fa529608..5eb0b4361 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java @@ -16,11 +16,11 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.constants.RcpAccessorConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.RcpAccessorConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java index 2e5f0ef84..12b9d5b80 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/desktop/DesktopIntegration.java @@ -29,8 +29,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jubula.autagent.agent.AutAgent; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java index 1566d54c5..e2f1ba1f2 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java @@ -20,7 +20,7 @@ import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JOptionPane; -import org.eclipse.jubula.tools.i18n.I18n; +import org.eclipse.jubula.tools.internal.i18n.I18n; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java index dd5f60285..23649171b 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/AbstractMonitoring.java @@ -16,7 +16,7 @@ import java.io.OutputStream; import java.util.HashMap; import java.util.Map; -import org.eclipse.jubula.tools.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java index 2129f493f..618f6d27d 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java @@ -21,7 +21,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.BuildMonitoringReportMessage; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.SendMonitoringReportMessage; -import org.eclipse.jubula.tools.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java index 99d014ed4..f059bffe4 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/GetMonitoringDataCommand.java @@ -18,9 +18,9 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.GetMonitoringDataMessage; import org.eclipse.jubula.communication.message.GetMonitoringDataResponseMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java index 0ad80d737..b56157e47 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/IMonitoring.java @@ -14,7 +14,7 @@ import java.io.File; import java.io.OutputStream; import java.util.Map; -import org.eclipse.jubula.tools.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; /** * This interface contains all methods which will be called during monitoring execution. diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringUtil.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringUtil.java index 1c205ba35..6236d9daf 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringUtil.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringUtil.java @@ -15,7 +15,7 @@ import java.util.Set; import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.agent.AutAgent;
-import org.eclipse.jubula.tools.registration.AutIdentifier;
+import org.eclipse.jubula.tools.internal.registration.AutIdentifier;
/**
* This class contains monitoring utility methods
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java index 05ca43f76..33af7cb65 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialog.java @@ -32,11 +32,11 @@ import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.border.Border; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.Param; -import org.eclipse.jubula.tools.xml.businessmodell.ValueSetElement; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ValueSetElement; /** diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java index 5cc173bee..05b1f8e58 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java @@ -34,13 +34,13 @@ import org.eclipse.jubula.communication.message.ChangeAUTModeMessage; import org.eclipse.jubula.communication.message.MessageCap; import org.eclipse.jubula.communication.message.MessageParam; import org.eclipse.jubula.communication.message.ServerShowDialogResponseMessage; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java index c214f462b..d68b5d07b 100644 --- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java +++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsole.java @@ -22,7 +22,7 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.border.Border; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/ALMChange.java b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/ALMChange.java index 56df98fad..e4ec75c49 100644 --- a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/ALMChange.java +++ b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/ALMChange.java @@ -5,7 +5,7 @@ import java.util.Date; import org.eclipse.jubula.client.alm.mylyn.core.i18n.Messages; import org.eclipse.jubula.client.core.constants.Constants; import org.eclipse.jubula.client.core.model.TestResultNode; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** * Class which represents a change, e.g. a comment or a field update, diff --git a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/CommentEntry.java b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/CommentEntry.java index 8a5674ea1..d7bcb5162 100644 --- a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/CommentEntry.java +++ b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/model/CommentEntry.java @@ -6,7 +6,7 @@ import org.eclipse.jubula.client.core.model.IExecTestCasePO; import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.core.model.ISpecTestCasePO; import org.eclipse.jubula.client.core.model.TestResultNode; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.osgi.util.NLS; /** diff --git a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/utils/ALMAccess.java b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/utils/ALMAccess.java index 0a6f7f4c3..2169f5cbe 100644 --- a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/utils/ALMAccess.java +++ b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/utils/ALMAccess.java @@ -27,7 +27,7 @@ import org.eclipse.jubula.client.alm.mylyn.core.i18n.Messages; import org.eclipse.jubula.client.alm.mylyn.core.model.ALMChange; import org.eclipse.jubula.client.alm.mylyn.core.model.CommentEntry; import org.eclipse.jubula.client.alm.mylyn.core.model.FieldUpdate; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.mylyn.commons.net.AuthenticationType; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.IRepositoryManager; diff --git a/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/EditorContextStructureBridge.java b/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/EditorContextStructureBridge.java index 71431083b..0cecf3abe 100644 --- a/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/EditorContextStructureBridge.java +++ b/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/EditorContextStructureBridge.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.ui.rcp.editors.AbstractJBEditor; import org.eclipse.jubula.client.ui.rcp.editors.NodeEditorInput; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.mylyn.context.core.AbstractContextStructureBridge; import org.eclipse.mylyn.context.core.ContextCore; import org.eclipse.ui.part.EditorPart; diff --git a/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/NodeStructureBridge.java b/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/NodeStructureBridge.java index 67e402855..baf498f4b 100644 --- a/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/NodeStructureBridge.java +++ b/org.eclipse.jubula.client.alm.mylyn.ui.bridge/src/org/eclipse/jubula/client/alm/mylyn/ui/bridge/bridge/NodeStructureBridge.java @@ -25,8 +25,8 @@ import org.eclipse.jubula.client.core.persistence.NodePM; import org.eclipse.jubula.client.core.persistence.ProjectPM; import org.eclipse.jubula.client.ui.rcp.search.result.BasicSearchResult.SearchResultElement; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; import org.eclipse.mylyn.context.core.AbstractContextStructureBridge; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.alm.mylyn.ui/src/org/eclipse/jubula/client/alm/mylyn/ui/mapping/TestResultNodeTaskMapping.java b/org.eclipse.jubula.client.alm.mylyn.ui/src/org/eclipse/jubula/client/alm/mylyn/ui/mapping/TestResultNodeTaskMapping.java index b340465bd..4045cdc38 100644 --- a/org.eclipse.jubula.client.alm.mylyn.ui/src/org/eclipse/jubula/client/alm/mylyn/ui/mapping/TestResultNodeTaskMapping.java +++ b/org.eclipse.jubula.client.alm.mylyn.ui/src/org/eclipse/jubula/client/alm/mylyn/ui/mapping/TestResultNodeTaskMapping.java @@ -15,7 +15,7 @@ import java.util.Date; import org.eclipse.jubula.client.alm.mylyn.ui.i18n.Messages; import org.eclipse.jubula.client.core.model.TestResultNode; import org.eclipse.jubula.client.ui.controllers.propertysources.TestResultNodePropertySource; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.mylyn.tasks.core.TaskMapping; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java index e5acaf51f..efc840ce8 100644 --- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java +++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java @@ -26,11 +26,11 @@ import org.eclipse.jubula.client.core.utils.AbstractNonPostOperatingTreeNodeOper import org.eclipse.jubula.client.core.utils.ITreeTraverserContext; import org.eclipse.jubula.client.core.utils.TreeTraverser; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.ToolkitConstants; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.ToolkitConstants; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; /** * * @author volker diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/AUTAgent.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/AUTAgent.java index ce06b036f..d1754c3d3 100644 --- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/AUTAgent.java +++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/AUTAgent.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client; import org.eclipse.jubula.client.launch.AUTConfiguration; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** @author BREDEX GmbH */ public interface AUTAgent extends Remote { diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java index 02742e126..cff919c04 100644 --- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java +++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/AutAgentConnection.java @@ -15,7 +15,7 @@ import java.net.UnknownHostException; import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.communication.Communicator; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java index 3339d8e35..14bd9fa4a 100644 --- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java +++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/BaseConnection.java @@ -16,9 +16,9 @@ import org.eclipse.jubula.communication.Communicator; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.listener.ICommunicationErrorListener; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/exceptions/ConnectionException.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/exceptions/ConnectionException.java index 5518887db..94b079617 100644 --- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/exceptions/ConnectionException.java +++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/exceptions/ConnectionException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.internal.exceptions; -import org.eclipse.jubula.tools.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; /** * An exception thrown if a connection to the AUT-Agent or to the AUTServer diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java index ee4d5a0ff..2518ccbd6 100644 --- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java +++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/internal/impl/AUTAgentImpl.java @@ -19,10 +19,10 @@ import org.eclipse.jubula.client.launch.AUTConfiguration; import org.eclipse.jubula.communication.Communicator; import org.eclipse.jubula.communication.message.StartAUTServerMessage; import org.eclipse.jubula.communication.message.StopAUTServerMessage; -import org.eclipse.jubula.tools.constants.AUTStartResponse; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.ToolkitConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.ToolkitConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** @author BREDEX GmbH */ public class AUTAgentImpl implements AUTAgent { diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java index 7a22db7ca..3a1c30785 100644 --- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java +++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlExporter.java @@ -117,11 +117,11 @@ import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PMSaveException; import org.eclipse.jubula.client.core.persistence.TestResultSummaryPM; import org.eclipse.jubula.client.core.utils.TrackingUnit; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.IMonitoringValue; -import org.eclipse.jubula.tools.objects.MonitoringValue; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.MonitoringValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java index 7cf532965..ea4b9a464 100644 --- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java +++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java @@ -138,20 +138,20 @@ import org.eclipse.jubula.client.core.utils.ReportRuleType; import org.eclipse.jubula.client.core.utils.TrackingUnit; import org.eclipse.jubula.client.core.utils.TreeTraverser; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.jarutils.IVersion; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.ComponentIdentifier; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.objects.IMonitoringValue; -import org.eclipse.jubula.tools.objects.MonitoringValue; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.jarutils.IVersion; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.MonitoringValue; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java index 04d8c5999..f63561535 100644 --- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java +++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java @@ -46,11 +46,11 @@ import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PMReadException; import org.eclipse.jubula.client.core.persistence.PMSaveException; import org.eclipse.jubula.client.core.progress.IProgressConsole; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java index c17168e0e..10f27a224 100644 --- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java +++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java @@ -76,15 +76,15 @@ import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.ConfigXmlException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.jarutils.IVersion; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.ConfigXmlException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.jarutils.IVersion; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/ProjectBP.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/ProjectBP.java index fd059df18..9e3bb759f 100644 --- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/ProjectBP.java +++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/ProjectBP.java @@ -38,9 +38,9 @@ import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PMReadException; import org.eclipse.jubula.client.core.persistence.PMSaveException; import org.eclipse.jubula.client.core.persistence.ProjectPM; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.jarutils.IVersion; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.jarutils.IVersion; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/AutIdGenerationConverter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/AutIdGenerationConverter.java index af44c4f27..57d7f7e45 100644 --- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/AutIdGenerationConverter.java +++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/converter/AutIdGenerationConverter.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.client.archive.schema.Aut; import org.eclipse.jubula.client.archive.schema.AutConfig; import org.eclipse.jubula.client.archive.schema.MapEntry; import org.eclipse.jubula.client.archive.schema.Project; -import org.eclipse.jubula.tools.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; /** * Generates unique (in the context of the Project) AUT IDs for all diff --git a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java index 817fa7e97..e6a0f4ec8 100644 --- a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java +++ b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java @@ -28,8 +28,8 @@ import org.eclipse.jubula.client.autagent.preferences.PreferenceInitializer; import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.rcp.handlers.AUTAgentConnectHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.i18n.I18n; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.i18n.I18n; import org.eclipse.ui.statushandlers.StatusManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java index c950021a0..ea91c7c69 100644 --- a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java +++ b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.jubula.client.autagent.Activator; -import org.eclipse.jubula.tools.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; /** * diff --git a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java index 937e0acfa..7f8705e30 100644 --- a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java +++ b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java @@ -26,7 +26,7 @@ import org.eclipse.jubula.client.ui.databinding.SimpleIntegerToStringConverter; import org.eclipse.jubula.client.ui.databinding.SimpleStringToIntegerConverter; import org.eclipse.jubula.client.ui.databinding.validators.StringToPortValidator; import org.eclipse.jubula.client.ui.widgets.UIComponentHelper; -import org.eclipse.jubula.tools.i18n.I18n; +import org.eclipse.jubula.tools.internal.i18n.I18n; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; diff --git a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java index 900523e42..d86d575eb 100644 --- a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java +++ b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/AbstractCmdlineClient.java @@ -48,13 +48,13 @@ import org.eclipse.jubula.client.core.preferences.database.PostGreSQLConnectionI import org.eclipse.jubula.client.core.progress.IProgressConsole; import org.eclipse.jubula.client.internal.AutAgentConnection; import org.eclipse.jubula.client.internal.exceptions.ConnectionException; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.messagehandling.Message; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.messagehandling.Message; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/JobConfiguration.java b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/JobConfiguration.java index b5d4f047b..b08049f55 100644 --- a/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/JobConfiguration.java +++ b/org.eclipse.jubula.client.cmd/src/org/eclipse/jubula/client/cmd/JobConfiguration.java @@ -46,9 +46,9 @@ import org.eclipse.jubula.client.core.preferences.database.OracleConnectionInfo; import org.eclipse.jubula.client.core.preferences.database.PostGreSQLConnectionInfo; import org.eclipse.jubula.client.core.utils.FileUtils; import org.eclipse.jubula.client.core.utils.LocaleUtil; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.NetUtil; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.NetUtil; import org.eclipse.osgi.util.NLS; import com.thoughtworks.xstream.XStream; diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64DecodeFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64DecodeFunctionEvaluator.java index f8e0ecb3f..2f09b802f 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64DecodeFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64DecodeFunctionEvaluator.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.functions; import org.apache.commons.codec.binary.Base64; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Function that decodes a base 64 string into a string diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64EncodeFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64EncodeFunctionEvaluator.java index 50b211d34..f31f6445c 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64EncodeFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/Base64EncodeFunctionEvaluator.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.functions; import org.apache.commons.codec.binary.Base64; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Function that encodes a given string into a base 64 string diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/CentralTestDataSetValueFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/CentralTestDataSetValueFunctionEvaluator.java index 204cb7e5a..64f610a71 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/CentralTestDataSetValueFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/CentralTestDataSetValueFunctionEvaluator.java @@ -30,8 +30,8 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.utils.ExecObject; import org.eclipse.jubula.client.core.utils.GuiParamValueConverter; import org.eclipse.jubula.client.core.utils.NullValidator; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * This function returns the String value of a cell of a central central test diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/DivideFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/DivideFunctionEvaluator.java index 0ff359c1b..32b91afaa 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/DivideFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/DivideFunctionEvaluator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.functions; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Function that divides 2 numbers. diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/FormateDateEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/FormateDateEvaluator.java index 083d1edd0..24a5ffea0 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/FormateDateEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/FormateDateEvaluator.java @@ -13,8 +13,8 @@ package org.eclipse.jubula.client.core.functions; import java.util.Date; import org.apache.commons.lang.time.DateFormatUtils; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ModifyDateEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ModifyDateEvaluator.java index c23dd5633..73a578479 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ModifyDateEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ModifyDateEvaluator.java @@ -6,8 +6,8 @@ package org.eclipse.jubula.client.core.functions; import java.util.Date; import org.apache.commons.lang.time.DateUtils; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/NodeAttributeEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/NodeAttributeEvaluator.java index 3d3077419..8ceef88de 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/NodeAttributeEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/NodeAttributeEvaluator.java @@ -12,8 +12,8 @@ package org.eclipse.jubula.client.core.functions; import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.core.propertytester.NodePropertyTester; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ParseDateEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ParseDateEvaluator.java index 4b2f9dd9b..edd28ecdf 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ParseDateEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/ParseDateEvaluator.java @@ -7,8 +7,8 @@ import java.text.ParseException; import java.util.Date; import org.apache.commons.lang.time.DateUtils; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RandomIntegerFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RandomIntegerFunctionEvaluator.java index a593211d1..964839bb3 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RandomIntegerFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RandomIntegerFunctionEvaluator.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.functions; import org.apache.commons.lang.math.RandomUtils; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Function that generates a random integer diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RoundFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RoundFunctionEvaluator.java index b4c00bc77..e085bd22a 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RoundFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/RoundFunctionEvaluator.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.functions; import java.math.BigDecimal; import java.math.RoundingMode; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Function that rounds a number to a given number of decimal places. diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/StringReplaceAllFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/StringReplaceAllFunctionEvaluator.java index ebb526535..aab81bb98 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/StringReplaceAllFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/StringReplaceAllFunctionEvaluator.java @@ -12,8 +12,8 @@ package org.eclipse.jubula.client.core.functions; import java.util.regex.PatternSyntaxException; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * Function that performs a string replaceAll diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/SubtractFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/SubtractFunctionEvaluator.java index a2e908d1c..7e43c787d 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/SubtractFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/SubtractFunctionEvaluator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.functions; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Function that subtracts number from another. diff --git a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/TruncateFunctionEvaluator.java b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/TruncateFunctionEvaluator.java index 730a6a6c0..e01008735 100644 --- a/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/TruncateFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core.functions/src/org/eclipse/jubula/client/core/functions/TruncateFunctionEvaluator.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.functions; import java.math.BigDecimal; import java.math.RoundingMode; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java index 2273c44cd..816a4cb48 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java @@ -101,19 +101,19 @@ import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; import org.eclipse.jubula.toolkit.common.monitoring.MonitoringAttribute; import org.eclipse.jubula.toolkit.common.monitoring.MonitoringRegistry; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.InputConstants; -import org.eclipse.jubula.tools.constants.MonitoringConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.ToolkitConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.IMonitoringValue; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.MonitoringUtil; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.InputConstants; +import org.eclipse.jubula.tools.internal.constants.MonitoringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.ToolkitConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.MonitoringUtil; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java index 621390b95..7ac5b5e33 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/IClientTest.java @@ -33,8 +33,8 @@ import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException; import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java index 958d2742b..965a88b92 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutAgentRegistration.java @@ -32,10 +32,10 @@ import org.eclipse.jubula.client.core.model.IAUTMainPO; import org.eclipse.jubula.client.core.model.IProjectPO; import org.eclipse.jubula.client.internal.AutAgentConnection; import org.eclipse.jubula.communication.message.GetRegisteredAutListMessage; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutRegistrationEvent.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutRegistrationEvent.java index 8cffe3086..b670a4088 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutRegistrationEvent.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/agent/AutRegistrationEvent.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.agent; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** * An event representing a change in the registration status of an AUT with diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java index 09d0d45dd..d93f01bd0 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractComponentNameMapper.java @@ -20,11 +20,11 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.persistence.IncompatibleTypeException; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java index 98a696f5d..e349d0a26 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractParamInterfaceBP.java @@ -26,8 +26,8 @@ import org.eclipse.jubula.client.core.utils.ModelParamValueConverter; import org.eclipse.jubula.client.core.utils.NullValidator; import org.eclipse.jubula.client.core.utils.ParamValueConverter; import org.eclipse.jubula.client.core.utils.VariableParamValueValidator; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.TestDataConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.TestDataConstants; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java index 922191807..b51fd3591 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java @@ -30,11 +30,11 @@ import org.eclipse.jubula.client.core.model.ITestResult; import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.core.model.TestResultNode; import org.eclipse.jubula.client.core.model.TestResultParameter; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.objects.event.TestErrorEvent; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CapBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CapBP.java index fc70ec794..d2bcee6cb 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CapBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CapBP.java @@ -22,10 +22,10 @@ import org.eclipse.jubula.client.core.model.NodeMaker; import org.eclipse.jubula.client.core.model.PoMaker; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNamesBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNamesBP.java index c37b8be95..cbef36b1d 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNamesBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/CompNamesBP.java @@ -33,9 +33,9 @@ import org.eclipse.jubula.client.core.model.PoMaker; import org.eclipse.jubula.client.core.persistence.IncompatibleTypeException; import org.eclipse.jubula.client.core.persistence.NodePM; import org.eclipse.jubula.client.core.persistence.PMException; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java index 3eccbada1..40a416c3e 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java @@ -50,13 +50,13 @@ import org.eclipse.jubula.client.core.persistence.locking.LockManager; import org.eclipse.jubula.client.core.utils.StringHelper; import org.eclipse.jubula.client.core.utils.TreeTraverser; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java index bc1d9d2b6..48d732328 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java @@ -34,10 +34,10 @@ import org.eclipse.jubula.client.core.persistence.PMDirtyVersionException; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PersistenceManager; import org.eclipse.jubula.client.core.persistence.PersistenceUtil; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.utils.ValueListIterator; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.utils.ValueListIterator; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java index ce575f7e9..cf44a8980 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ExternalTestDataBP.java @@ -33,10 +33,10 @@ import org.eclipse.jubula.client.core.model.ITDManager; import org.eclipse.jubula.client.core.model.ITestDataPO; import org.eclipse.jubula.client.core.model.PoMaker; import org.eclipse.jubula.client.core.persistence.GeneralStorage; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.IncompleteDataException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.IncompleteDataException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/HtmlResultReportWriter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/HtmlResultReportWriter.java index 06be3a36b..37c30c55f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/HtmlResultReportWriter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/HtmlResultReportWriter.java @@ -25,7 +25,7 @@ import org.dom4j.io.DocumentSource; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java index ff81fdcdb..f1cc05240 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/INameMapper.java @@ -14,7 +14,7 @@ import javax.persistence.EntityManager; import org.eclipse.jubula.client.core.persistence.IncompatibleTypeException; import org.eclipse.jubula.client.core.persistence.PMException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingComponentNameMapper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingComponentNameMapper.java index 1204a0dba..61fd94935 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingComponentNameMapper.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingComponentNameMapper.java @@ -20,7 +20,7 @@ import org.eclipse.jubula.client.core.model.IObjectMappingAssoziationPO; import org.eclipse.jubula.client.core.persistence.CompNamePM; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingEventDispatcher.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingEventDispatcher.java index c97bbc29d..b1a648bbe 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingEventDispatcher.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ObjectMappingEventDispatcher.java @@ -24,7 +24,7 @@ import org.eclipse.jubula.client.core.model.IObjectMappingCategoryPO; import org.eclipse.jubula.client.core.model.ISpecTestCasePO; import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.core.persistence.NodePM; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java index cf957c9bf..688d3200d 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBP.java @@ -22,9 +22,9 @@ import org.eclipse.jubula.client.core.model.IReusedProjectPO; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.ParamNamePM; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java index f7cd40241..d23e8b7c4 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ParamNameBPDecorator.java @@ -29,8 +29,8 @@ import org.eclipse.jubula.client.core.model.ITestDataPO; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PMSaveException; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java index 881a9a7cf..d2747f828 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ProjectNameBP.java @@ -28,10 +28,10 @@ import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PersistenceManager; import org.eclipse.jubula.client.core.persistence.Persistor; import org.eclipse.jubula.client.core.utils.NameValidationUtil; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/RunningAutBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/RunningAutBP.java index 2b6ba802f..9459ddff0 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/RunningAutBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/RunningAutBP.java @@ -16,7 +16,7 @@ import java.util.HashSet; import org.eclipse.jubula.client.core.agent.AutAgentRegistration; import org.eclipse.jubula.client.core.model.IProjectPO; import org.eclipse.jubula.client.core.persistence.GeneralStorage; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java index bd8bee08d..9e010f1ec 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TDVariableStore.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamBP.java index dea068556..0309bb0c8 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestCaseParamBP.java @@ -35,10 +35,10 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.utils.GuiParamValueConverter; import org.eclipse.jubula.client.core.utils.ModelParamValueConverter; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestDataBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestDataBP.java index f5fdee74a..03a8d16a7 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestDataBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestDataBP.java @@ -18,8 +18,8 @@ import org.eclipse.jubula.client.core.model.IParameterInterfacePO; import org.eclipse.jubula.client.core.model.ITDManager; import org.eclipse.jubula.client.core.model.ITestDataPO; import org.eclipse.jubula.client.core.model.PoMaker; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java index ab0452c71..63ceccabd 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java @@ -94,30 +94,30 @@ import org.eclipse.jubula.communication.message.TakeScreenshotMessage; import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.MonitoringConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.TimeoutConstants; -import org.eclipse.jubula.tools.constants.TimingConstantsClient; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.ComponentIdentifier; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.objects.event.EventFactory; -import org.eclipse.jubula.tools.objects.event.TestErrorEvent; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.ExternalCommandExecutor; -import org.eclipse.jubula.tools.utils.ExternalCommandExecutor.MonitorTask; -import org.eclipse.jubula.tools.utils.StringParsing; -import org.eclipse.jubula.tools.utils.TimeUtil; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; -import org.eclipse.jubula.tools.xml.businessmodell.Param; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.MonitoringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.TimeoutConstants; +import org.eclipse.jubula.tools.internal.constants.TimingConstantsClient; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.event.EventFactory; +import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.ExternalCommandExecutor; +import org.eclipse.jubula.tools.internal.utils.StringParsing; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.utils.ExternalCommandExecutor.MonitorTask; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Constants; import org.slf4j.Logger; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java index fbb993a90..f5e6daf1b 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java @@ -46,16 +46,16 @@ import org.eclipse.jubula.client.core.model.TestResultNode; import org.eclipse.jubula.client.core.model.TestResultParameter; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.Persistor; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.MonitoringConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.event.TestErrorEvent; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.MonitoringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; /** * Class to get keywords and summary from testresultnode to persist in database diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java index 6be73bf59..a68e09a9f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TreeOpsBP.java @@ -36,10 +36,10 @@ import org.eclipse.jubula.client.core.persistence.NodePM; import org.eclipse.jubula.client.core.persistence.NodePM.AbstractCmdHandleChild; import org.eclipse.jubula.client.core.utils.ModelParamValueConverter; import org.eclipse.jubula.client.core.utils.RefToken; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.TestDataConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.TestDataConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java index ce0464468..32d2611fa 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/UsedToolkitBP.java @@ -48,14 +48,14 @@ import org.eclipse.jubula.client.core.utils.SpecTreeTraverser; import org.eclipse.jubula.client.core.utils.TreeTraverser; import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.ToolkitConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.ToolkitConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/XmlResultReportWriter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/XmlResultReportWriter.java index 9a81297f2..0a4388150 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/XmlResultReportWriter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/XmlResultReportWriter.java @@ -18,7 +18,7 @@ import org.dom4j.Document; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java index b7e39583a..7d532fd51 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/compcheck/CompletenessGuard.java @@ -35,9 +35,9 @@ import org.eclipse.jubula.client.core.utils.AbstractNonPostOperatingTreeNodeOper import org.eclipse.jubula.client.core.utils.ITreeNodeOperation; import org.eclipse.jubula.client.core.utils.ITreeTraverserContext; import org.eclipse.jubula.client.core.utils.TreeTraverser; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java index 32a7cd805..27c338b53 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/NodeBP.java @@ -30,8 +30,8 @@ import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PMObjectDeletedException; import org.eclipse.jubula.client.core.persistence.PersistenceManager; import org.eclipse.jubula.client.core.persistence.locking.LockManager; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java index 948462219..24278a7bb 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/db/TestCaseBP.java @@ -27,8 +27,8 @@ import org.eclipse.jubula.client.core.persistence.PMDirtyVersionException; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.core.persistence.PMObjectDeletedException; import org.eclipse.jubula.client.core.persistence.PMSaveException; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java index ad4f69979..ed1343724 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/treeoperations/CollectComponentNameUsersOp.java @@ -19,7 +19,7 @@ import org.eclipse.jubula.client.core.model.IExecTestCasePO; import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.core.utils.AbstractNonPostOperatingTreeNodeOperation; import org.eclipse.jubula.client.core.utils.ITreeTraverserContext; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java index 61a1d7c7a..74725a92a 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTModeChangedCommand.java @@ -17,7 +17,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.AUTModeChangedMessage; import org.eclipse.jubula.communication.message.ChangeAUTModeMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java index cffba3700..9734cce75 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTServerStateCommand.java @@ -17,7 +17,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.AUTServerStateMessage; import org.eclipse.jubula.communication.message.AUTStartMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java index 74ad7c43c..1a8b7606d 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/AUTStateCommand.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.AUTStateMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java index 82ff44cad..bd728b783 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java @@ -47,13 +47,13 @@ import org.eclipse.jubula.communication.message.MessageParam; import org.eclipse.jubula.communication.message.ShowObservInfoMessage; import org.eclipse.jubula.communication.message.ShowRecordedActionMessage; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.TestDataConstants; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.objects.MappingConstants; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.TestDataConstants; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.objects.MappingConstants; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java index a19464ea4..b5b8651ad 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPTestResponseCommand.java @@ -16,7 +16,7 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.CAPTestResponseMessage; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.MessageCap; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java index 818c03568..1f3a49e67 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisconnectFromAutAgentResponseCommand.java @@ -16,7 +16,7 @@ import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.DisconnectFromAutAgentResponseMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java index a71c10afb..be392a7dd 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/DisplayManualTestStepResponseCommand.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.DisplayManualTestStepResponseMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java index c12e5f0bd..bcec554db 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/EndTestExecutionResponseCommand.java @@ -18,7 +18,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.EndTestExecutionResponseMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java index 4c0fd2417..4e0981210 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetAutConfigMapResponseCommand.java @@ -16,7 +16,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.GetAutConfigMapResponseMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java index 8a0715cb1..c364aefb9 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringDataResponseCommand.java @@ -18,9 +18,9 @@ import org.eclipse.jubula.client.core.model.TestResult; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.GetMonitoringDataResponseMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.MonitoringConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.MonitoringValue; +import org.eclipse.jubula.tools.internal.constants.MonitoringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.MonitoringValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java index bebbe9d10..4fab37f1f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/GetMonitoringReportCommand.java @@ -24,8 +24,8 @@ import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.SendMonitoringReportMessage; -import org.eclipse.jubula.tools.constants.MonitoringConstants; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.MonitoringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java index ebda667b7..c623010a5 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ObjectMappedCommand.java @@ -19,8 +19,8 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.ObjectMappedMessage; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java index debb0c221..b9ad1c978 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java @@ -14,7 +14,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java index 91f56a1fb..156dbb2d4 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/RegisteredAutListCommand.java @@ -17,8 +17,8 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.RegisteredAutListMessage; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java index 3cfaa0b22..6a19fd727 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ServerLogResponseCommand.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.ServerLogResponseMessage; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java index be69aa666..0c0fff9cc 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StartAUTServerStateCommand.java @@ -17,8 +17,8 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.APICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.StartAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.AUTStartResponse; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.AUTStartResponse; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java index 877a06c66..88fb2e5bf 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/StopAUTServerStateCommand.java @@ -14,7 +14,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.StopAUTServerStateMessage; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java index 2625b392d..ccbd20192 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/TakeScreenshotResponseCommand.java @@ -15,7 +15,7 @@ import org.eclipse.jubula.client.core.model.TestResultNode; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.TakeScreenshotResponseMessage; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java index 685ce6c4e..ea20013f0 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/WindowTitlesChangedCommand.java @@ -5,7 +5,7 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.html.WindowTitlesMessage; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java index 24c13d112..59f652e8b 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java @@ -49,17 +49,17 @@ import org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponents import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage; import org.eclipse.jubula.communication.message.SetKeyboardLayoutMessage; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.exception.JBVersionException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.TimeUtil; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.Profile; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.JBVersionException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Profile; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java index ffeeaf1d6..b8180a8c7 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/MessageFactory.java @@ -20,9 +20,9 @@ import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.communication.message.CAPTestMessage; import org.eclipse.jubula.communication.message.MessageCap; import org.eclipse.jubula.communication.message.SendAUTListOfSupportedComponentsMessage; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/UnknownMessageException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/UnknownMessageException.java index 17cf73a50..ee57b0694 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/UnknownMessageException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/UnknownMessageException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.communication; -import org.eclipse.jubula.tools.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; /** * Exception to throw if an appropriate message could not created. diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/ErrorMessagePresenter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/ErrorMessagePresenter.java index c4bde102c..c672d7c24 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/ErrorMessagePresenter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/ErrorMessagePresenter.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.errorhandling; import org.apache.commons.lang.Validate; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/IErrorMessagePresenter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/IErrorMessagePresenter.java index f18f6caba..fa5c3c811 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/IErrorMessagePresenter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/IErrorMessagePresenter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.errorhandling; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** * Presents an error message to the user. diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/NoopErrorMessagePresenter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/NoopErrorMessagePresenter.java index db78934e9..fd7490a2c 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/NoopErrorMessagePresenter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/errorhandling/NoopErrorMessagePresenter.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.errorhandling; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** * Noop implementation for presenting error messages to the user (so, diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java index 6fbc6c9b0..a53fd6f31 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/DataEventDispatcher.java @@ -31,8 +31,8 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage.IDataModifiedLi import org.eclipse.jubula.client.core.persistence.GeneralStorage.IReloadedSessionListener; import org.eclipse.jubula.client.core.utils.IGenericListener; import org.eclipse.jubula.client.core.utils.ListenerManager; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.IWorkbenchPart; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IRecordListener.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IRecordListener.java index 08cc519ff..d1fddf935 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IRecordListener.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/events/IRecordListener.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.events; import java.util.EventListener; import org.eclipse.jubula.client.core.model.ICapPO; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/AbstractFunctionEvaluator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/AbstractFunctionEvaluator.java index cf750eabf..6aa72822b 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/AbstractFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/AbstractFunctionEvaluator.java @@ -1,8 +1,8 @@ package org.eclipse.jubula.client.core.functions; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.util.NLS; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/IFunctionEvaluator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/IFunctionEvaluator.java index bbc9f7140..cfb6f74e6 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/IFunctionEvaluator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/functions/IFunctionEvaluator.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.functions; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** * Interface for functions that can be used in test data. diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTConfigPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTConfigPO.java index 5e2b1a749..dae8670e5 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTConfigPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTConfigPO.java @@ -30,8 +30,8 @@ import javax.persistence.Version; import org.apache.commons.collections.MapUtils; import org.eclipse.jubula.client.core.persistence.PersistenceUtil; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTMainPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTMainPO.java index 600e1d0c1..4af41a0f3 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTMainPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/AUTMainPO.java @@ -34,7 +34,7 @@ import javax.persistence.Transient; import javax.persistence.Version; import org.eclipse.jubula.client.core.persistence.PersistenceUtil; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapPO.java index ba0e5be18..ab4704008 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapPO.java @@ -26,12 +26,12 @@ import org.eclipse.jubula.client.core.businessprocess.CapBP; import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameCache; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapParamDescriptionPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapParamDescriptionPO.java index 6c72438a1..da4b0f6cb 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapParamDescriptionPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CapParamDescriptionPO.java @@ -14,7 +14,7 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.Transient; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java index 91ca272e1..4a50c1ebf 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java @@ -27,8 +27,8 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.ComponentIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java index fe639da91..79f8e15b8 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java @@ -24,8 +24,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameCache; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/DataSetPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/DataSetPO.java index 14071bd6a..5d925216f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/DataSetPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/DataSetPO.java @@ -27,7 +27,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/EventExecTestCasePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/EventExecTestCasePO.java index dd7a7cfaa..c98fa8d73 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/EventExecTestCasePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/EventExecTestCasePO.java @@ -16,7 +16,7 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.Transient; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ExecTestCasePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ExecTestCasePO.java index e0c79d50a..27666a904 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ExecTestCasePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ExecTestCasePO.java @@ -38,8 +38,8 @@ import org.eclipse.jubula.client.core.businessprocess.ProjectNameBP; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.persistence.NodePM; import org.eclipse.jubula.client.core.persistence.ProjectPM; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; import org.eclipse.osgi.util.NLS; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICapPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICapPO.java index f5cd0a814..497ec04cb 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICapPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICapPO.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.model;
-import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; /**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICompIdentifierPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICompIdentifierPO.java index 55091fc96..7ffe511e6 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICompIdentifierPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ICompIdentifierPO.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.model; import java.util.List; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IComponentNameReuser.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IComponentNameReuser.java index db86bd91a..f5d756aa9 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IComponentNameReuser.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IComponentNameReuser.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.model; import java.util.Collection; import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameCache; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IEventHandlerContainer.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IEventHandlerContainer.java index 007349072..d7028fc93 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IEventHandlerContainer.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IEventHandlerContainer.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.model; import java.util.Collection; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingAssoziationPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingAssoziationPO.java index 2af2b8d0e..141d948a2 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingAssoziationPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingAssoziationPO.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.model; import java.util.List; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /**
* @author BREDEX GmbH
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingPO.java index e3925d18c..8b25e3d2a 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingPO.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.model; import java.util.Set; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingProfilePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingProfilePO.java index df0e5b8fb..cf15a770f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingProfilePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IObjectMappingProfilePO.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.model; -import org.eclipse.jubula.tools.xml.businessmodell.Profile; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Profile; /** * Encapsulates the parameters used in finding GUI components during tests. diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IProjectPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IProjectPO.java index 4e74682c5..e05e5ee6a 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IProjectPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/IProjectPO.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestCasePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestCasePO.java index d0fdd6f8e..f9a8a7d3a 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestCasePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestCasePO.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.model; import java.util.Collection; import java.util.Map; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestResultSummaryPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestResultSummaryPO.java index 285af9682..6c77d548c 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestResultSummaryPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ITestResultSummaryPO.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.model; import java.util.Map; -import org.eclipse.jubula.tools.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/LogicComponentNotManagedException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/LogicComponentNotManagedException.java index 355008a71..445d6dccf 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/LogicComponentNotManagedException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/LogicComponentNotManagedException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.model;
-import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /**
* The exception thrown if the object map was querried for a component
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java index ef3856767..1da2e6110 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/MonitoringValuePO.java @@ -14,7 +14,7 @@ import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Embeddable; -import org.eclipse.jubula.tools.objects.MonitoringValue; +import org.eclipse.jubula.tools.internal.objects.MonitoringValue; /** * This class represent a monitoring value diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java index 790f70414..cd5c30d5e 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java @@ -57,8 +57,8 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.persistence.PersistenceUtil; import org.eclipse.jubula.client.core.utils.DependencyCheckerOp; import org.eclipse.jubula.client.core.utils.TreeTraverser; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; import org.eclipse.persistence.annotations.Index; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingAssoziationPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingAssoziationPO.java index 4d4b2c886..09b9b2c60 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingAssoziationPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingAssoziationPO.java @@ -32,10 +32,10 @@ import javax.persistence.Transient; import javax.persistence.Version; import org.eclipse.jubula.client.core.businessprocess.IWritableComponentNameCache; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingCategoryPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingCategoryPO.java index e9a87e872..786e993c3 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingCategoryPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingCategoryPO.java @@ -30,8 +30,8 @@ import javax.persistence.Transient; import javax.persistence.Version; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingPO.java index 7631847a0..325705563 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingPO.java @@ -34,9 +34,9 @@ import org.apache.commons.lang.Validate; import org.eclipse.jubula.client.core.businessprocess.ComponentNamesBP; import org.eclipse.jubula.client.core.businessprocess.ObjectMappingEventDispatcher; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.ComponentIdentifier; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.ComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; import org.eclipse.osgi.util.NLS; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java index 2ae15c976..1a04170a8 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java @@ -26,8 +26,8 @@ import org.apache.commons.lang.Validate; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.xml.businessmodell.Profile; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Profile; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ParameterDetailsPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ParameterDetailsPO.java index 6f987122d..d6e707aad 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ParameterDetailsPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ParameterDetailsPO.java @@ -18,7 +18,7 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Version; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.annotations.Index; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/PoMaker.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/PoMaker.java index cae5d1e17..5f5c79afe 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/PoMaker.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/PoMaker.java @@ -19,9 +19,9 @@ import org.eclipse.jubula.client.core.businessprocess.IParamNameMapper; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.core.persistence.PersistenceUtil; import org.eclipse.jubula.client.core.utils.ReportRuleType; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.xml.businessmodell.Profile; -import org.eclipse.jubula.tools.xml.businessprocess.ProfileBuilder; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Profile; +import org.eclipse.jubula.tools.internal.xml.businessprocess.ProfileBuilder; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java index 30b549cd6..f1b65a989 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReentryProperty.java @@ -13,10 +13,10 @@ package org.eclipse.jubula.client.core.model; import org.apache.commons.lang.builder.HashCodeBuilder; import org.eclipse.jubula.client.core.businessprocess.TestExecution; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeBuilder.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeBuilder.java index 79805948c..a59dd47c0 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeBuilder.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeBuilder.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.model; import org.apache.commons.lang.Validate; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.utils.Traverser; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java index ca245d203..6a9892e68 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ResultTreeTracker.java @@ -20,11 +20,11 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.utils.ExecObject; import org.eclipse.jubula.client.core.utils.ModelParamValueConverter; import org.eclipse.jubula.client.core.utils.ParamValueConverter; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReusedProjectPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReusedProjectPO.java index 6fb8eb40b..a36b75ea1 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReusedProjectPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ReusedProjectPO.java @@ -23,7 +23,7 @@ import javax.persistence.Version; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.eclipse.jubula.client.core.businessprocess.ProjectNameBP; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java index a034f4bf8..0ec3614eb 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/SpecTestCasePO.java @@ -25,8 +25,8 @@ import org.eclipse.jubula.client.core.persistence.PersistenceUtil; import org.eclipse.jubula.client.core.persistence.ProjectPM; import org.eclipse.jubula.client.core.utils.FindNodeParentOperation; import org.eclipse.jubula.client.core.utils.SpecTreeTraverser; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java index 8b4a47450..7b499f332 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TDManagerPO.java @@ -35,7 +35,7 @@ import org.apache.commons.lang.Validate; import org.eclipse.jubula.client.core.businessprocess.TestDataBP; import org.eclipse.jubula.client.core.businessprocess.progress.ElementLoadedProgressListener; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; import org.eclipse.persistence.annotations.Index; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestCasePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestCasePO.java index c27afd795..127d117a3 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestCasePO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestCasePO.java @@ -26,9 +26,9 @@ import javax.persistence.OneToMany; import javax.persistence.Transient; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataCategoryPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataCategoryPO.java index 85f314563..c34461c83 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataCategoryPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataCategoryPO.java @@ -28,7 +28,7 @@ import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.Version; -import org.eclipse.jubula.tools.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.Assert; import org.eclipse.persistence.annotations.Index; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataPO.java index 9f241d807..18d07739e 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestDataPO.java @@ -34,7 +34,7 @@ import javax.persistence.Version; import org.apache.commons.lang.LocaleUtils; import org.apache.commons.lang.Validate; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.annotations.BatchFetch; import org.eclipse.persistence.annotations.BatchFetchType; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResult.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResult.java index 7f588b887..d576a9090 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResult.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResult.java @@ -20,9 +20,9 @@ import org.eclipse.jubula.client.core.ClientTest; import org.eclipse.jubula.client.core.businessprocess.TestExecution; import org.eclipse.jubula.client.core.businessprocess.TestresultSummaryBP; import org.eclipse.jubula.client.core.persistence.GeneralStorage; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultNode.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultNode.java index 70b4b5338..093d66623 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultNode.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultNode.java @@ -22,8 +22,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.eclipse.jubula.client.core.businessprocess.ITestResultEventListener; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.propertytester.NodePropertyTester; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.event.TestErrorEvent; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java index ca3bf9117..00c4ff23d 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultSummaryPO.java @@ -40,9 +40,9 @@ import javax.persistence.Transient; import javax.persistence.Version; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.IMonitoringValue; -import org.eclipse.jubula.tools.objects.MonitoringValue; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.MonitoringValue; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java index a0cf82b9f..079a76a09 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/CompNamePM.java @@ -45,15 +45,15 @@ import org.eclipse.jubula.client.core.model.PoMaker; import org.eclipse.jubula.client.core.persistence.locking.LockManager; import org.eclipse.jubula.client.core.persistence.locking.LockedObjectPO; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.JBFatalAbortException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; -import org.eclipse.jubula.tools.utils.ValueListIterator; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.JBFatalAbortException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.utils.ValueListIterator; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ComponentNameExistsException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ComponentNameExistsException.java index 1cb30dbb4..d3f11e65e 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ComponentNameExistsException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ComponentNameExistsException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.persistence; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** * This exception indicates that a Component Name could not be created because diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java index 0eeca49dc..ab63df1ab 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/EditSupport.java @@ -42,11 +42,11 @@ import org.eclipse.jubula.client.core.model.ITcParamDescriptionPO; import org.eclipse.jubula.client.core.model.ITestDataCategoryPO; import org.eclipse.jubula.client.core.model.ITestJobPO; import org.eclipse.jubula.client.core.model.ITestSuitePO; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.JBFatalAbortException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.JBFatalAbortException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.persistence.jpa.JpaEntityManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java index c589236d0..1562d03cd 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/GeneralStorage.java @@ -23,11 +23,11 @@ import org.eclipse.jubula.client.core.businessprocess.ProjectNameBP; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IPersistentObject; import org.eclipse.jubula.client.core.model.IProjectPO; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalAbortException; -import org.eclipse.jubula.tools.exception.JBRuntimeException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalAbortException; +import org.eclipse.jubula.tools.internal.exception.JBRuntimeException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/IncompatibleTypeException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/IncompatibleTypeException.java index 001630989..e48947ecc 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/IncompatibleTypeException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/IncompatibleTypeException.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.persistence; import org.eclipse.jubula.client.core.model.IComponentNamePO; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java index cbb3ee314..e042496c4 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java @@ -17,7 +17,7 @@ import javax.persistence.EntityManager; import org.eclipse.jubula.client.core.model.ITestResultSummaryPO; import org.eclipse.jubula.client.core.model.PoMaker; -import org.eclipse.jubula.tools.objects.IMonitoringValue; +import org.eclipse.jubula.tools.internal.objects.IMonitoringValue; /** * Loads monitoring values from the database diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MultipleNodePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MultipleNodePM.java index 199755c85..a0c14104f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MultipleNodePM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MultipleNodePM.java @@ -50,10 +50,10 @@ import org.eclipse.jubula.client.core.model.ITcParamDescriptionPO; import org.eclipse.jubula.client.core.model.NodeMaker; import org.eclipse.jubula.client.core.persistence.locking.LockManager; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.messagehandling.MessageInfo; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageInfo; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java index 5fa0d8743..c1e80c397 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/NodePM.java @@ -51,12 +51,12 @@ import org.eclipse.jubula.client.core.persistence.locking.LockManager; import org.eclipse.jubula.client.core.utils.AbstractNonPostOperatingTreeNodeOperation; import org.eclipse.jubula.client.core.utils.ITreeTraverserContext; import org.eclipse.jubula.client.core.utils.TreeTraverser; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ObjectMappingManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ObjectMappingManager.java index ad0c21d5f..61b3b9eb6 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ObjectMappingManager.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ObjectMappingManager.java @@ -20,8 +20,8 @@ import org.eclipse.jubula.client.core.events.DataEventDispatcher.DataState; import org.eclipse.jubula.client.core.events.DataEventDispatcher.UpdateState; import org.eclipse.jubula.client.core.model.IAUTMainPO; import org.eclipse.jubula.client.core.model.IObjectMappingPO; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PMException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PMException.java index 578da605e..1d32b0b30 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PMException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PMException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.persistence; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** PMException as base class for all other PM exceptions */ diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java index c7db58530..9a3404143 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ParamNamePM.java @@ -22,8 +22,8 @@ import javax.persistence.Query; import org.eclipse.jubula.client.core.businessprocess.progress.OperationCanceledUtil; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IParamNamePO; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java index 10521cb33..e6ba3d2de 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceManager.java @@ -25,9 +25,9 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.jubula.client.core.businessprocess.progress.OperationCanceledUtil; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IPersistentObject; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceUtil.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceUtil.java index 871c44130..95d3d816e 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceUtil.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistenceUtil.java @@ -24,8 +24,8 @@ import javax.persistence.criteria.Predicate; import org.eclipse.jubula.client.core.model.IEventExecTestCasePO; import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.core.model.ITestCasePO; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.utils.ValueListIterator; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.utils.ValueListIterator; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java index 4072f50e9..a03d852e3 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java @@ -55,13 +55,13 @@ import org.eclipse.jubula.client.core.progress.JobChangeListener; import org.eclipse.jubula.client.core.utils.DatabaseStateDispatcher; import org.eclipse.jubula.client.core.utils.DatabaseStateEvent; import org.eclipse.jubula.client.core.utils.DatabaseStateEvent.DatabaseState; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalAbortException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.jarutils.IVersion; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalAbortException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.jarutils.IVersion; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.util.NLS; import org.eclipse.persistence.config.PersistenceUnitProperties; import org.eclipse.persistence.exceptions.DatabaseException; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistorException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistorException.java index de34ba010..3fb4155d7 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistorException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/PersistorException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.persistence; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java index 724330f1b..c1e3124cf 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/ProjectPM.java @@ -49,12 +49,12 @@ import org.eclipse.jubula.client.core.model.NodeMaker; import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalAbortException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.jarutils.IVersion; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalAbortException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.jarutils.IVersion; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java index eecc039db..6e69fef74 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultPM.java @@ -29,10 +29,10 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.ITestResultPO; import org.eclipse.jubula.client.core.model.ITestResultSummaryPO; import org.eclipse.jubula.client.core.model.PoMaker; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultSummaryPM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultSummaryPM.java index 72d80fee9..0206d3079 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultSummaryPM.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TestResultSummaryPM.java @@ -29,10 +29,10 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IProjectPO; import org.eclipse.jubula.client.core.model.ITestResultSummaryPO; import org.eclipse.jubula.client.core.model.PoMaker; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TransactionSupport.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TransactionSupport.java index c0d872eae..bb9f11f44 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TransactionSupport.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/TransactionSupport.java @@ -14,7 +14,7 @@ import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import org.apache.commons.lang.Validate; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/ApplicationPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/ApplicationPO.java index d74c9faa8..e3b0d04d5 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/ApplicationPO.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/ApplicationPO.java @@ -23,7 +23,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /**
*
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java index 2e9c91176..3b4a163ca 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/locking/LockManager.java @@ -28,9 +28,9 @@ import org.eclipse.jubula.client.core.persistence.PMAlreadyLockedException; import org.eclipse.jubula.client.core.persistence.PMDirtyVersionException; import org.eclipse.jubula.client.core.persistence.PMObjectDeletedException; import org.eclipse.jubula.client.core.persistence.Persistor; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalAbortException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalAbortException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/AbstractHostBasedConnectionInfo.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/AbstractHostBasedConnectionInfo.java index e700eff29..3db3f7685 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/AbstractHostBasedConnectionInfo.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/AbstractHostBasedConnectionInfo.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.preferences.database; import org.eclipse.jubula.client.core.persistence.DatabaseConnectionInfo; -import org.eclipse.jubula.tools.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; /** * Base class for Connection Info that uses a hostname, port, and some kind of diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/MySQLConnectionInfo.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/MySQLConnectionInfo.java index ccab0fd3d..26b8dd137 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/MySQLConnectionInfo.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/MySQLConnectionInfo.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.preferences.database; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.config.BatchWriting; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/OracleConnectionInfo.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/OracleConnectionInfo.java index 40491b409..aa23bd133 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/OracleConnectionInfo.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/OracleConnectionInfo.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.preferences.database; import org.apache.commons.lang.StringUtils; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.config.BatchWriting; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/PostGreSQLConnectionInfo.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/PostGreSQLConnectionInfo.java index 3f3990b44..87f230f33 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/PostGreSQLConnectionInfo.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/PostGreSQLConnectionInfo.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.preferences.database; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.persistence.config.BatchWriting; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/AbstractPostExecutionCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/AbstractPostExecutionCommand.java index c1cc07bde..3ad28a777 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/AbstractPostExecutionCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/AbstractPostExecutionCommand.java @@ -24,10 +24,10 @@ import org.eclipse.jubula.client.core.utils.ExecObject; import org.eclipse.jubula.client.core.utils.ModelParamValueConverter; import org.eclipse.jubula.client.core.utils.ParamValueConverter; import org.eclipse.jubula.client.core.utils.Traverser; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * abstract class for shared methods diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/IPostExecutionCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/IPostExecutionCommand.java index a20630abe..3f7735229 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/IPostExecutionCommand.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/rc/commands/IPostExecutionCommand.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.rc.commands; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.objects.event.TestErrorEvent; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.objects.event.TestErrorEvent; /** * Interface for commands to execute after the execution of the dependent diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java index 66a482ba5..33d7a7ee2 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/BundleUtils.java @@ -18,9 +18,9 @@ import java.util.Properties; import org.eclipse.core.runtime.FileLocator; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.osgi.framework.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ComboParamValidator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ComboParamValidator.java index 86563f5e8..a232ff995 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ComboParamValidator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ComboParamValidator.java @@ -14,8 +14,8 @@ import java.util.Arrays; import java.util.List; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.constants.TestDataConstants; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.TestDataConstants; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultEventHandler.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultEventHandler.java index 299c5e4eb..1a35693d5 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultEventHandler.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultEventHandler.java @@ -20,7 +20,7 @@ import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.core.model.NodeMaker; import org.eclipse.jubula.client.core.model.ReentryProperty; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultParamRefSymbolsProvider.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultParamRefSymbolsProvider.java index 8ad4ad58b..862948f1f 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultParamRefSymbolsProvider.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/DefaultParamRefSymbolsProvider.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.utils; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.TestDataConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.TestDataConstants; /** * This is a default implementation of the IParamRefSymbolsProvider. diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/FunctionToken.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/FunctionToken.java index 6150c1124..6d69d2e9e 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/FunctionToken.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/FunctionToken.java @@ -24,8 +24,8 @@ import org.eclipse.jubula.client.core.model.IExecTestCasePO; import org.eclipse.jubula.client.core.model.INodePO; import org.eclipse.jubula.client.core.model.IParamDescriptionPO; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.util.NLS; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IGenericListener.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IGenericListener.java index f97fdf409..162aa5757 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IGenericListener.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IGenericListener.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.utils; import java.util.List; -import org.eclipse.jubula.tools.exception.UnexpectedGenericTypeException; +import org.eclipse.jubula.tools.internal.exception.UnexpectedGenericTypeException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IParamValueToken.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IParamValueToken.java index 856e4419a..ca3007bb3 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IParamValueToken.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IParamValueToken.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Locale; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IntegerParamValueValidator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IntegerParamValueValidator.java index fef353fde..448af8c29 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IntegerParamValueValidator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/IntegerParamValueValidator.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.core.utils; import java.util.List; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Languages.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Languages.java index 2c57817b4..c52fdd9cb 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Languages.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Languages.java @@ -21,7 +21,7 @@ import java.util.Map; import org.eclipse.core.runtime.URIUtil; import org.eclipse.jubula.client.core.Activator; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java index 93027eaac..899f888e9 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ListenerManager.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Set; import org.eclipse.jubula.client.core.i18n.Messages; -import org.eclipse.jubula.tools.exception.UnexpectedGenericTypeException; +import org.eclipse.jubula.tools.internal.exception.UnexpectedGenericTypeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LiteralToken.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LiteralToken.java index e64339a2a..682de8654 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LiteralToken.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LiteralToken.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.Locale; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LocaleUtil.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LocaleUtil.java index 4af017abf..cf7bf7239 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LocaleUtil.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/LocaleUtil.java @@ -12,7 +12,7 @@ package org.eclipse.jubula.client.core.utils; import java.util.Locale; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParamValueConverter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParamValueConverter.java index 5c8a686b8..9b5e2a198 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParamValueConverter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParamValueConverter.java @@ -27,8 +27,8 @@ import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IParamDescriptionPO; import org.eclipse.jubula.client.core.model.IParamNodePO; import org.eclipse.jubula.client.core.model.IParameterInterfacePO; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParsedParameter.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParsedParameter.java index 79dc7ae1b..1dd6e318d 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParsedParameter.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/ParsedParameter.java @@ -28,8 +28,8 @@ import org.eclipse.jubula.client.core.gen.parser.parameter.node.PFunctionArgList import org.eclipse.jubula.client.core.gen.parser.parameter.node.TComma; import org.eclipse.jubula.client.core.model.IParamDescriptionPO; import org.eclipse.jubula.client.core.model.IParameterInterfacePO; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** * Contains information gathered from parsing a Parameter string. The class diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/RefToken.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/RefToken.java index c6a294804..c526ff28c 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/RefToken.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/RefToken.java @@ -29,10 +29,10 @@ import org.eclipse.jubula.client.core.model.ISpecTestCasePO; import org.eclipse.jubula.client.core.model.ITestDataCubePO; import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SemanticParsingException.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SemanticParsingException.java index b09953778..90c08de32 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SemanticParsingException.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SemanticParsingException.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jubula.client.core.utils; -import org.eclipse.jubula.tools.exception.JBRuntimeException; +import org.eclipse.jubula.tools.internal.exception.JBRuntimeException; /** * Indicates that a semantic error was encountered during parsing. diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SimpleValueToken.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SimpleValueToken.java index cad6ad104..fd976c105 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SimpleValueToken.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/SimpleValueToken.java @@ -17,9 +17,9 @@ import java.util.regex.Pattern; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IParamDescriptionPO; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/StringHelper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/StringHelper.java index 9d3e66bf9..e236c2560 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/StringHelper.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/StringHelper.java @@ -20,15 +20,15 @@ import java.util.Set; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.Param; -import org.eclipse.jubula.tools.xml.businessmodell.ValueSetElement; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ValueSetElement; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TokenError.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TokenError.java index 1a871b9c0..104fd8df5 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TokenError.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TokenError.java @@ -11,7 +11,7 @@ package org.eclipse.jubula.client.core.utils; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** * class to describe errors results from syntactical or semantical validation of diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java index 79e553c5d..d59a95ed1 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java @@ -45,12 +45,12 @@ import org.eclipse.jubula.client.core.model.ITestDataPO; import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.core.model.ReentryProperty; import org.eclipse.jubula.client.core.model.TestResultNode; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.IncompleteDataException; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.IncompleteDataException; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverser.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverser.java index 9ce22357b..75dde3a16 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverser.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverser.java @@ -26,7 +26,7 @@ import org.eclipse.jubula.client.core.model.ITestCasePO; import org.eclipse.jubula.client.core.persistence.IExecPersistable; import org.eclipse.jubula.client.core.persistence.ISpecPersistable; import org.eclipse.jubula.client.core.persistence.ProjectPM; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverserContext.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverserContext.java index 7893ee274..1c7ffa7fa 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverserContext.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/TreeTraverserContext.java @@ -15,7 +15,7 @@ import java.util.LinkedList; import java.util.List; import org.eclipse.jubula.client.core.model.INodePO; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableParamValueValidator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableParamValueValidator.java index 8e9bd1dfa..e6c2adb88 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableParamValueValidator.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableParamValueValidator.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.regex.Pattern; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableToken.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableToken.java index 2d5ac8bb0..aacccd9dc 100644 --- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableToken.java +++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/VariableToken.java @@ -17,9 +17,9 @@ import org.eclipse.jubula.client.core.businessprocess.TestExecution; import org.eclipse.jubula.client.core.i18n.Messages; import org.eclipse.jubula.client.core.model.IParamDescriptionPO; import org.eclipse.jubula.client.core.utils.ParamValueConverter.ConvValidationState; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; /** diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java index 626c733b1..b990a52dd 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/commands/InspectorComponentSelectedCommand.java @@ -18,7 +18,7 @@ import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.InspectorComponentSelectedMessage; import org.eclipse.jubula.communication.message.Message; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/contribution/ActivateInspectorContributionItem.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/contribution/ActivateInspectorContributionItem.java index 704edb65e..a8479e3a9 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/contribution/ActivateInspectorContributionItem.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/contribution/ActivateInspectorContributionItem.java @@ -21,7 +21,7 @@ import org.eclipse.jubula.client.inspector.ui.constants.InspectorCommandConstant import org.eclipse.jubula.client.inspector.ui.handlers.ActivateInspectorHandler; import org.eclipse.jubula.client.inspector.ui.provider.sourceprovider.InspectableAutSourceProvider; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.ISourceProvider; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java index 73b7c4ed1..85f1a97da 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/ActivateInspectorHandler.java @@ -26,9 +26,9 @@ import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.JobUtils; import org.eclipse.jubula.communication.message.ActivateInspectorMessage; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/CopyHierarchyHandler.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/CopyHierarchyHandler.java index 8558a3e0b..9449ee3e0 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/CopyHierarchyHandler.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/handlers/CopyHierarchyHandler.java @@ -16,7 +16,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeNode; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/model/InspectedComponent.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/model/InspectedComponent.java index 250d35f66..7cf656d3c 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/model/InspectedComponent.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/model/InspectedComponent.java @@ -13,7 +13,7 @@ package org.eclipse.jubula.client.inspector.ui.model; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; /** diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/provider/sourceprovider/InspectableAutSourceProvider.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/provider/sourceprovider/InspectableAutSourceProvider.java index 936a09bc2..34736a64b 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/provider/sourceprovider/InspectableAutSourceProvider.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/provider/sourceprovider/InspectableAutSourceProvider.java @@ -26,8 +26,8 @@ import org.eclipse.jubula.client.core.events.DataEventDispatcher.ProjectState; import org.eclipse.jubula.client.core.model.IAUTMainPO; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.ui.rcp.sourceprovider.AbstractJBSourceProvider; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.ISources; diff --git a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/views/InspectorView.java b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/views/InspectorView.java index bcb750460..4a34f4cfd 100644 --- a/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/views/InspectorView.java +++ b/org.eclipse.jubula.client.inspector.ui/src/org/eclipse/jubula/client/inspector/ui/views/InspectorView.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jubula.client.inspector.ui.model.InspectedComponent; import org.eclipse.jubula.client.inspector.ui.provider.labelprovider.InspectorLabelProvider; import org.eclipse.jubula.client.ui.constants.ContextHelpIds; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java b/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java index e7dee98d0..ce2546481 100644 --- a/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java +++ b/org.eclipse.jubula.client.qa.caa.gen.ui/src/org/eclipse/jubula/client/qa/caa/gen/ui/handler/GenerateAllHandler.java @@ -33,11 +33,11 @@ import org.eclipse.jubula.client.core.utils.StringHelper; import org.eclipse.jubula.client.ui.handlers.AbstractHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; /** * @author BREDEX GmbH diff --git a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/ExtensionHelper.java b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/ExtensionHelper.java index 632f8641f..840ef45ca 100644 --- a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/ExtensionHelper.java +++ b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/ExtensionHelper.java @@ -40,7 +40,7 @@ import org.eclipse.jubula.client.teststyle.checks.DecoratingCheck; import org.eclipse.jubula.client.teststyle.checks.Severity; import org.eclipse.jubula.client.teststyle.checks.contexts.BaseContext; import org.eclipse.jubula.client.teststyle.constants.Ext; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/checks/BaseCheck.java b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/checks/BaseCheck.java index 47adbe037..5ddc0e6cb 100644 --- a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/checks/BaseCheck.java +++ b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/checks/BaseCheck.java @@ -24,7 +24,7 @@ import org.eclipse.jubula.client.teststyle.checks.contexts.BaseContext; import org.eclipse.jubula.client.teststyle.exceptions.AttributeNotFoundException; import org.eclipse.jubula.client.teststyle.quickfix.Quickfix; import org.eclipse.jubula.client.teststyle.quickfix.QuickfixFactory; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** diff --git a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/quickfix/QuickfixFactory.java b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/quickfix/QuickfixFactory.java index dbe677578..58e302f73 100644 --- a/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/quickfix/QuickfixFactory.java +++ b/org.eclipse.jubula.client.teststyle/src/org/eclipse/jubula/client/teststyle/quickfix/QuickfixFactory.java @@ -30,7 +30,7 @@ import org.eclipse.jubula.client.ui.rcp.handlers.open.AbstractOpenHandler; import org.eclipse.jubula.client.ui.rcp.utils.Utils; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.views.ITreeViewerContainer; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.jubula.client.toolkit.ui/src/org/eclipse/jubula/client/toolkit/ui/view/ToolkitOverView.java b/org.eclipse.jubula.client.toolkit.ui/src/org/eclipse/jubula/client/toolkit/ui/view/ToolkitOverView.java index c03a2c4e7..181b5cd61 100644 --- a/org.eclipse.jubula.client.toolkit.ui/src/org/eclipse/jubula/client/toolkit/ui/view/ToolkitOverView.java +++ b/org.eclipse.jubula.client.toolkit.ui/src/org/eclipse/jubula/client/toolkit/ui/view/ToolkitOverView.java @@ -23,15 +23,15 @@ import org.eclipse.jubula.client.ui.rcp.filter.JBFilteredTree; import org.eclipse.jubula.client.ui.rcp.provider.contentprovider.AbstractTreeViewContentProvider; import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.GeneralLabelProvider; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; -import org.eclipse.jubula.tools.xml.businessmodell.Param; -import org.eclipse.jubula.tools.xml.businessmodell.ParamValueSet; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; -import org.eclipse.jubula.tools.xml.businessmodell.ValueSetElement; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ParamValueSet; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ValueSetElement; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; diff --git a/org.eclipse.jubula.client.ui.rcp/plugin.xml b/org.eclipse.jubula.client.ui.rcp/plugin.xml index 8c9ce3bdd..7c81c5bae 100644 --- a/org.eclipse.jubula.client.ui.rcp/plugin.xml +++ b/org.eclipse.jubula.client.ui.rcp/plugin.xml @@ -118,7 +118,7 @@ id="org.eclipse.jubula.client.ui.rcp.propertytester.RunningAut" namespace="org.eclipse.jubula.client.ui.rcp.propertytester.RunningAut" properties="isDefined" - type="org.eclipse.jubula.tools.registration.AutIdentifier" /> + type="org.eclipse.jubula.tools.internal.registration.AutIdentifier" /> <propertyTester class="org.eclipse.jubula.client.ui.rcp.propertytester.SearchTestCasePropertyTester" id="org.eclipse.jubula.client.ui.rcp.propertytester.SearchTestCaseTester" @@ -218,7 +218,7 @@ <adapter type="org.eclipse.ui.views.properties.IPropertySource" /> </factory> <factory - adaptableType="org.eclipse.jubula.tools.registration.AutIdentifier" + adaptableType="org.eclipse.jubula.tools.internal.registration.AutIdentifier" class="org.eclipse.jubula.client.ui.rcp.adapter.PropertySourceAdapterFactory"> <adapter type="org.eclipse.ui.views.properties.IPropertySource" /> </factory> @@ -807,7 +807,7 @@ <commandParameterType converter="org.eclipse.jubula.client.ui.rcp.command.parameters.AutIdentifierParameterValueConverter" id="org.eclipse.jubula.client.ui.rcp.commands.parametertypes.autId" - type="org.eclipse.jubula.tools.registration.AutIdentifier" /> + type="org.eclipse.jubula.tools.internal.registration.AutIdentifier" /> <commandParameterType converter="org.eclipse.jubula.client.ui.rcp.command.parameters.TestJobParameterValueConverter" id="org.eclipse.jubula.client.ui.rcp.commands.parametertypes.testJob" @@ -2561,7 +2561,7 @@ <iterate ifEmpty="false" operator="and"> - <instanceof value="org.eclipse.jubula.tools.registration.AutIdentifier" /> + <instanceof value="org.eclipse.jubula.tools.internal.registration.AutIdentifier" /> </iterate> </enabledWhen> </handler> diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/Plugin.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/Plugin.java index 7ef428657..367c5bf69 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/Plugin.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/Plugin.java @@ -66,12 +66,12 @@ import org.eclipse.jubula.client.ui.rcp.utils.Utils; import org.eclipse.jubula.client.ui.rcp.widgets.StatusLineContributionItem; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.views.IJBPart; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.exception.JBFatalException; -import org.eclipse.jubula.tools.exception.JBRuntimeException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBFatalException; +import org.eclipse.jubula.tools.internal.exception.JBRuntimeException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.osgi.util.NLS; import org.eclipse.search.ui.IQueryListener; import org.eclipse.search.ui.ISearchQuery; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/actions/PasteTreeItemActionTCBrowser.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/actions/PasteTreeItemActionTCBrowser.java index 9a4405746..82b8fd523 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/actions/PasteTreeItemActionTCBrowser.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/actions/PasteTreeItemActionTCBrowser.java @@ -20,7 +20,7 @@ import org.eclipse.jubula.client.ui.rcp.controllers.PMExceptionHandler; import org.eclipse.jubula.client.ui.rcp.controllers.dnd.LocalSelectionClipboardTransfer; import org.eclipse.jubula.client.ui.rcp.controllers.dnd.TCBrowserDndSupport; import org.eclipse.jubula.client.ui.rcp.views.TestCaseBrowser; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/adapter/PropertySourceAdapterFactory.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/adapter/PropertySourceAdapterFactory.java index 9f2558b24..d0f81cab0 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/adapter/PropertySourceAdapterFactory.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/adapter/PropertySourceAdapterFactory.java @@ -36,7 +36,7 @@ import org.eclipse.jubula.client.ui.rcp.controllers.propertysources.RefTestSuite import org.eclipse.jubula.client.ui.rcp.controllers.propertysources.SpecTestCaseGUIPropertySource; import org.eclipse.jubula.client.ui.rcp.controllers.propertysources.TestJobGUIPropertySource; import org.eclipse.jubula.client.ui.rcp.controllers.propertysources.TestSuiteGUIPropertySource; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.views.properties.IPropertySource; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ChooseTestSuiteBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ChooseTestSuiteBP.java index 074f9f8ea..78b213124 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ChooseTestSuiteBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ChooseTestSuiteBP.java @@ -45,8 +45,8 @@ import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.controllers.TestExecutionGUIController; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.utils.Utils; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ExportAllBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ExportAllBP.java index c882de657..514819c41 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ExportAllBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ExportAllBP.java @@ -20,7 +20,7 @@ import org.eclipse.jubula.client.archive.businessprocess.FileStorageBP; import org.eclipse.jubula.client.core.model.IProjectPO; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.exception.JBException; +import org.eclipse.jubula.tools.internal.exception.JBException; import org.eclipse.osgi.util.NLS; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ImportFileBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ImportFileBP.java index 3f1dbf870..d0b8788ec 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ImportFileBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ImportFileBP.java @@ -42,7 +42,7 @@ import org.eclipse.jubula.client.ui.rcp.handlers.project.OpenProjectHandler; import org.eclipse.jubula.client.ui.rcp.handlers.project.OpenProjectHandler.OpenProjectOperation; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.DialogUtils; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.PlatformUI; import org.osgi.framework.Bundle; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProblemsBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProblemsBP.java index 809220ba9..2eee1b66e 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProblemsBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProblemsBP.java @@ -67,15 +67,15 @@ import org.eclipse.jubula.client.ui.constants.Constants; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.utils.Utils; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.xml.businessmodell.InvalidAction; -import org.eclipse.jubula.tools.xml.businessmodell.InvalidComponent; -import org.eclipse.jubula.tools.xml.businessmodell.InvalidParam; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.xml.businessmodell.InvalidAction; +import org.eclipse.jubula.tools.internal.xml.businessmodell.InvalidComponent; +import org.eclipse.jubula.tools.internal.xml.businessmodell.InvalidParam; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java index a24f1b0cd..1c9ca4357 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java @@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jubula.client.ui.constants.Constants; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.dialogs.ProjectDialog.ProjectData; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java index 6e302b29d..1c789b568 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/RemoteFileBrowserBP.java @@ -20,8 +20,8 @@ import org.eclipse.jubula.communication.Communicator; import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.SendDirectoryMessage; import org.eclipse.jubula.communication.message.SendDirectoryResponseMessage; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowClientLogBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowClientLogBP.java index cab9a421a..f743c0ede 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowClientLogBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowClientLogBP.java @@ -14,7 +14,7 @@ import java.io.File; import java.util.Iterator; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.slf4j.LoggerFactory; import ch.qos.logback.classic.Logger; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java index e719d8da8..7df5a10a0 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ShowServerLogBP.java @@ -20,9 +20,9 @@ import org.eclipse.jubula.client.internal.BaseConnection.NotConnectedException; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.communication.message.SendServerLogMessage; import org.eclipse.jubula.communication.message.ServerLogResponseMessage; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/StartAutBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/StartAutBP.java index adc74834f..be6f12f10 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/StartAutBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/StartAutBP.java @@ -48,8 +48,8 @@ import org.eclipse.jubula.client.internal.AutAgentConnection; import org.eclipse.jubula.client.internal.exceptions.ConnectionException; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.JobUtils; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.exception.Assert; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ToolkitBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ToolkitBP.java index 28b0e9224..e158b934c 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ToolkitBP.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ToolkitBP.java @@ -31,10 +31,10 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.xml.businessmodell.ToolkitDescriptor; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ToolkitDescriptor; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/AutIdentifierParameterValueConverter.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/AutIdentifierParameterValueConverter.java index 7a9e115a3..a12ba637d 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/AutIdentifierParameterValueConverter.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/AutIdentifierParameterValueConverter.java @@ -13,8 +13,8 @@ package org.eclipse.jubula.client.ui.rcp.command.parameters; import org.eclipse.core.commands.AbstractParameterValueConverter; import org.eclipse.core.commands.ParameterValueConversionException; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/ParameterValueConverterUtil.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/ParameterValueConverterUtil.java index 35d102cd5..12821402b 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/ParameterValueConverterUtil.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/command/parameters/ParameterValueConverterUtil.java @@ -14,7 +14,7 @@ import org.apache.commons.lang.Validate; import org.eclipse.core.commands.ParameterValueConversionException; import org.eclipse.jubula.client.core.model.IPersistentObject; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/constants/InputCodeHelper.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/constants/InputCodeHelper.java index a22793298..e3a990637 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/constants/InputCodeHelper.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/constants/InputCodeHelper.java @@ -19,7 +19,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.InputConstants; +import org.eclipse.jubula.tools.internal.constants.InputConstants; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contentassist/TestDataCubeRefContentProposalProvider.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contentassist/TestDataCubeRefContentProposalProvider.java index 82eeef887..85bf4e740 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contentassist/TestDataCubeRefContentProposalProvider.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contentassist/TestDataCubeRefContentProposalProvider.java @@ -22,8 +22,8 @@ import org.eclipse.jubula.client.core.businessprocess.TestDataCubeBP; import org.eclipse.jubula.client.core.model.IParamDescriptionPO; import org.eclipse.jubula.client.core.model.IParameterInterfacePO; import org.eclipse.jubula.client.core.model.IProjectPO; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ConnectToAutAgentContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ConnectToAutAgentContributionItem.java index d0e45f418..fef6668c6 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ConnectToAutAgentContributionItem.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ConnectToAutAgentContributionItem.java @@ -25,8 +25,8 @@ import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.utils.AutAgentManager; import org.eclipse.jubula.client.ui.rcp.utils.AutAgentManager.AutAgent; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.utils.EnvironmentUtils; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.actions.CompoundContributionItem; import org.eclipse.ui.menus.CommandContributionItem; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/RunningAutsStartTestSuiteContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/RunningAutsStartTestSuiteContributionItem.java index 6bef63955..d684e7e18 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/RunningAutsStartTestSuiteContributionItem.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/RunningAutsStartTestSuiteContributionItem.java @@ -32,8 +32,8 @@ import org.eclipse.jubula.client.ui.rcp.businessprocess.ChooseTestSuiteBP; import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.rcp.handlers.StartTestSuiteHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartAutContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartAutContributionItem.java index 82662edc7..e268b68fc 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartAutContributionItem.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartAutContributionItem.java @@ -25,8 +25,8 @@ import org.eclipse.jubula.client.ui.rcp.businessprocess.StartAutBP; import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.rcp.handlers.StartAutHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.ui.actions.CompoundContributionItem; import org.eclipse.ui.menus.CommandContributionItem; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObjectMappingModeContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObjectMappingModeContributionItem.java index ec999d3fc..57f621972 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObjectMappingModeContributionItem.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObjectMappingModeContributionItem.java @@ -21,7 +21,7 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.rcp.handlers.StartObjectMappingModeHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.actions.CompoundContributionItem; import org.eclipse.ui.menus.CommandContributionItem; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObservationModeContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObservationModeContributionItem.java index a1e1af874..905abd73d 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObservationModeContributionItem.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/StartObservationModeContributionItem.java @@ -21,7 +21,7 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.rcp.handlers.StartObservationModeHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.actions.CompoundContributionItem; import org.eclipse.ui.menus.CommandContributionItem; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/TSBStartTestSuiteContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/TSBStartTestSuiteContributionItem.java index 3bd46748d..5461eddb4 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/TSBStartTestSuiteContributionItem.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/TSBStartTestSuiteContributionItem.java @@ -36,8 +36,8 @@ import org.eclipse.jubula.client.ui.rcp.constants.RCPCommandIDs; import org.eclipse.jubula.client.ui.rcp.handlers.StartTestJobHandler; import org.eclipse.jubula.client.ui.rcp.handlers.StartTestSuiteHandler; import org.eclipse.jubula.client.ui.utils.CommandHelper; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.ISelectionService; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/PMExceptionHandler.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/PMExceptionHandler.java index b0d2b9147..338ac59c3 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/PMExceptionHandler.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/PMExceptionHandler.java @@ -28,7 +28,7 @@ import org.eclipse.jubula.client.ui.rcp.editors.JBEditorHelper; import org.eclipse.jubula.client.ui.rcp.handlers.project.RefreshProjectHandler.RefreshProjectOperation; import org.eclipse.jubula.client.ui.rcp.utils.Utils; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java index d6e79dfc0..765b95628 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionContributor.java @@ -54,13 +54,13 @@ import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.OMEditorTreeLabel import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.client.ui.utils.JobUtils; import org.eclipse.jubula.communication.message.ChangeAUTModeMessage; -import org.eclipse.jubula.tools.constants.EnvConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.constants.TimingConstantsClient; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; -import org.eclipse.jubula.tools.registration.AutIdentifier; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.EnvConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.TimingConstantsClient; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java index 5e55b8d13..d177dd215 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/TestExecutionGUIController.java @@ -40,11 +40,11 @@ import org.eclipse.jubula.communication.ICommand; import org.eclipse.jubula.communication.message.Message; import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage; import org.eclipse.jubula.communication.message.StopAUTServerMessage; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.CommandConstants; -import org.eclipse.jubula.tools.exception.CommunicationException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.CommandConstants; +import org.eclipse.jubula.tools.internal.exception.CommunicationException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.osgi.util.NLS; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/AbstractBrowserDndSupport.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/AbstractBrowserDndSupport.java index 948cc99cf..604eb0d9f 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/AbstractBrowserDndSupport.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/AbstractBrowserDndSupport.java @@ -23,7 +23,7 @@ import org.eclipse.jubula.client.core.persistence.MultipleNodePM; import org.eclipse.jubula.client.core.persistence.MultipleNodePM.AbstractCmdHandle; import org.eclipse.jubula.client.core.persistence.MultipleNodePM.MoveNodeHandle; import org.eclipse.jubula.client.core.persistence.PMException; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TCBrowserDndSupport.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TCBrowserDndSupport.java index 4b354e37f..5db0ac62c 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TCBrowserDndSupport.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TCBrowserDndSupport.java @@ -22,7 +22,7 @@ import org.eclipse.jubula.client.core.model.ISpecObjContPO; import org.eclipse.jubula.client.core.model.ISpecTestCasePO; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.ui.rcp.controllers.MultipleTCBTracker; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TSBrowserDndSupport.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TSBrowserDndSupport.java index 79d193fb3..d24ec7859 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TSBrowserDndSupport.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TSBrowserDndSupport.java @@ -23,7 +23,7 @@ import org.eclipse.jubula.client.core.model.ITestJobPO; import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.ui.rcp.views.TestSuiteBrowser; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; /** diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestExecDropTargetListener.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestExecDropTargetListener.java index 277efe4d6..85479ce1a 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestExecDropTargetListener.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestExecDropTargetListener.java @@ -22,7 +22,7 @@ import org.eclipse.jubula.client.ui.constants.Constants; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.controllers.PMExceptionHandler; import org.eclipse.jubula.client.ui.rcp.views.TestSuiteBrowser; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.TransferData; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestSpecDropTargetListener.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestSpecDropTargetListener.java index ff6be0422..4365d6087 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestSpecDropTargetListener.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/TestSpecDropTargetListener.java @@ -21,7 +21,7 @@ import org.eclipse.jubula.client.ui.constants.Constants; import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.controllers.PMExceptionHandler; import org.eclipse.jubula.client.ui.rcp.views.TestCaseBrowser; -import org.eclipse.jubula.tools.exception.ProjectDeletedException; +import org.eclipse.jubula.tools.internal.exception.ProjectDeletedException; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.TransferData; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java index ecd005288..f7e4f856a 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/dnd/objectmapping/OMEditorDndSupport.java @@ -28,7 +28,7 @@ import org.eclipse.jubula.client.core.persistence.PMException; import org.eclipse.jubula.client.ui.rcp.controllers.PMExceptionHandler; import org.eclipse.jubula.client.ui.rcp.editors.ObjectMappingMultiPageEditor; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; -import org.eclipse.jubula.tools.messagehandling.MessageIDs; +import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/jobs/StartAutJob.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/jobs/StartAutJob.java index 376083f38..952bcf185 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/jobs/StartAutJob.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/jobs/StartAutJob.java @@ -24,8 +24,8 @@ import org.eclipse.jubula.client.ui.rcp.businessprocess.WorkingLanguageBP; import org.eclipse.jubula.client.ui.rcp.controllers.TestExecutionContributor; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.utils.TimeUtil; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.utils.TimeUtil; import org.eclipse.osgi.util.NLS; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertydescriptors/ParamTextPropertyDescriptor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertydescriptors/ParamTextPropertyDescriptor.java index 5665087ca..72419cb8e 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertydescriptors/ParamTextPropertyDescriptor.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertydescriptors/ParamTextPropertyDescriptor.java @@ -25,9 +25,9 @@ import org.eclipse.jubula.client.ui.rcp.controllers.ContentAssistCellEditor; import org.eclipse.jubula.client.ui.rcp.controllers.propertysources.AbstractNodePropertySource.AbstractParamValueController; import org.eclipse.jubula.client.ui.rcp.widgets.CheckedParamText; import org.eclipse.jubula.client.ui.rcp.widgets.ParamProposalProvider; -import org.eclipse.jubula.tools.xml.businessmodell.Param; -import org.eclipse.jubula.tools.xml.businessmodell.ParamValueSet; -import org.eclipse.jubula.tools.xml.businessmodell.ValueSetElement; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ParamValueSet; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ValueSetElement; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.TextPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractNodePropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractNodePropertySource.java index 982880268..d0fc6de83 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractNodePropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractNodePropertySource.java @@ -44,8 +44,8 @@ import org.eclipse.jubula.client.ui.rcp.controllers.propertydescriptors.JBProper import org.eclipse.jubula.client.ui.rcp.controllers.propertysources.IParameterPropertyController.ParameterInputType; import org.eclipse.jubula.client.ui.rcp.editors.IJBEditor; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractPropertySource.java index f86acf59e..07808505e 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AbstractPropertySource.java @@ -18,7 +18,7 @@ import org.eclipse.jubula.client.core.model.IParamNodePO; import org.eclipse.jubula.client.ui.constants.IconConstants; import org.eclipse.jubula.client.ui.controllers.propertysources.IPropertyController; import org.eclipse.jubula.client.ui.rcp.businessprocess.WorkingLanguageBP; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AutIdentifierPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AutIdentifierPropertySource.java index d24ed577b..9582872cc 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AutIdentifierPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/AutIdentifierPropertySource.java @@ -15,8 +15,8 @@ import org.eclipse.jubula.client.core.model.IAUTMainPO; import org.eclipse.jubula.client.core.model.IProjectPO; import org.eclipse.jubula.client.core.persistence.GeneralStorage; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.registration.AutIdentifier; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.registration.AutIdentifier; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java index 7696478f7..6db7c7a82 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/CapGUIPropertySource.java @@ -48,14 +48,14 @@ import org.eclipse.jubula.client.ui.rcp.factory.TestDataControlFactory; import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.ParameterValueLabelProvider; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.xml.businessmodell.Action; -import org.eclipse.jubula.tools.xml.businessmodell.CompSystem; -import org.eclipse.jubula.tools.xml.businessmodell.Component; -import org.eclipse.jubula.tools.xml.businessmodell.ConcreteComponent; -import org.eclipse.jubula.tools.xml.businessmodell.Param; -import org.eclipse.jubula.tools.xml.businessmodell.ValueSetElement; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Action; +import org.eclipse.jubula.tools.internal.xml.businessmodell.CompSystem; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Component; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ConcreteComponent; +import org.eclipse.jubula.tools.internal.xml.businessmodell.Param; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ValueSetElement; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/EventExecTestCaseGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/EventExecTestCaseGUIPropertySource.java index ce2c00b0f..3a50aaf70 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/EventExecTestCaseGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/EventExecTestCaseGUIPropertySource.java @@ -24,9 +24,9 @@ import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.DisabledLabelProvider; import org.eclipse.jubula.client.ui.utils.ErrorHandlingUtil; import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/ExecTestCaseGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/ExecTestCaseGUIPropertySource.java index 66175f770..53057ede1 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/ExecTestCaseGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/ExecTestCaseGUIPropertySource.java @@ -36,9 +36,9 @@ import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.DisabledLabelProv import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.ParameterValueLabelProvider; import org.eclipse.jubula.client.ui.rcp.validator.TestDataCubeReferenceValidator; import org.eclipse.jubula.client.ui.rcp.widgets.CheckedText.IValidator; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.i18n.I18n; -import org.eclipse.jubula.tools.xml.businessmodell.ParamValueSet; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.i18n.I18n; +import org.eclipse.jubula.tools.internal.xml.businessmodell.ParamValueSet; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMLogicNameGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMLogicNameGUIPropertySource.java index 9b4c18b53..46b0bc7e6 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMLogicNameGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMLogicNameGUIPropertySource.java @@ -21,9 +21,9 @@ import org.eclipse.jubula.client.ui.rcp.Plugin; import org.eclipse.jubula.client.ui.rcp.controllers.propertydescriptors.JBPropertyDescriptor; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.PropertyControllerLabelProvider; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.JBException; -import org.eclipse.jubula.tools.i18n.CompSystemI18n; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.JBException; +import org.eclipse.jubula.tools.internal.i18n.CompSystemI18n; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMTechNameGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMTechNameGUIPropertySource.java index e94f79c05..826b3faba 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMTechNameGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/OMTechNameGUIPropertySource.java @@ -20,8 +20,8 @@ import org.eclipse.jubula.client.ui.constants.IconConstants; import org.eclipse.jubula.client.ui.rcp.controllers.propertydescriptors.JBPropertyDescriptor; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.PropertyControllerLabelProvider; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.objects.IComponentIdentifier; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier; import org.eclipse.swt.graphics.Image; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/RefTestSuiteGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/RefTestSuiteGUIPropertySource.java index df451ab2d..edb47a29e 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/RefTestSuiteGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/RefTestSuiteGUIPropertySource.java @@ -25,9 +25,9 @@ import org.eclipse.jubula.client.core.model.ITestSuitePO; import org.eclipse.jubula.client.ui.rcp.controllers.propertydescriptors.JBPropertyDescriptor; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.DisabledLabelProvider; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/SpecTestCaseGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/SpecTestCaseGUIPropertySource.java index 9bca93a7c..79fb563ba 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/SpecTestCaseGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/SpecTestCaseGUIPropertySource.java @@ -13,6 +13,7 @@ package org.eclipse.jubula.client.ui.rcp.controllers.propertysources; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; + import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.eclipse.jface.fieldassist.ContentProposalAdapter; @@ -44,8 +45,8 @@ import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.DisabledLabelProv import org.eclipse.jubula.client.ui.rcp.provider.labelprovider.ParameterValueLabelProvider; import org.eclipse.jubula.client.ui.rcp.validator.TestDataCubeReferenceValidator; import org.eclipse.jubula.client.ui.rcp.widgets.CheckedText.IValidator; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.i18n.I18n; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.i18n.I18n; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/TestSuiteGUIPropertySource.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/TestSuiteGUIPropertySource.java index 95fa354ec..847d0e1fb 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/TestSuiteGUIPropertySource.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/controllers/propertysources/TestSuiteGUIPropertySource.java @@ -31,10 +31,10 @@ import org.eclipse.jubula.client.ui.rcp.controllers.PMExceptionHandler; import org.eclipse.jubula.client.ui.rcp.controllers.propertydescriptors.IntegerTextPropertyDescriptor; import org.eclipse.jubula.client.ui.rcp.editors.AbstractJBEditor; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.StringConstants; -import org.eclipse.jubula.tools.exception.Assert; -import org.eclipse.jubula.tools.exception.InvalidDataException; -import org.eclipse.jubula.tools.i18n.I18n; +import org.eclipse.jubula.tools.internal.constants.StringConstants; +import org.eclipse.jubula.tools.internal.exception.Assert; +import org.eclipse.jubula.tools.internal.exception.InvalidDataException; +import org.eclipse.jubula.tools.internal.i18n.I18n; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/databinding/validators/AutIdValidator.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/databinding/validators/AutIdValidator.java index a030cbe85..8009c0322 100644 --- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/databinding/validators/AutIdValidator.java +++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/databinding/validators/AutIdValidator.java @@ -22,8 +22,8 @@ import org.eclipse.jubula.client.core.model.IAUTMainPO; import org.eclipse.jubula.client.core.model.IProjectPO; import org.eclipse.jubula.client.core.utils.NameValidationUtil; import org.eclipse.jubula.client.ui.rcp.i18n.Messages; -import org.eclipse.jubula.tools.constants.AutConfigConstants; -import org.eclipse.jubula.tools.constants.StringConstants; +import org.eclipse.jubula.tools.internal.constants.AutConfigConstants; +i |