summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-09 11:20:21 (EST)
committerStephan Born2012-04-27 06:35:11 (EDT)
commitad99bc1e4b5bc9047bb8fa158b5dbc03faacf495 (patch)
treeebfb6c2e443067378f1fa12e21a96d218dcbc4b4
parentd6d68809d984076365ac3f03232de688a8b72da5 (diff)
downloadorg.eclipse.stardust.reporting.rt-ad99bc1e4b5bc9047bb8fa158b5dbc03faacf495.zip
org.eclipse.stardust.reporting.rt-ad99bc1e4b5bc9047bb8fa158b5dbc03faacf495.tar.gz
org.eclipse.stardust.reporting.rt-ad99bc1e4b5bc9047bb8fa158b5dbc03faacf495.tar.bz2
Jira-ID: CRNT-23200 Stardust: Rename NL Plugins to new name pattern (fixing missing externalized Strings)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/reporting.rt@53674 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/AbstractQualityAssuranceView.java12
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/DbAwareGroupColumn.java2
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceCodeView.java14
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceView.java24
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingCommon_Messages.java6
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/WorkflowUserView.java18
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/beans/cache/EngineCacheManager.java28
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metadata/columns/DbTable.java2
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metamodel/Step.java188
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/reportingcommon-messages.properties3
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LargeStringResolver.java22
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LocaleUtils.java6
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/CompareOperator.java12
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/DbUtils.java68
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/JoinExpression.java12
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/LogicalOperator.java4
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/SqlExpression.java4
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/WhereExpression.java8
18 files changed, 221 insertions, 212 deletions
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/AbstractQualityAssuranceView.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/AbstractQualityAssuranceView.java
index 823991d..c4e868f 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/AbstractQualityAssuranceView.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/AbstractQualityAssuranceView.java
@@ -29,12 +29,12 @@ public abstract class AbstractQualityAssuranceView extends View
super(id);
ReportingTimestampRange timestampRange = new View.ReportingTimestampRange();
- addParameter("StartDate", java.sql.Timestamp.class, false, timestampRange
+ addParameter("StartDate", java.sql.Timestamp.class, false, timestampRange //$NON-NLS-1$
.getSqlStartTimestamp().toString(), null);
- addParameter("EndDate", java.sql.Timestamp.class, false, timestampRange
+ addParameter("EndDate", java.sql.Timestamp.class, false, timestampRange //$NON-NLS-1$
.getSqlEndTimestamp().toString(), null);
- addParameter("ProcessId", String.class, false, STRING_DEFAULT_VALUE, null);
- addParameter("ActivityId", String.class, false, STRING_DEFAULT_VALUE, null);
+ addParameter("ProcessId", String.class, false, STRING_DEFAULT_VALUE, null); //$NON-NLS-1$
+ addParameter("ActivityId", String.class, false, STRING_DEFAULT_VALUE, null); //$NON-NLS-1$
addParameter(MODEL_OID_PARAMETER_NAME, String.class, false, STRING_DEFAULT_VALUE, null);
}
@@ -130,9 +130,9 @@ public abstract class AbstractQualityAssuranceView extends View
//build the sql statement
StringBuffer buffer = new StringBuffer();
- buffer.append("select ");
+ buffer.append("select "); //$NON-NLS-1$
buffer.append(DbUtils.getColumnList(structure.getSelectColumns()));
- buffer.append(" from ").append(
+ buffer.append(" from ").append( //$NON-NLS-1$
getCurrentPartitionSqlFragment(structure.getFromTable()));
for(JoinExpression join: structure.getJoins())
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/DbAwareGroupColumn.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/DbAwareGroupColumn.java
index 1436baf..6442672 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/DbAwareGroupColumn.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/DbAwareGroupColumn.java
@@ -52,7 +52,7 @@ public class DbAwareGroupColumn extends GroupColumn
@SuppressWarnings("rawtypes")
public Object getValue(ResultSet rs) throws SQLException
{
- Assert.isNotNull(dbColumn, "dbColumn property must no be null");
+ Assert.isNotNull(dbColumn, "dbColumn property must no be null"); //$NON-NLS-1$
Class type = this.getType();
int rsIndex = dbColumn.getRsIndex();
return SqlUtils.getColumnValue(type, rs, rsIndex);
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceCodeView.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceCodeView.java
index f5fc0a6..9900331 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceCodeView.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceCodeView.java
@@ -32,9 +32,9 @@ public class QualityAssuranceCodeView extends AbstractQualityAssuranceView
{
private static Logger log = LogUtils.getLogger(QualityAssuranceCodeView.class);
- public static final String REPORT_TYPE = "QualityAssuranceCodesView";
+ public static final String REPORT_TYPE = "QualityAssuranceCodesView"; //$NON-NLS-1$
- private static final String AI_PROPERTY_ALIAS = "aip";
+ private static final String AI_PROPERTY_ALIAS = "aip"; //$NON-NLS-1$
private DbAwareGroupColumn activityInstanceOidColumn;
@@ -59,10 +59,10 @@ public class QualityAssuranceCodeView extends AbstractQualityAssuranceView
protected void createDefaultFields()
{
reportColumns = new ArrayList<DbAwareGroupColumn>();
- activityInstanceOidColumn = new DbAwareGroupColumn(this, "ActivityInstanceOid", ReportingCommon_Messages.ActivityInstanceOid, java.lang.String.class);
- qaCodeKeyColumn = new DbAwareGroupColumn(this, "QualityAssuranceCodeKey", ReportingCommon_Messages.QualityAssuranceCodeKey, java.lang.String.class);
- qaCodeValueColumn = new DbAwareGroupColumn(this, "QualityAssuranceCodeValue", ReportingCommon_Messages.QualityAssuranceCodeValue, java.lang.String.class);
- qaAssignDateColumn = new DbAwareGroupColumn(this, "AssignDate", ReportingCommon_Messages.AssignDate, Date.class);
+ activityInstanceOidColumn = new DbAwareGroupColumn(this, "ActivityInstanceOid", ReportingCommon_Messages.ActivityInstanceOid, java.lang.String.class); //$NON-NLS-1$
+ qaCodeKeyColumn = new DbAwareGroupColumn(this, "QualityAssuranceCodeKey", ReportingCommon_Messages.QualityAssuranceCodeKey, java.lang.String.class); //$NON-NLS-1$
+ qaCodeValueColumn = new DbAwareGroupColumn(this, "QualityAssuranceCodeValue", ReportingCommon_Messages.QualityAssuranceCodeValue, java.lang.String.class); //$NON-NLS-1$
+ qaAssignDateColumn = new DbAwareGroupColumn(this, "AssignDate", ReportingCommon_Messages.AssignDate, Date.class); //$NON-NLS-1$
reportColumns.add(activityInstanceOidColumn);
reportColumns.add(qaCodeKeyColumn);
@@ -221,7 +221,7 @@ public class QualityAssuranceCodeView extends AbstractQualityAssuranceView
}
catch (Exception e)
{
- log.error("Exception during getting ActivityInstanceAttribute object ", e);
+ log.error("Exception during getting ActivityInstanceAttribute object ", e); //$NON-NLS-1$
}
if(aiAttributes != null && aiAttributes.getQualityAssuranceResult() != null)
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceView.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceView.java
index 17a02c7..18c390d 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceView.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/QualityAssuranceView.java
@@ -31,13 +31,13 @@ import org.eclipse.stardust.reporting.common.utils.sql.SqlExpression;
public class QualityAssuranceView extends AbstractQualityAssuranceView
{
- public static final String AI_PROPERTY_ALIAS_QASTATE = "aipqas";
+ public static final String AI_PROPERTY_ALIAS_QASTATE = "aipqas"; //$NON-NLS-1$
- public static final String AI_PROPERTY_ALIAS_QARESULT = "aipqar";
+ public static final String AI_PROPERTY_ALIAS_QARESULT = "aipqar"; //$NON-NLS-1$
private static Logger log = LogUtils.getLogger(QualityAssuranceView.class);
- public static final String QA_VIEW_REPORT_TYPE = "QualityAssuranceView";
+ public static final String QA_VIEW_REPORT_TYPE = "QualityAssuranceView"; //$NON-NLS-1$
private List<DbAwareGroupColumn> reportColumns;
@@ -74,14 +74,14 @@ public class QualityAssuranceView extends AbstractQualityAssuranceView
protected void createDefaultFields()
{
reportColumns = new ArrayList<DbAwareGroupColumn>();
- processDefinitionNameColumn = new DbAwareGroupColumn(this, "ProcessDefinitionName", ReportingCommon_Messages.ProcessDefinitionName, java.lang.String.class);
- processDefinitionOidColumn = new DbAwareGroupColumn(this, "ProcessDefinitionOid", ReportingCommon_Messages.ProcessDefinitionOid, java.lang.String.class);
- processInstanceIOid = new DbAwareGroupColumn(this, "ProcessInstanceOid", ReportingCommon_Messages.ProcessInstanceOid, java.lang.String.class);
- activityNameColumn = new DbAwareGroupColumn(this, "ActivityName", ReportingCommon_Messages.ActivityName, java.lang.String.class);
- activityOidColumn = new DbAwareGroupColumn(this, "ActivityOid", ReportingCommon_Messages.ActivityOid,java.lang.String.class);
- activityInstanceOidColumn = new DbAwareGroupColumn(this, "ActivityInstanceOid",ReportingCommon_Messages.ActivityInstanceOid, java.lang.String.class);
- qaStateColumn = new DbAwareGroupColumn(this, "QualityAssuranceState",ReportingCommon_Messages.QualityAssuranceState, java.lang.String.class);
- qaResultStateColumn = new DbAwareGroupColumn(this, "QualityAssuranceResult",ReportingCommon_Messages.QualityAssuranceResult, java.lang.String.class);
+ processDefinitionNameColumn = new DbAwareGroupColumn(this, "ProcessDefinitionName", ReportingCommon_Messages.ProcessDefinitionName, java.lang.String.class); //$NON-NLS-1$
+ processDefinitionOidColumn = new DbAwareGroupColumn(this, "ProcessDefinitionOid", ReportingCommon_Messages.ProcessDefinitionOid, java.lang.String.class); //$NON-NLS-1$
+ processInstanceIOid = new DbAwareGroupColumn(this, "ProcessInstanceOid", ReportingCommon_Messages.ProcessInstanceOid, java.lang.String.class); //$NON-NLS-1$
+ activityNameColumn = new DbAwareGroupColumn(this, "ActivityName", ReportingCommon_Messages.ActivityName, java.lang.String.class); //$NON-NLS-1$
+ activityOidColumn = new DbAwareGroupColumn(this, "ActivityOid", ReportingCommon_Messages.ActivityOid,java.lang.String.class); //$NON-NLS-1$
+ activityInstanceOidColumn = new DbAwareGroupColumn(this, "ActivityInstanceOid",ReportingCommon_Messages.ActivityInstanceOid, java.lang.String.class); //$NON-NLS-1$
+ qaStateColumn = new DbAwareGroupColumn(this, ReportingCommon_Messages.QualityAssuranceView_9,ReportingCommon_Messages.QualityAssuranceState, java.lang.String.class);
+ qaResultStateColumn = new DbAwareGroupColumn(this, ReportingCommon_Messages.QualityAssuranceView_10,ReportingCommon_Messages.QualityAssuranceResult, java.lang.String.class);
reportColumns.add(processDefinitionNameColumn);
reportColumns.add(processDefinitionOidColumn);
@@ -282,7 +282,7 @@ public class QualityAssuranceView extends AbstractQualityAssuranceView
}
catch(Exception e)
{
- log.error("Exception during getting ActivityInstanceAttribute object ", e);
+ log.error(ReportingCommon_Messages.QualityAssuranceView_11, e);
}
results[rowIndex][columnIndex] = replacementValue;
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingCommon_Messages.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingCommon_Messages.java
index 42e0c92..d233a7e 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingCommon_Messages.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/ReportingCommon_Messages.java
@@ -12,6 +12,12 @@ public class ReportingCommon_Messages extends NLS
public static String QualityAssuranceView;
+ public static String QualityAssuranceView_10;
+
+ public static String QualityAssuranceView_11;
+
+ public static String QualityAssuranceView_9;
+
public static String QualityAssuranceCodeView;
public static String WorkflowUserView;
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/WorkflowUserView.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/WorkflowUserView.java
index 9e11811..547b2dc 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/WorkflowUserView.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/WorkflowUserView.java
@@ -20,9 +20,9 @@ import org.eclipse.stardust.reporting.common.utils.sql.DbUtils;
public class WorkflowUserView extends View
{
- public static final String WU_VIEW_REPORT_TYPE = "WorkflowUserView";
+ public static final String WU_VIEW_REPORT_TYPE = "WorkflowUserView"; //$NON-NLS-1$
- private static final String WORKFLOW_USER_TABLE_ALIAS = "wu";
+ private static final String WORKFLOW_USER_TABLE_ALIAS = "wu"; //$NON-NLS-1$
private List<DbAwareGroupColumn> reportColumns;
@@ -48,11 +48,11 @@ public class WorkflowUserView extends View
protected void createDefaultFields()
{
reportColumns = new ArrayList<DbAwareGroupColumn>();
- oidColumn = new DbAwareGroupColumn(this, "Oid", ReportingCommon_Messages.Oid ,java.lang.String.class);
- accountColumn = new DbAwareGroupColumn(this, "Account", ReportingCommon_Messages.Account, java.lang.String.class);
- firstNameColumn = new DbAwareGroupColumn(this, "FirstName", ReportingCommon_Messages.FirstName, java.lang.String.class);
- lastNameColumn = new DbAwareGroupColumn(this, "LastName", ReportingCommon_Messages.LastName, java.lang.String.class);
- descriptionColumn = new DbAwareGroupColumn(this, "Description", ReportingCommon_Messages.DescriptionAttribute, java.lang.String.class);
+ oidColumn = new DbAwareGroupColumn(this, "Oid", ReportingCommon_Messages.Oid ,java.lang.String.class); //$NON-NLS-1$
+ accountColumn = new DbAwareGroupColumn(this, "Account", ReportingCommon_Messages.Account, java.lang.String.class); //$NON-NLS-1$
+ firstNameColumn = new DbAwareGroupColumn(this, "FirstName", ReportingCommon_Messages.FirstName, java.lang.String.class); //$NON-NLS-1$
+ lastNameColumn = new DbAwareGroupColumn(this, "LastName", ReportingCommon_Messages.LastName, java.lang.String.class); //$NON-NLS-1$
+ descriptionColumn = new DbAwareGroupColumn(this, "Description", ReportingCommon_Messages.DescriptionAttribute, java.lang.String.class); //$NON-NLS-1$
reportColumns.add(oidColumn);
reportColumns.add(accountColumn);
@@ -101,9 +101,9 @@ public class WorkflowUserView extends View
//build the sql statement
StringBuffer buffer = new StringBuffer();
String selectedColumns = DbUtils.getColumnList(selectedDbColumns);
- buffer.append("select ");
+ buffer.append("select "); //$NON-NLS-1$
buffer.append(selectedColumns);
- buffer.append(" from ").append(workflowUserTable);
+ buffer.append(" from ").append(workflowUserTable); //$NON-NLS-1$
//buffer.append(" where ");
//buffer.append(getWhereString(parameters));
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/beans/cache/EngineCacheManager.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/beans/cache/EngineCacheManager.java
index f1b9911..1e418e4 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/beans/cache/EngineCacheManager.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/beans/cache/EngineCacheManager.java
@@ -118,25 +118,25 @@ public final class EngineCacheManager
DBDescriptor dbDescriptor = DbUtils.getDbDescriptor(connection);
DbColumn modelTable = new DbColumn(ModelPersistorBean.TABLE_NAME, schemaName,
- "m");
+ "m"); //$NON-NLS-1$
DbColumn disabledColumnName = new DbColumn(ModelPersistorBean.FIELD__DISABLED,
- "m");
+ "m"); //$NON-NLS-1$
DbColumn modelPartionColumnName = new DbColumn(
- ModelPersistorBean.FIELD__PARTITION, "m");
+ ModelPersistorBean.FIELD__PARTITION, "m"); //$NON-NLS-1$
int partitionOid = partitionInfo.getPartitionOid();
String selectList = DbUtils.getColumnList(dbDescriptor, new IDbColumn[] {
- new DbColumn(ModelPersistorBean.FIELD__OID, "m"),
- new DbColumn(ModelPersistorBean.FIELD__ID, "m"),
- new DbColumn(ModelPersistorBean.FIELD__VERSION, "m"),
- new DbColumn(ModelPersistorBean.FIELD__VALID_FROM, "m"),
- new DbColumn(ModelPersistorBean.FIELD__VALID_TO, "m"),
- new DbColumn(ModelPersistorBean.FIELD__DEPLOYMENT_STAMP, "m")});
-
- buffer.append("select ").append(selectList).append(" from ")
- .append(modelTable.getQualifiedNameWithAlias()).append(" where ")
- .append(modelPartionColumnName).append(" = ?").append(" and ")
- .append(disabledColumnName).append(" = ?");
+ new DbColumn(ModelPersistorBean.FIELD__OID, "m"), //$NON-NLS-1$
+ new DbColumn(ModelPersistorBean.FIELD__ID, "m"), //$NON-NLS-1$
+ new DbColumn(ModelPersistorBean.FIELD__VERSION, "m"), //$NON-NLS-1$
+ new DbColumn(ModelPersistorBean.FIELD__VALID_FROM, "m"), //$NON-NLS-1$
+ new DbColumn(ModelPersistorBean.FIELD__VALID_TO, "m"), //$NON-NLS-1$
+ new DbColumn(ModelPersistorBean.FIELD__DEPLOYMENT_STAMP, "m")}); //$NON-NLS-1$
+
+ buffer.append("select ").append(selectList).append(" from ") //$NON-NLS-1$ //$NON-NLS-2$
+ .append(modelTable.getQualifiedNameWithAlias()).append(" where ") //$NON-NLS-1$
+ .append(modelPartionColumnName).append(" = ?").append(" and ") //$NON-NLS-1$ //$NON-NLS-2$
+ .append(disabledColumnName).append(" = ?"); //$NON-NLS-1$
ps = connection.prepareStatement(buffer.toString());
ps.setInt(1, partitionOid);
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metadata/columns/DbTable.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metadata/columns/DbTable.java
index a3b245f..3fa9ad5 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metadata/columns/DbTable.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metadata/columns/DbTable.java
@@ -24,7 +24,7 @@ public class DbTable
{
StringBuffer buffer = new StringBuffer();
buffer.append(DbUtils.getQualifiedTableName(schema, name));
- buffer.append(" ");
+ buffer.append(" "); //$NON-NLS-1$
buffer.append(alias);
return buffer.toString();
}
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metamodel/Step.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metamodel/Step.java
index e9bb552..f21fe42 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metamodel/Step.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/metamodel/Step.java
@@ -68,7 +68,7 @@ public class Step
*/
List traverse(List startObjects, Object filterParameter)
{
- log.debug("=> traverse(" + startObjects + ")");
+ log.debug("=> traverse(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
if (startObjects.size() == 0)
{
@@ -76,7 +76,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Empty list of start objects. Returning.");
+ log.debug("Empty list of start objects. Returning."); //$NON-NLS-1$
}
return startObjects;
@@ -89,115 +89,115 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Link " + getLink().getName() + " to Node "
+ log.debug("Link " + getLink().getName() + " to Node " //$NON-NLS-1$ //$NON-NLS-2$
+ getLink().getToNode().getName());
}
if (getLink().getToNode().equals(
Metamodel.getInstance().propertiesCategory)
- && getLink().getName().equals("propertiesCategories"))
+ && getLink().getName().equals("propertiesCategories")) //$NON-NLS-1$
{
traversePropertiesCategories(startObjects, unfilteredResult);
}
else if (getLink().getFromNode().equals(
Metamodel.getInstance().propertiesCategory)
- && getLink().getName().equals("subCategories"))
+ && getLink().getName().equals("subCategories")) //$NON-NLS-1$
{
traverseSubPropertiesCategories(startObjects, unfilteredResult);
}
else if (getLink().getFromNode().equals(Metamodel.getInstance().process)
- && getLink().getName().equals("possibleSubProcesses"))
+ && getLink().getName().equals("possibleSubProcesses")) //$NON-NLS-1$
{
traverseSubprocesses(startObjects, unfilteredResult);
}
else if (getLink().getFromNode().equals(Metamodel.getInstance().process)
- && getLink().getName().equals("superprocesses"))
+ && getLink().getName().equals("superprocesses")) //$NON-NLS-1$
{
traverseSuperprocesses(startObjects, unfilteredResult);
}
else if (getLink().getFromNode().equals(Metamodel.getInstance().process)
&& getLink().getToNode().equals(Metamodel.getInstance().role)
- && getLink().getName().equals("startingParticipant"))
+ && getLink().getName().equals("startingParticipant")) //$NON-NLS-1$
{
traverseStartingRoleParticipant(startObjects, unfilteredResult);
}
else if (getLink().getFromNode().equals(Metamodel.getInstance().process)
&& getLink().getToNode().equals(
Metamodel.getInstance().organization)
- && getLink().getName().equals("startingParticipant"))
+ && getLink().getName().equals("startingParticipant")) //$NON-NLS-1$
{
traverseStartingOrganizationParticipant(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Role")
- && getLink().getName().equals("activitiesPerformedBy"))
+ else if (getLink().getFromNode().getName().equals("Role") //$NON-NLS-1$
+ && getLink().getName().equals("activitiesPerformedBy")) //$NON-NLS-1$
{
traverseActivitiesPerformedByRole(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Role")
- && getLink().getName().equals("processesStartedBy"))
+ else if (getLink().getFromNode().getName().equals("Role") //$NON-NLS-1$
+ && getLink().getName().equals("processesStartedBy")) //$NON-NLS-1$
{
traverseProcessesStartedByRole(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Organization")
- && getLink().getName().equals("activitiesPerformedBy"))
+ else if (getLink().getFromNode().getName().equals("Organization") //$NON-NLS-1$
+ && getLink().getName().equals("activitiesPerformedBy")) //$NON-NLS-1$
{
traverseActivitiesPerformedByOrganization(startObjects,
unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Organization")
- && getLink().getName().equals("processesStartedBy"))
+ else if (getLink().getFromNode().getName().equals("Organization") //$NON-NLS-1$
+ && getLink().getName().equals("processesStartedBy")) //$NON-NLS-1$
{
traverseProcessesStartedByOrganization(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Application")
- && getLink().getName().equals("activitiesPerformedBy"))
+ else if (getLink().getFromNode().getName().equals("Application") //$NON-NLS-1$
+ && getLink().getName().equals("activitiesPerformedBy")) //$NON-NLS-1$
{
traverseActivitiesExecutingApplication(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Application")
- && getLink().getName().equals("applicationContexts"))
+ else if (getLink().getFromNode().getName().equals("Application") //$NON-NLS-1$
+ && getLink().getName().equals("applicationContexts")) //$NON-NLS-1$
{
traverseApplicationContexts(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Activity")
- && getLink().getName().equals("previous"))
+ else if (getLink().getFromNode().getName().equals("Activity") //$NON-NLS-1$
+ && getLink().getName().equals("previous")) //$NON-NLS-1$
{
traversePreviousActivities(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Activity")
- && getLink().getName().equals("next"))
+ else if (getLink().getFromNode().getName().equals("Activity") //$NON-NLS-1$
+ && getLink().getName().equals("next")) //$NON-NLS-1$
{
traverseNextActivities(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Activity")
- && getLink().getName().equals("hasInputData"))
+ else if (getLink().getFromNode().getName().equals("Activity") //$NON-NLS-1$
+ && getLink().getName().equals("hasInputData")) //$NON-NLS-1$
{
traverseInData(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Activity")
- && getLink().getName().equals("hasOutputData"))
+ else if (getLink().getFromNode().getName().equals("Activity") //$NON-NLS-1$
+ && getLink().getName().equals("hasOutputData")) //$NON-NLS-1$
{
traverseOutData(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Activity")
- && getLink().getName().equals("hasData"))
+ else if (getLink().getFromNode().getName().equals("Activity") //$NON-NLS-1$
+ && getLink().getName().equals("hasData")) //$NON-NLS-1$
{
traverseData(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Data")
- && getLink().getName().equals("inputFor"))
+ else if (getLink().getFromNode().getName().equals("Data") //$NON-NLS-1$
+ && getLink().getName().equals("inputFor")) //$NON-NLS-1$
{
traverseInputFor(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Data")
- && getLink().getName().equals("outputOf"))
+ else if (getLink().getFromNode().getName().equals("Data") //$NON-NLS-1$
+ && getLink().getName().equals("outputOf")) //$NON-NLS-1$
{
traverseOutputOf(startObjects, unfilteredResult);
}
- else if (getLink().getFromNode().getName().equals("Data")
- && getLink().getName().equals("dataFor"))
+ else if (getLink().getFromNode().getName().equals("Data") //$NON-NLS-1$
+ && getLink().getName().equals("dataFor")) //$NON-NLS-1$
{
traverseDataFor(startObjects, unfilteredResult);
}
@@ -211,13 +211,13 @@ public class Step
&& getLink().getFromNode().equals(
Metamodel.getInstance().propertiesCategory))
{
- methodName = "getAttributes";
+ methodName = "getAttributes"; //$NON-NLS-1$
}
else if (getLink().getToNode()
.equals(Metamodel.getInstance().property)
- && getLink().getName().equals("properties"))
+ && getLink().getName().equals("properties")) //$NON-NLS-1$
{
- methodName = "getAllAttributes";
+ methodName = "getAllAttributes"; //$NON-NLS-1$
}
else
{
@@ -227,11 +227,11 @@ public class Step
if (getLink().getCardinality() == Link.TO_MANY_CARDINALITY)
{
- prefix = "getAll";
+ prefix = "getAll"; //$NON-NLS-1$
}
else
{
- prefix = "get";
+ prefix = "get"; //$NON-NLS-1$
}
methodName = prefix
@@ -241,7 +241,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Traverse method name: " + methodName);
+ log.debug("Traverse method name: " + methodName); //$NON-NLS-1$
}
// Determine traverse method
@@ -252,7 +252,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("Start object: " + startObjects.get(0).getClass());
+ log.debug("Start object: " + startObjects.get(0).getClass()); //$NON-NLS-1$
}
method = startObjects.get(0).getClass().getMethod(methodName,
@@ -269,7 +269,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Traversal method: " + method.getName());
+ log.debug("Traversal method: " + method.getName()); //$NON-NLS-1$
}
if(null != method)
@@ -280,7 +280,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("Traversing object " + startObjects.get(n));
+ log.debug("Traversing object " + startObjects.get(n)); //$NON-NLS-1$
}
// Obtain iterator for traversal of the current start object
@@ -302,7 +302,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("List retrieved with size " + list.size());
+ log.debug("List retrieved with size " + list.size()); //$NON-NLS-1$
}
unfilteredResult.addAll(list);
@@ -314,7 +314,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Map retrieved with size " + map.size());
+ log.debug("Map retrieved with size " + map.size()); //$NON-NLS-1$
}
Iterator propertyIterator = map.keySet().iterator();
@@ -324,7 +324,7 @@ public class Step
String key = (String) propertyIterator.next();
Object value = map.get(key);
- String stringifiedValue = null == value ? "" : value.toString();
+ String stringifiedValue = null == value ? "" : value.toString(); //$NON-NLS-1$
unfilteredResult.add(new PropertyHolder(key, stringifiedValue));
}
}
@@ -337,7 +337,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Retrieved object " + object);
+ log.debug("Retrieved object " + object); //$NON-NLS-1$
}
if (object != null)
@@ -369,7 +369,7 @@ public class Step
// Filter retrieved iterator by ids
- String getIDMethodName = "getId";
+ String getIDMethodName = "getId"; //$NON-NLS-1$
Method getIDMethod = null;
while (iterator.hasNext())
@@ -378,7 +378,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Filtering object " + object);
+ log.debug("Filtering object " + object); //$NON-NLS-1$
}
if (getIDMethod == null)
@@ -387,7 +387,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("Retrieve method " + getIDMethodName + " from "
+ log.debug("Retrieve method " + getIDMethodName + " from " //$NON-NLS-1$ //$NON-NLS-2$
+ object);
}
@@ -420,7 +420,7 @@ public class Step
{
// TODO Unify once ported to kernel
- id = "Pups";
+ id = "Pups"; //$NON-NLS-1$
//id = ((IApplicationContext)object).getUniqueId();
}
else
@@ -449,8 +449,8 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Comparing filter regular expression " + filterParameter
- + " with " + id);
+ log.debug("Comparing filter regular expression " + filterParameter //$NON-NLS-1$
+ + " with " + id); //$NON-NLS-1$
}
if (id == null || id.length() == 0 || !id.matches(stringFilter))
@@ -491,14 +491,14 @@ public class Step
*/
private void traversePropertiesCategories(List startObjects, List result)
{
- log.debug("==> traversePropertiesCategories(" + startObjects + ")");
+ log.debug("==> traversePropertiesCategories(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
List list = AttributeUtil
.getAttributeCategories((AttributeHolder) startObjects.get(i));
- log.debug("Properties category list: " + list.size() + " in "
+ log.debug("Properties category list: " + list.size() + " in " //$NON-NLS-1$ //$NON-NLS-2$
+ startObjects.get(i));
result.addAll(list);
@@ -513,14 +513,14 @@ public class Step
*/
private void traverseSubPropertiesCategories(List startObjects, List result)
{
- log.debug("==> traverseSubPropertyCategories(" + startObjects + ")");
+ log.debug("==> traverseSubPropertyCategories(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
List list = ((AttributeCategory) startObjects.get(i))
.getAttributeCategories();
- log.debug("Properties category list: " + list.size() + " in "
+ log.debug("Properties category list: " + list.size() + " in " //$NON-NLS-1$ //$NON-NLS-2$
+ startObjects.get(i));
result.addAll(list);
@@ -535,7 +535,7 @@ public class Step
*/
private void traverseSubprocesses(List startObjects, List result)
{
- log.debug("==> traverseSubprocesses(" + startObjects + ")");
+ log.debug("==> traverseSubprocesses(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -568,7 +568,7 @@ public class Step
*/
private void traverseSuperprocesses(List startObjects, List result)
{
- log.debug("==> traverseSuperprocesses(" + startObjects + ")");
+ log.debug("==> traverseSuperprocesses(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
IModel model = null;
@@ -621,7 +621,7 @@ public class Step
*/
private void traverseStartingRoleParticipant(List startObjects, List result)
{
- log.debug("==> traverseStartingRoleParticipant(" + startObjects + ")");
+ log.debug("==> traverseStartingRoleParticipant(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
IModel model = null;
@@ -668,8 +668,8 @@ public class Step
private void traverseStartingOrganizationParticipant(List startObjects,
List result)
{
- log.debug("==> traverseStartingOrganizationParticipant(" + startObjects
- + ")");
+ log.debug("==> traverseStartingOrganizationParticipant(" + startObjects //$NON-NLS-1$
+ + ")"); //$NON-NLS-1$
IModel model = null;
@@ -715,7 +715,7 @@ public class Step
*/
private void traverseApplicationContexts(List startObjects, List result)
{
- log.debug("==> traverseApplicationContexts(" + startObjects + ")");
+ log.debug("==> traverseApplicationContexts(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -740,8 +740,8 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("==> traverseActivitiesExecutingApplication(" + startObjects
- + ")");
+ log.debug("==> traverseActivitiesExecutingApplication(" + startObjects //$NON-NLS-1$
+ + ")"); //$NON-NLS-1$
}
IModel model = null;
@@ -754,7 +754,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("Type of root: " + application.getModel());
+ log.debug("Type of root: " + application.getModel()); //$NON-NLS-1$
}
model = (IModel) application.getModel();
@@ -794,7 +794,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("==> traverseActivitiesPerformedByRole(" + startObjects + ")");
+ log.debug("==> traverseActivitiesPerformedByRole(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
}
IModel model = null;
@@ -807,7 +807,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("Type of root: " + role.getModel());
+ log.debug("Type of root: " + role.getModel()); //$NON-NLS-1$
}
model = (IModel) role.getModel();
@@ -828,7 +828,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Performer of activity " + activity.getId() + ": "
+ log.debug("Performer of activity " + activity.getId() + ": " //$NON-NLS-1$ //$NON-NLS-2$
+ activity.getPerformer());
}
@@ -850,7 +850,7 @@ public class Step
*/
private void traverseProcessesStartedByRole(List startObjects, List result)
{
- log.debug("==> traverseProcessesStartedByRole(" + startObjects + ")");
+ log.debug("==> traverseProcessesStartedByRole(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
IModel model = null;
@@ -860,7 +860,7 @@ public class Step
if (model == null)
{
- log.debug("Type of root: " + role.getModel());
+ log.debug("Type of root: " + role.getModel()); //$NON-NLS-1$
model = (IModel) role.getModel();
}
@@ -888,7 +888,7 @@ public class Step
result.add(model.findParticipant(performer));
- log.debug("Trigger Type: " + performer);
+ log.debug("Trigger Type: " + performer); //$NON-NLS-1$
}
}
@@ -906,8 +906,8 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("==> traverseActivitiesPerformedByOrganisation(" + startObjects
- + ")");
+ log.debug("==> traverseActivitiesPerformedByOrganisation(" + startObjects //$NON-NLS-1$
+ + ")"); //$NON-NLS-1$
}
IModel model = null;
@@ -920,7 +920,7 @@ public class Step
{
if (log.isDebugEnabled())
{
- log.debug("Type of root: " + organization.getModel());
+ log.debug("Type of root: " + organization.getModel()); //$NON-NLS-1$
}
model = (IModel) organization.getModel();
@@ -941,7 +941,7 @@ public class Step
if (log.isDebugEnabled())
{
- log.debug("Performer of activity " + activity.getId() + ": "
+ log.debug("Performer of activity " + activity.getId() + ": " //$NON-NLS-1$ //$NON-NLS-2$
+ activity.getPerformer());
}
@@ -965,8 +965,8 @@ public class Step
private void traverseProcessesStartedByOrganization(List startObjects,
List result)
{
- log.debug("==> traverseProcessesStartedByOrganisation(" + startObjects
- + ")");
+ log.debug("==> traverseProcessesStartedByOrganisation(" + startObjects //$NON-NLS-1$
+ + ")"); //$NON-NLS-1$
IModel model = null;
@@ -976,7 +976,7 @@ public class Step
if (model == null)
{
- log.debug("Type of root: " + organization.getModel());
+ log.debug("Type of root: " + organization.getModel()); //$NON-NLS-1$
model = (IModel) organization.getModel();
}
@@ -1004,7 +1004,7 @@ public class Step
result.add(model.findParticipant(performer));
- log.debug("Trigger Type: " + performer);
+ log.debug("Trigger Type: " + performer); //$NON-NLS-1$
}
}
}
@@ -1018,7 +1018,7 @@ public class Step
*/
private void traversePreviousActivities(List startObjects, List result)
{
- log.debug("==> traversePreviousActivities(" + startObjects + ")");
+ log.debug("==> traversePreviousActivities(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -1042,7 +1042,7 @@ public class Step
*/
private void traverseNextActivities(List startObjects, List result)
{
- log.debug("==> traverseNextActivities(" + startObjects + ")");
+ log.debug("==> traverseNextActivities(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -1067,7 +1067,7 @@ public class Step
*/
private void traverseInData(List startObjects, List result)
{
- log.debug("==> traverseInData(" + startObjects + ")");
+ log.debug("==> traverseInData(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -1092,7 +1092,7 @@ public class Step
*/
private void traverseOutData(List startObjects, List result)
{
- log.debug("==> traverseInData(" + startObjects + ")");
+ log.debug("==> traverseInData(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -1117,7 +1117,7 @@ public class Step
*/
private void traverseData(List startObjects, List result)
{
- log.debug("==> traverseData(" + startObjects + ")");
+ log.debug("==> traverseData(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < startObjects.size(); i++)
{
@@ -1145,7 +1145,7 @@ public class Step
*/
private void traverseInputFor(List startObjects, List result)
{
- log.debug("==> traverseInData(" + startObjects + ")");
+ log.debug("==> traverseInData(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
IModel model = null;
@@ -1155,7 +1155,7 @@ public class Step
if (model == null)
{
- log.debug("Type of root: " + data.getModel());
+ log.debug("Type of root: " + data.getModel()); //$NON-NLS-1$
model = (IModel) data.getModel();
}
@@ -1197,7 +1197,7 @@ public class Step
*/
private void traverseOutputOf(List startObjects, List result)
{
- log.debug("==> traverseInData(" + startObjects + ")");
+ log.debug("==> traverseInData(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
IModel model = null;
@@ -1207,7 +1207,7 @@ public class Step
if (model == null)
{
- log.debug("Type of root: " + data.getModel());
+ log.debug("Type of root: " + data.getModel()); //$NON-NLS-1$
model = (IModel) data.getModel();
}
@@ -1249,7 +1249,7 @@ public class Step
*/
private void traverseDataFor(List startObjects, List result)
{
- log.debug("==> traverseInData(" + startObjects + ")");
+ log.debug("==> traverseInData(" + startObjects + ")"); //$NON-NLS-1$ //$NON-NLS-2$
IModel model = null;
@@ -1259,7 +1259,7 @@ public class Step
if (model == null)
{
- log.debug("Type of root: " + data.getModel());
+ log.debug("Type of root: " + data.getModel()); //$NON-NLS-1$
model = (IModel) data.getModel();
}
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/reportingcommon-messages.properties b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/reportingcommon-messages.properties
index 015e7d7..0db77dc 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/reportingcommon-messages.properties
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/reportingcommon-messages.properties
@@ -260,6 +260,9 @@ ParameterAtIndexIsOutOfBounds=Parameter at index {0} is out of bounds (0, {1})
WorkflowSessionExpired=Workflow session expired, please log in again
WorkflowUserView=Workflow User
QualityAssuranceView=Quality Assurance
+QualityAssuranceView_10=QualityAssuranceResult
+QualityAssuranceView_11=Exception during getting ActivityInstanceAttribute object
+QualityAssuranceView_9=QualityAssuranceState
QualityAssuranceCodeView=Quality Assurance Codes
ActivityInstanceOid=Activity Instance Oid
QualityAssuranceCodeKey=QA Code Key
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LargeStringResolver.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LargeStringResolver.java
index 80b5df2..4494df1 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LargeStringResolver.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LargeStringResolver.java
@@ -48,7 +48,7 @@ public class LargeStringResolver
List<List<Long>> oidBlocks = getOidBlocks();
- final String tableAlias = "sv";
+ final String tableAlias = "sv"; //$NON-NLS-1$
String selectFieldList = DbUtils.getColumnList(dbDescriptor, new IDbColumn[] {
new DbColumn(LargeStringHolder.FIELD__OBJECTID, tableAlias),
new DbColumn(LargeStringHolder.FIELD__DATA_TYPE, tableAlias),
@@ -64,16 +64,16 @@ public class LargeStringResolver
tableAlias)});
StringBuilder queryBuilder = new StringBuilder();
- queryBuilder.append("Select ");
+ queryBuilder.append("Select "); //$NON-NLS-1$
queryBuilder.append(selectFieldList);
- queryBuilder.append(" from ");
+ queryBuilder.append(" from "); //$NON-NLS-1$
if (StringUtils.isNotEmpty(schemaName))
{
queryBuilder.append(schemaName);
- queryBuilder.append(".");
+ queryBuilder.append("."); //$NON-NLS-1$
}
queryBuilder.append(LargeStringHolder.TABLE_NAME);
- queryBuilder.append(" ").append(tableAlias);
+ queryBuilder.append(" ").append(tableAlias); //$NON-NLS-1$
int count = 0;
for (List<Long> oidBlock : oidBlocks)
@@ -81,16 +81,16 @@ public class LargeStringResolver
count++;
if (count == 1)
{
- queryBuilder.append(" where ");
+ queryBuilder.append(" where "); //$NON-NLS-1$
appendInClause(whereFieldList, queryBuilder, oidBlock);
}
else
{
- queryBuilder.append(" or ");
+ queryBuilder.append(" or "); //$NON-NLS-1$
appendInClause(whereFieldList, queryBuilder, oidBlock);
}
}
- queryBuilder.append(" order by ");
+ queryBuilder.append(" order by "); //$NON-NLS-1$
queryBuilder.append(orderFieldList);
PreparedStatement ps = connection.prepareStatement(queryBuilder.toString());
@@ -125,14 +125,14 @@ public class LargeStringResolver
List<Long> oidBlock)
{
queryBuilder.append(whereFieldList);
- queryBuilder.append(" IN(");
+ queryBuilder.append(" IN("); //$NON-NLS-1$
for (Long oid : oidBlock)
{
queryBuilder.append(oid);
- queryBuilder.append(",");
+ queryBuilder.append(","); //$NON-NLS-1$
}
queryBuilder.deleteCharAt(queryBuilder.length() - 1);
- queryBuilder.append(")");
+ queryBuilder.append(")"); //$NON-NLS-1$
}
protected List<List<Long>> getOidBlocks()
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LocaleUtils.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LocaleUtils.java
index 892b1e3..ff39dcb 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LocaleUtils.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/LocaleUtils.java
@@ -184,10 +184,10 @@ public class LocaleUtils
public static String localizeQualityAssuranceCode(long modelOid, String codeKey, String defaultValue)
{
StringBuffer key = new StringBuffer();
- key.append("QualityAssuranceCode");
- key.append(".");
+ key.append("QualityAssuranceCode"); //$NON-NLS-1$
+ key.append("."); //$NON-NLS-1$
key.append(codeKey);
- key.append(".");
+ key.append("."); //$NON-NLS-1$
key.append(KeyType.DESCRIPTION);
return getMessage(modelOid, key.toString(), defaultValue);
}
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/CompareOperator.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/CompareOperator.java
index 6c30f48..b79818c 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/CompareOperator.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/CompareOperator.java
@@ -6,12 +6,12 @@ package org.eclipse.stardust.reporting.common.utils.sql;
public enum CompareOperator
{
- EQUALS("="),
- GREATER(">"),
- GREATER_OR_EQUALS(">="),
- SMALLER("<"),
- SMALLER_OR_EQUALS("<="),
- LIKE("LIKE");
+ EQUALS("="), //$NON-NLS-1$
+ GREATER(">"), //$NON-NLS-1$
+ GREATER_OR_EQUALS(">="), //$NON-NLS-1$
+ SMALLER("<"), //$NON-NLS-1$
+ SMALLER_OR_EQUALS("<="), //$NON-NLS-1$
+ LIKE("LIKE"); //$NON-NLS-1$
private final String representation;
CompareOperator(String representation)
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/DbUtils.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/DbUtils.java
index ea193b2..fe0ceb8 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/DbUtils.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/DbUtils.java
@@ -43,16 +43,16 @@ import org.eclipse.stardust.reporting.common.utils.ArrayIterator;
public class DbUtils
{
- public static final String AND_OPERATOR = " AND ";
+ public static final String AND_OPERATOR = " AND "; //$NON-NLS-1$
- public static final String OR_OPERATOR = " OR ";
+ public static final String OR_OPERATOR = " OR "; //$NON-NLS-1$
- public static final String WHERE_CLAUSE = " WHERE ";
+ public static final String WHERE_CLAUSE = " WHERE "; //$NON-NLS-1$
private static final Logger log = LogUtils.getLogger(DbUtils.class);
// TODO: Taken from DbDescriptor. Make it public in order that it can be reused.
- public static final String DBDESCRIPTOR_PREFIX = "ag.carnot.db.jdbc.dbdescriptor.";
+ public static final String DBDESCRIPTOR_PREFIX = "ag.carnot.db.jdbc.dbdescriptor."; //$NON-NLS-1$
public static final String DBDESCRIPTOR_PROP = DBDESCRIPTOR_PREFIX
+ SessionProperties.DS_NAME_AUDIT_TRAIL;
@@ -124,7 +124,7 @@ public class DbUtils
return DBMSKey.DERBY;
}
// TODO: DBMSKey.SYBASE.getId()?
- else if (databaseName.endsWith("ADAPTIVE SERVER ENTERPRISE"))
+ else if (databaseName.endsWith("ADAPTIVE SERVER ENTERPRISE")) //$NON-NLS-1$
{
return DBMSKey.SYBASE;
}
@@ -133,7 +133,7 @@ public class DbUtils
return DBMSKey.MYSQL;
}
- log.warn(MessageFormat.format("Unknown database: {0}. Falling back to {1}.",
+ log.warn(MessageFormat.format("Unknown database: {0}. Falling back to {1}.", //$NON-NLS-1$
new Object[] {databaseName, DBMSKey.ORACLE.getId().toUpperCase()}));
return DBMSKey.ORACLE;
}
@@ -146,13 +146,13 @@ public class DbUtils
public static String getColumnList(DBDescriptor dbDescriptor, IDbColumn columnName)
{
- return getColumnList(dbDescriptor, new IDbColumn[] {columnName}, ", ", null);
+ return getColumnList(dbDescriptor, new IDbColumn[] {columnName}, ", ", null); //$NON-NLS-1$
}
public static String getColumnList(final DBDescriptor dbDescriptor,
IDbColumn[] columnNames)
{
- return getColumnList(dbDescriptor, columnNames, ", ", null);
+ return getColumnList(dbDescriptor, columnNames, ", ", null); //$NON-NLS-1$
}
public static String getColumnList(final DBDescriptor dbDescriptor,
@@ -166,7 +166,7 @@ public class DbUtils
StringBuffer buffer = new StringBuffer();
if(columns.isEmpty() || columns == null)
{
- buffer.append("*");
+ buffer.append("*"); //$NON-NLS-1$
}
else
{
@@ -177,7 +177,7 @@ public class DbUtils
buffer.append(cn);
if(i.hasNext())
{
- buffer.append(", ");
+ buffer.append(", "); //$NON-NLS-1$
}
}
}
@@ -304,8 +304,8 @@ public class DbUtils
public static String getOnFragment(String predicate)
{
- StringBuffer buffer = new StringBuffer(" on(");
- buffer.append(predicate).append(")");
+ StringBuffer buffer = new StringBuffer(" on("); //$NON-NLS-1$
+ buffer.append(predicate).append(")"); //$NON-NLS-1$
return buffer.toString();
}
@@ -350,7 +350,7 @@ public class DbUtils
public static String getPartitionSqlFragment(PartitionInfo partitionInfo, String schemaName, String tableName, String tableAlias)
{
//the model column is generic for many tables, it is used lowercase.
- return getPartitionSqlFragment(partitionInfo, schemaName, tableName, tableAlias, "model");
+ return getPartitionSqlFragment(partitionInfo, schemaName, tableName, tableAlias, "model"); //$NON-NLS-1$
}
public static String getPartitionSqlFragment(String schema, PartitionInfo partitionInfo,
@@ -358,7 +358,7 @@ public class DbUtils
{
StringBuffer buffer = new StringBuffer();
//the most tables have a generic model column which can be used
- DbColumn tableToSelectModelColumn = tableToSelect.getColumn("model");
+ DbColumn tableToSelectModelColumn = tableToSelect.getColumn("model"); //$NON-NLS-1$
DbTable modelTable = new DbTable(schema, ModelPersistorBean.TABLE_NAME, View.MODEL_VARIABLE_NAME);
DbColumn modelTableOidColumn = modelTable.getColumn(ModelPersistorBean.FIELD__OID);
@@ -367,23 +367,23 @@ public class DbUtils
if(tableToSelect.equals(modelTable))
{
buffer.append(modelTable);
- buffer.append(" where ").append(modelTablePartitionColumn).append(" = ")
+ buffer.append(" where ").append(modelTablePartitionColumn).append(" = ") //$NON-NLS-1$ //$NON-NLS-2$
.append(partitionInfo.getPartitionOid());
}
else
{
buffer.append(modelTable);
- buffer.append(" inner join ");
+ buffer.append(" inner join "); //$NON-NLS-1$
buffer.append(tableToSelect);
- buffer.append(" on(");
+ buffer.append(" on("); //$NON-NLS-1$
buffer.append(tableToSelectModelColumn);
- buffer.append(" = ");
+ buffer.append(" = "); //$NON-NLS-1$
buffer.append(modelTableOidColumn);
- buffer.append(" AND ");
+ buffer.append(" AND "); //$NON-NLS-1$
buffer.append(modelTablePartitionColumn);
- buffer.append(" = ");
+ buffer.append(" = "); //$NON-NLS-1$
buffer.append(partitionInfo.getPartitionOid());
- buffer.append(")");
+ buffer.append(")"); //$NON-NLS-1$
}
@@ -401,9 +401,9 @@ public class DbUtils
StringBuffer buffer = new StringBuffer();
String predicateList = DbUtils.getColumnList(dbDescriptor, new IDbColumn[] {
new DbColumn(modelColumnName, tableAlias),
- new DbColumn(ModelPersistorBean.FIELD__OID, "m")}, " = ");
+ new DbColumn(ModelPersistorBean.FIELD__OID, "m")}, " = "); //$NON-NLS-1$ //$NON-NLS-2$
IDbColumn partitionCol = new DbColumn(
- dbDescriptor.quoteIdentifier(ModelPersistorBean.FIELD__PARTITION), "m");
+ dbDescriptor.quoteIdentifier(ModelPersistorBean.FIELD__PARTITION), "m"); //$NON-NLS-1$
// if the model table is specified - dont join it
if (joinTableName.equals(modelTableName))
@@ -412,17 +412,17 @@ public class DbUtils
partitionCol = new DbColumn(
dbDescriptor.quoteIdentifier(ModelPersistorBean.FIELD__PARTITION),
tableAlias);
- buffer.append(modelTableName).append(" ").append(tableAlias);
- buffer.append(" where ").append(partitionCol).append(" = ")
+ buffer.append(modelTableName).append(" ").append(tableAlias); //$NON-NLS-1$
+ buffer.append(" where ").append(partitionCol).append(" = ") //$NON-NLS-1$ //$NON-NLS-2$
.append(partitionInfo.getPartitionOid());
}
else
{
- buffer.append(modelTableName).append(" m");
- buffer.append(" inner join ").append(joinTableName).append(' ').append(tableAlias)
- .append(" on (").append(partitionCol).append(" = ")
- .append(partitionInfo.getPartitionOid()).append(" AND ")
- .append(predicateList).append(")");
+ buffer.append(modelTableName).append(" m"); //$NON-NLS-1$
+ buffer.append(" inner join ").append(joinTableName).append(' ').append(tableAlias) //$NON-NLS-1$
+ .append(" on (").append(partitionCol).append(" = ") //$NON-NLS-1$ //$NON-NLS-2$
+ .append(partitionInfo.getPartitionOid()).append(" AND ") //$NON-NLS-1$
+ .append(predicateList).append(")"); //$NON-NLS-1$
}
return buffer.toString();
@@ -455,9 +455,9 @@ public class DbUtils
StringBuffer condition = new StringBuffer();
condition.append(value1);
- condition.append(" ");
+ condition.append(" "); //$NON-NLS-1$
condition.append(operator);
- condition.append(" ");
+ condition.append(" "); //$NON-NLS-1$
condition.append(value2);
return condition.toString();
}
@@ -471,9 +471,9 @@ public class DbUtils
public static String quoteValue(Object o)
{
StringBuffer buffer = new StringBuffer();
- buffer.append("'");
+ buffer.append("'"); //$NON-NLS-1$
buffer.append(o);
- buffer.append("'");
+ buffer.append("'"); //$NON-NLS-1$
return buffer.toString();
}
}
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/JoinExpression.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/JoinExpression.java
index 4fd2bbc..5430f7e 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/JoinExpression.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/JoinExpression.java
@@ -21,20 +21,20 @@ public class JoinExpression extends SqlExpression
public String toString()
{
StringBuffer buffer = new StringBuffer();
- buffer.append(" ");
+ buffer.append(" "); //$NON-NLS-1$
if(innerJoin)
{
- buffer.append("inner join ");
+ buffer.append("inner join "); //$NON-NLS-1$
}
else
{
- buffer.append("left outer join ");
+ buffer.append("left outer join "); //$NON-NLS-1$
}
buffer.append(tableToJoin);
- buffer.append(" on(");
+ buffer.append(" on("); //$NON-NLS-1$
buffer.append(getConditionString());
- buffer.append(")");
- buffer.append(" ");
+ buffer.append(")"); //$NON-NLS-1$
+ buffer.append(" "); //$NON-NLS-1$
return buffer.toString();
}
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/LogicalOperator.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/LogicalOperator.java
index 3ee9cdc..418ae7d 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/LogicalOperator.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/LogicalOperator.java
@@ -6,8 +6,8 @@ package org.eclipse.stardust.reporting.common.utils.sql;
public enum LogicalOperator
{
- AND("AND"),
- OR("OR");
+ AND("AND"), //$NON-NLS-1$
+ OR("OR"); //$NON-NLS-1$
private final String representation;
LogicalOperator(String representation)
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/SqlExpression.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/SqlExpression.java
index b776b10..e7fa26a 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/SqlExpression.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/SqlExpression.java
@@ -43,9 +43,9 @@ public abstract class SqlExpression implements Comparable<SqlExpression>
Condition condition = conditions.get(i);
if(i > 0)
{
- buffer.append(" ");
+ buffer.append(" "); //$NON-NLS-1$
buffer.append(condition.getOperator());
- buffer.append(" ");
+ buffer.append(" "); //$NON-NLS-1$
}
buffer.append(condition.getPredicate());
}
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/WhereExpression.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/WhereExpression.java
index b9135d6..2c381c7 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/WhereExpression.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/utils/sql/WhereExpression.java
@@ -10,11 +10,11 @@ public class WhereExpression extends SqlExpression
public String toString()
{
StringBuffer buffer = new StringBuffer();
- buffer.append(" ");
- buffer.append("WHERE(");
+ buffer.append(" "); //$NON-NLS-1$
+ buffer.append("WHERE("); //$NON-NLS-1$
buffer.append(getConditionString());
- buffer.append(")");
- buffer.append(" ");
+ buffer.append(")"); //$NON-NLS-1$
+ buffer.append(" "); //$NON-NLS-1$
return buffer.toString();
}