Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2008-11-22 02:15:35 +0000
committerddunne2008-11-22 02:15:35 +0000
commitc966a4e00a06f539925ff0fb7d459658834e9abe (patch)
tree3a68f12b543229abc3f18fddbba90b579463ca02
parentb25476d28990d48d9e2d932fdb376ce3df086135 (diff)
downloadorg.eclipse.osee-c966a4e00a06f539925ff0fb7d459658834e9abe.tar.gz
org.eclipse.osee-c966a4e00a06f539925ff0fb7d459658834e9abe.tar.xz
org.eclipse.osee-c966a4e00a06f539925ff0fb7d459658834e9abe.zip
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java4
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java9
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java4
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java38
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java5
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java3
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java12
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java10
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java9
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSearchItemProvider.java13
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSimpleProvider.java9
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java8
12 files changed, 79 insertions, 45 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index 8f7de9be50e..c44db8d573e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -762,7 +762,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito
* @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getMetricsArtifacts()
*/
@Override
- public Collection<? extends Artifact> getMetricsArtifacts() {
+ public Collection<? extends Artifact> getMetricsArtifacts() throws OseeCoreException {
return Arrays.asList(smaMgr.getSma());
}
@@ -770,7 +770,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito
* @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getMetricsVersionArtifact()
*/
@Override
- public VersionArtifact getMetricsVersionArtifact() {
+ public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException {
return null;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
index cbaf19fb266..65726be7584 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java
@@ -262,4 +262,13 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe
return null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.osee.ats.world.IWorldEditorProvider#getTargetedVersionArtifact()
+ */
+ @Override
+ public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException {
+ if (versionCombo == null) return null;
+ return getSelectedVersionArtifact();
+ }
+
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java
index 2e91ca874fd..e25f1e548bb 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java
@@ -283,7 +283,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit
* @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getMetricsArtifacts()
*/
@Override
- public Collection<? extends Artifact> getMetricsArtifacts() {
+ public Collection<? extends Artifact> getMetricsArtifacts() throws OseeCoreException {
return tasks;
}
@@ -291,7 +291,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit
* @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getMetricsVersionArtifact()
*/
@Override
- public VersionArtifact getMetricsVersionArtifact() {
+ public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException {
return null;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java
index 870f3b34295..9a82686ad8a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsMetricsComposite.java
@@ -187,23 +187,27 @@ public class AtsMetricsComposite extends ScrolledComposite {
lines.add(XBarGraphLine.getTextLine("Hours Spent: ", String.format("%5.2f", sMet.getHrsSpent())));
lines.add(XBarGraphLine.getTextLine("Man Days Needed: ", String.format("%5.2f", sMet.getManDaysNeeded())));
- if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) {
- double hoursTillRelease = sMet.getHoursTillRel();
- double hoursRemaining = sMet.getHrsRemain();
- int percent = 0;
- if (hoursTillRelease != 0) {
- percent = (int) (hoursRemaining / hoursTillRelease);
- }
- if (percent == 0 || hoursRemaining > hoursTillRelease) {
- lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_RED_FOREGROUND,
- XBarGraphLine.DEFAULT_RED_BACKGROUND, 100, String.format(
- "%5.2f hours exceeds remaining release hours %5.2f", hoursRemaining, hoursTillRelease)));
- } else {
- lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
- XBarGraphLine.DEFAULT_GREEN_BACKGROUND, SWT.COLOR_WHITE, SWT.COLOR_WHITE, percent, String.format(
- "%5.2f remaining work hours", hoursRemaining), String.format("%5.2f release remaining hours",
- hoursRemaining)));
+ try {
+ if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) {
+ double hoursTillRelease = sMet.getHoursTillRel();
+ double hoursRemaining = sMet.getHrsRemain();
+ int percent = 0;
+ if (hoursTillRelease != 0) {
+ percent = (int) (hoursRemaining / hoursTillRelease);
+ }
+ if (percent == 0 || hoursRemaining > hoursTillRelease) {
+ lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_RED_FOREGROUND,
+ XBarGraphLine.DEFAULT_RED_BACKGROUND, 100, String.format(
+ "%5.2f hours exceeds remaining release hours %5.2f", hoursRemaining, hoursTillRelease)));
+ } else {
+ lines.add(new XBarGraphLine("Release Effort Remaining", XBarGraphLine.DEFAULT_GREEN_FOREGROUND,
+ XBarGraphLine.DEFAULT_GREEN_BACKGROUND, SWT.COLOR_WHITE, SWT.COLOR_WHITE, percent, String.format(
+ "%5.2f remaining work hours", hoursRemaining), String.format(
+ "%5.2f release remaining hours", hoursRemaining)));
+ }
}
+ } catch (OseeCoreException ex) {
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
}
XBarGraphTable table = new XBarGraphTable("Overview", "", "", lines);
@@ -236,7 +240,7 @@ public class AtsMetricsComposite extends ScrolledComposite {
adapt(table);
}
- public void createHoursRemainingByAssigneesChart(SMAMetrics sMet, Composite parent) {
+ public void createHoursRemainingByAssigneesChart(SMAMetrics sMet, Composite parent) throws OseeCoreException {
List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>();
Double versionHoursRemain = null;
if (iAtsMetricsProvider.getMetricsVersionArtifact() != null) {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java
index fbf11bba994..e7ea533f4a6 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IAtsMetricsProvider.java
@@ -7,6 +7,7 @@ package org.eclipse.osee.ats.world;
import java.util.Collection;
import org.eclipse.osee.ats.artifact.VersionArtifact;
+import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
/**
@@ -14,7 +15,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
*/
public interface IAtsMetricsProvider {
- public Collection<? extends Artifact> getMetricsArtifacts();
+ public Collection<? extends Artifact> getMetricsArtifacts() throws OseeCoreException;
- public VersionArtifact getMetricsVersionArtifact();
+ public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java
index 6fd80ed5c63..e65ca383461 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldEditorProvider.java
@@ -5,6 +5,7 @@
*/
package org.eclipse.osee.ats.world;
+import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
@@ -18,4 +19,6 @@ public interface IWorldEditorProvider {
public String getSelectedName(SearchType searchType) throws OseeCoreException;
public String getName() throws OseeCoreException;
+
+ public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
index 25f2d85c298..87b8387bccd 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java
@@ -76,7 +76,6 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans
private Action filterCompletedAction, releaseMetricsAction, selectionMetricsAction, toAction, toWorkFlow, toTask;
private Label extraInfoLabel;
- private WorldSearchItem lastSearchItem;
private final WorldXViewer worldXViewer;
private final WorldCompletedFilter worldCompletedFilter = new WorldCompletedFilter();
private final Set<Artifact> worldArts = new HashSet<Artifact>(200);
@@ -383,9 +382,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans
@Override
public void run() {
try {
- if (lastSearchItem != null) {
- worldEditor.reSearch();
- }
+ worldEditor.reSearch();
} catch (Exception ex) {
OSEELog.logException(AtsPlugin.class, ex, true);
}
@@ -634,11 +631,4 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans
}
}
- /**
- * @return the lastSearchItem
- */
- public WorldSearchItem getLastSearchItem() {
- return lastSearchItem;
- }
-
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
index 0bae1f35ed3..66307a80b36 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.util.AtsLib;
-import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -169,7 +168,7 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi
* @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getArtifacts()
*/
@Override
- public Collection<? extends Artifact> getMetricsArtifacts() {
+ public Collection<? extends Artifact> getMetricsArtifacts() throws OseeCoreException {
return getLoadedArtifacts();
}
@@ -177,11 +176,8 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi
* @see org.eclipse.osee.ats.world.IAtsMetricsProvider#getMetricsVersionArtifact()
*/
@Override
- public VersionArtifact getMetricsVersionArtifact() {
- if (actionPage.getWorldComposite().getLastSearchItem() instanceof VersionTargetedForTeamSearchItem) {
- return ((VersionTargetedForTeamSearchItem) actionPage.getWorldComposite().getLastSearchItem()).getSearchVersionArtifact();
- }
- return null;
+ public VersionArtifact getMetricsVersionArtifact() throws OseeCoreException {
+ return getWorldEditorProvider().getTargetedVersionArtifact();
}
public WorldComposite getWorldComposite() {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java
index 581c08ffd09..2828a007c88 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java
@@ -12,6 +12,7 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
@@ -192,4 +193,12 @@ public class WorldEditorParameterSearchItemProvider implements IWorldEditorParam
return null;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.osee.ats.world.IWorldEditorProvider#getTargetedVersionArtifact()
+ */
+ @Override
+ public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException {
+ return null;
+ }
+
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSearchItemProvider.java
index f54e531c964..00f246366f7 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSearchItemProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSearchItemProvider.java
@@ -12,6 +12,8 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osee.ats.AtsPlugin;
+import org.eclipse.osee.ats.artifact.VersionArtifact;
+import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem;
import org.eclipse.osee.ats.world.search.WorldUISearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
@@ -141,4 +143,15 @@ public class WorldEditorSearchItemProvider implements IWorldEditorProvider {
return Status.OK_STATUS;
}
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.osee.ats.world.IWorldEditorProvider#getTargetedVersionArtifact()
+ */
+ @Override
+ public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException {
+ if (worldUISearchItem instanceof VersionTargetedForTeamSearchItem) {
+ return ((VersionTargetedForTeamSearchItem) worldUISearchItem).getSearchVersionArtifact();
+ }
+ return null;
+ }
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSimpleProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSimpleProvider.java
index 59540955465..f1e17f3093f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSimpleProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorSimpleProvider.java
@@ -6,6 +6,7 @@
package org.eclipse.osee.ats.world;
import java.util.Collection;
+import org.eclipse.osee.ats.artifact.VersionArtifact;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -59,4 +60,12 @@ public class WorldEditorSimpleProvider implements IWorldEditorProvider {
public String getName() throws OseeCoreException {
return name;
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.osee.ats.world.IWorldEditorProvider#getTargetedVersionArtifact()
+ */
+ @Override
+ public VersionArtifact getTargetedVersionArtifact() throws OseeCoreException {
+ return null;
+ }
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java
index fafd7249f44..ee03608811a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/GroupWorldSearchItem.java
@@ -46,15 +46,15 @@ public class GroupWorldSearchItem extends WorldUISearchItem {
public String getGroupSearchName() {
if (group != null)
return group.getDescriptiveName();
- else {
- if (selectedGroup != null) return selectedGroup.getDescriptiveName();
- }
+ else if (selectedGroup != null)
+ return selectedGroup.getDescriptiveName();
+ else if (groupName != null) return groupName;
return "";
}
@Override
public String getSelectedName(SearchType searchType) throws OseeCoreException {
- return String.format("%s - %s", super.getSelectedName(searchType), getGroupSearchName());
+ return String.format("Group Search - %s", getGroupSearchName());
}
public void getProduct() throws OseeCoreException {

Back to the top