summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwilk2011-06-21 15:43:03 (EDT)
committerRyan D. Brooks2011-06-21 15:43:03 (EDT)
commit507b5e53015c90e7ba34d223ced516bb010aca6e (patch)
tree9b6ec2945bd72b95f1d575cc68be08967bf1fb90
parent490e9859ff48564f896bf7e70b4cd2e3a7cb6254 (diff)
downloadorg.eclipse.osee-507b5e53015c90e7ba34d223ced516bb010aca6e.zip
org.eclipse.osee-507b5e53015c90e7ba34d223ced516bb010aca6e.tar.gz
org.eclipse.osee-507b5e53015c90e7ba34d223ced516bb010aca6e.tar.bz2
refactor: Minor quality changes
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java4
-rw-r--r--plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java1
-rw-r--r--plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java1
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java5
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java3
-rw-r--r--plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/ExtensionDefinedObjects.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java19
-rw-r--r--plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactDragAndDrop.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java7
13 files changed, 8 insertions, 55 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index d3f6324..a3aca94 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -115,10 +115,6 @@ public final class AtsNavigateViewItems implements XNavigateViewItems, IXNavigat
private final static AtsNavigateViewItems instance = new AtsNavigateViewItems();
- public AtsNavigateViewItems() {
- super();
- }
-
public static AtsNavigateViewItems getInstance() {
return instance;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java
index c9328f6..42f48e3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/review/ReviewNavigateViewItems.java
@@ -33,10 +33,6 @@ public class ReviewNavigateViewItems implements XNavigateViewItems, IXNavigateCo
private final List<XNavigateItem> items = new CopyOnWriteArrayList<XNavigateItem>();
private boolean ensurePopulatedRanOnce = false;
- public ReviewNavigateViewItems() {
- super();
- }
-
public static ReviewNavigateViewItems getInstance() {
return instance;
}
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
index b15811c..2881b14 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
@@ -39,10 +39,6 @@ import org.osgi.framework.Bundle;
public class DefineNavigateViewItems implements XNavigateViewItems, IXNavigateCommonItem {
private final List<XNavigateItem> items = new CopyOnWriteArrayList<XNavigateItem>();
- public DefineNavigateViewItems() {
- super();
- }
-
@Override
public List<XNavigateItem> getSearchNavigateItems() {
addDefineSectionChildren(null);
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java
index b86e523..8381557 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java
@@ -27,7 +27,6 @@ public class SearchOptions {
private boolean isFindAllLocationsEnabled;
public SearchOptions() {
- super();
deletionFlag = DeletionFlag.EXCLUDE_DELETED;
}
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java
index 0361608..ddc56ff 100644
--- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java
+++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java
@@ -27,7 +27,6 @@ public class SearchRequest implements HasBranch {
}
public SearchRequest(IOseeBranch branch, String rawSearch, SearchOptions options) {
- super();
this.branch = branch;
this.rawSearch = rawSearch;
this.options = options != null ? options : new SearchOptions();
diff --git a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java
index dfeebab..51e6709 100644
--- a/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.core.model/src/org/eclipse/osee/framework/core/model/event/DefaultBasicGuidArtifact.java
@@ -53,10 +53,7 @@ public class DefaultBasicGuidArtifact implements IBasicGuidArtifact {
@Override
public boolean equals(Object obj) {
- boolean equals = false;
- if (this == obj) {
- equals = true;
- }
+ boolean equals = super.equals(obj);
if (!equals && obj instanceof IBasicGuidArtifact) {
IBasicGuidArtifact other = (IBasicGuidArtifact) obj;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java
index 8ff7e30..1a826b4 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/Strings.java
@@ -101,9 +101,6 @@ public class Strings {
* <p>
* Remove all <code>\n</code> and <code>\t</code>.
* </p>
- *
- * @param value
- * @return
*/
public static String minimize(String value) {
return isValid(value) ? value.replaceAll("\n|\t", "") : value;
diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/ExtensionDefinedObjects.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/ExtensionDefinedObjects.java
index 910f558..4448fb6 100644
--- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/ExtensionDefinedObjects.java
+++ b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/ExtensionDefinedObjects.java
@@ -96,7 +96,7 @@ public class ExtensionDefinedObjects<T> {
String className = element.getAttribute(classNameAttribute);
String bundleName = element.getContributor().getName();
- if (Strings.isValid(bundleName) && Strings.isValid(className)) {
+ if (Strings.isValid(bundleName, className)) {
try {
Bundle bundle = Platform.getBundle(bundleName);
Class<?> taskClass = bundle.loadClass(className);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
index 8b76cb5..3378eb6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/model/EventBasicGuidArtifact.java
@@ -28,13 +28,7 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
private final EventModType eventModType;
public EventBasicGuidArtifact(EventModType eventModType, DefaultBasicGuidArtifact guidArt) {
- super(guidArt.getBranchGuid(), guidArt.getArtTypeGuid(), guidArt.getGuid());
- this.eventModType = eventModType;
- }
-
- public EventBasicGuidArtifact(EventModType eventModType, String branchGuid, String artTypeGuid, String guid) {
- super(branchGuid, artTypeGuid, guid);
- this.eventModType = eventModType;
+ this(eventModType, guidArt.getBranchGuid(), guidArt.getArtTypeGuid(), guidArt.getGuid());
}
public EventBasicGuidArtifact(EventModType eventModType, Artifact artifact) {
@@ -46,6 +40,11 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
basicGuidArtifact.getGuid());
}
+ public EventBasicGuidArtifact(EventModType eventModType, String branchGuid, String artTypeGuid, String guid) {
+ super(branchGuid, artTypeGuid, guid);
+ this.eventModType = eventModType;
+ }
+
public EventModType getModType() {
return eventModType;
}
@@ -78,12 +77,6 @@ public class EventBasicGuidArtifact extends DefaultBasicGuidArtifact {
}
@Override
- public int hashCode() {
- int result = super.hashCode();
- return result;
- }
-
- @Override
public boolean equals(Object obj) {
boolean equals = false;
if (this == obj) {
diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java
index ed84f75..cec01a4 100644
--- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java
+++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/xnavigate/XNavigateContentProvider.java
@@ -24,10 +24,6 @@ import org.eclipse.osee.framework.ui.plugin.internal.OseePluginUiActivator;
*/
public class XNavigateContentProvider implements ITreeContentProvider {
- public XNavigateContentProvider() {
- super();
- }
-
@Override
public Object[] getChildren(Object parentElement) {
if (parentElement instanceof Object[]) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java
index 5e8811a..7177466 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java
@@ -34,8 +34,6 @@ public class UIOutlineResolutionHandler implements IStatusHandler {
public Object handleStatus(IStatus status, Object source) throws CoreException {
if (source instanceof ArrayList<?>) {
final List<String> list = (ArrayList<String>) source;
- // Preferences get the last should ask?
- // Use the last preference ?
final MutableBoolean mutableBoolean = new MutableBoolean(false);
Runnable runnable = new Runnable() {
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactDragAndDrop.java
index 38524ee..32a4305 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactDragAndDrop.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactDragAndDrop.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.ui.skynet.util;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.widgets.Control;
/**
@@ -30,10 +29,4 @@ public class ArtifactDragAndDrop extends SkynetDragAndDrop {
public Artifact[] getArtifacts() {
return new Artifact[] {artifact};
}
-
- @Override
- public void artifactTransferDragSetData(DragSourceEvent event) {
- super.artifactTransferDragSetData(event);
- }
-
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java
index ec979a9..d8342bb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactNameSorter.java
@@ -19,13 +19,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
*/
public class ArtifactNameSorter extends ViewerSorter {
- /**
- * Default sorter for artifacts. Sorts on descriptive name
- */
- public ArtifactNameSorter() {
- super();
- }
-
@Override
@SuppressWarnings("unchecked")
public int compare(Viewer viewer, Object o1, Object o2) {