Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2018-08-25 17:23:02 -0400
committerRyan D. Brooks2018-08-31 15:58:59 -0400
commit942c4b57713db19c23c9c94b2dfcbf1c0bb9c8cd (patch)
treec1f874cfe06f48a3b649ed6a0fc69b8619772f98
parent376c4c70416a4f671d9e3d56c8f48199acecefe9 (diff)
downloadorg.eclipse.osee-942c4b57713db19c23c9c94b2dfcbf1c0bb9c8cd.tar.gz
org.eclipse.osee-942c4b57713db19c23c9c94b2dfcbf1c0bb9c8cd.tar.xz
org.eclipse.osee-942c4b57713db19c23c9c94b2dfcbf1c0bb9c8cd.zip
refactor: Remove unnecessary class OrcsObjectImpl
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectImpl.java42
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java15
2 files changed, 12 insertions, 45 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectImpl.java
deleted file mode 100644
index e49635365a7..00000000000
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsObjectImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.internal.loader.data;
-
-import org.eclipse.osee.framework.core.data.HasId;
-import org.eclipse.osee.framework.core.data.RelationalConstants;
-
-/**
- * @author Roberto E. Escobar
- */
-public abstract class OrcsObjectImpl<T extends Number> implements HasId<T> {
-
- private T id = null;
-
- @SuppressWarnings("unchecked")
- protected OrcsObjectImpl() {
- super();
- setLocalId((T) RelationalConstants.DEFAULT_ITEM_ID);
- }
-
- @Override
- public T getLocalId() {
- return id;
- }
-
- public void setLocalId(T id) {
- this.id = id;
- }
-
- @Override
- public String toString() {
- return "OrcsObject [id=" + id + "]";
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java
index f2f0fe84245..34dec5cfa63 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/data/OrcsVersionedObjectImpl.java
@@ -21,8 +21,8 @@ import org.eclipse.osee.orcs.core.ds.VersionData;
/**
* @author Roberto E. Escobar
*/
-public abstract class OrcsVersionedObjectImpl extends OrcsObjectImpl<Integer> implements OrcsData {
-
+public abstract class OrcsVersionedObjectImpl implements OrcsData {
+ private Integer localId = Id.SENTINEL.intValue();
private long typeUuid = RelationalConstants.DEFAULT_TYPE_UUID;
private long baseTypeUuid = RelationalConstants.DEFAULT_TYPE_UUID;
@@ -179,4 +179,13 @@ public abstract class OrcsVersionedObjectImpl extends OrcsObjectImpl<Integer> im
return "OrcsVersionedObject [" + super.toString() + ", typeUuid=" + typeUuid + ", baseTypeUuid=" + baseTypeUuid + ", modType=" + currentModType + ", previousModType=" + previousModType + ", baseModType=" + baseModType + ", version=" + version + "]";
}
-}
+ @Override
+ public Integer getLocalId() {
+ return localId;
+ }
+
+ @Override
+ public void setLocalId(Integer localId) {
+ this.localId = localId;
+ }
+} \ No newline at end of file

Back to the top