| author | kwilk | 2012-05-07 18:10:40 (EDT) |
|---|---|---|
| committer | Roberto E. Escobar | 2012-05-07 18:10:40 (EDT) |
| commit | eb2bf6e7b4162a17d79b760cdd9230612ec56cdc (patch) (side-by-side diff) | |
| tree | d50ee06a93518ff64f3babc088037d0d188f5717 | |
| parent | 0fd724d62684411122aa4e85601b9d614af7b4fc (diff) | |
| download | org.eclipse.osee-eb2bf6e7b4162a17d79b760cdd9230612ec56cdc.zip org.eclipse.osee-eb2bf6e7b4162a17d79b760cdd9230612ec56cdc.tar.gz org.eclipse.osee-eb2bf6e7b4162a17d79b760cdd9230612ec56cdc.tar.bz2 | |
feature: More storage changes
17 files changed, 200 insertions, 65 deletions
diff --git a/plugins/org.eclipse.osee.ats/plugin.xml b/plugins/org.eclipse.osee.ats/plugin.xml index 6377015..648735d 100644 --- a/plugins/org.eclipse.osee.ats/plugin.xml +++ b/plugins/org.eclipse.osee.ats/plugin.xml @@ -405,6 +405,14 @@ name="CopyAtsConfigurationBlam" point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation + className="org.eclipse.osee.ats.config.TaskConfiguration"> + </Operation> + </extension> + <extension + id="TaskConfiguration" + name="TaskConfiguration" + point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> + <Operation className="org.eclipse.osee.ats.config.copy.CopyAtsConfigurationBlam"> </Operation> </extension> diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/TaskConfiguration.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/TaskConfiguration.java new file mode 100644 index 0000000..00723ff --- a/dev/null +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/TaskConfiguration.java @@ -0,0 +1,127 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.ats.config; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.osee.ats.core.client.config.IAtsProgram; +import org.eclipse.osee.ats.core.client.config.TeamDefinitionArtifact; +import org.eclipse.osee.ats.core.client.version.VersionArtifact; +import org.eclipse.osee.ats.util.widgets.XTeamDefinitionCombo; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; +import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; +import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; +import org.eclipse.osee.framework.ui.skynet.widgets.XListDropViewer; +import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; +import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; +import org.eclipse.osee.framework.ui.skynet.widgets.util.DynamicXWidgetLayout; +import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.ui.forms.widgets.FormToolkit; + +public class TaskConfiguration extends AbstractBlam { + private static final String PROGRAM = "Program"; + private static final String VERSION_ARTIFACTS = "Version Artifacts"; + + private XListDropViewer versionsWidget; + private XTeamDefinitionCombo xTeamDefinitionCombo; + + private IAtsProgram program; + private VersionArtifact version; + + public TaskConfiguration() { + super(null, + "Creates new TaskCreation artifact on selected Version artifacts, associates via Parent-Child relationship.", + BlamUiSource.FILE); + } + + @Override + public void runOperation(VariableMap map, IProgressMonitor monitor) throws Exception { + if (monitor == null) { + monitor = new NullProgressMonitor(); + } + + String workStatement = String.format("Created \"Task Creation\" artifact on Version Artifact:[%s]", version); + monitor.beginTask(workStatement, 2); + Artifact artifact = + ArtifactTypeManager.addArtifact(CoreArtifactTypes.TaskCreation, version.getBranch(), "Task Creation"); + monitor.worked(1); + version.addChild(artifact); + monitor.worked(1); + version.persist(String.format("[%s] added Task configuration to [%s]", getClass().getSimpleName(), version)); + monitor.done(); + } + + @Override + public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) { + if (xWidget instanceof XComboViewer && PROGRAM.equals(xWidget.getLabel())) { + XComboViewer viewer = (XComboViewer) xWidget; + viewer.addSelectionChangedListener(new ProgramSelectionListener()); + } else if (xWidget instanceof XListDropViewer && VERSION_ARTIFACTS.equals(xWidget.getLabel())) { + versionsWidget = (XListDropViewer) xWidget; + versionsWidget.addSelectionChangedListener(new VersionSelectionListener()); + } + } + + @Override + public Collection<String> getCategories() { + return Arrays.asList("Define"); + } + + private class VersionSelectionListener implements ISelectionChangedListener { + @Override + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event.getSelectionProvider().getSelection(); + + Iterator<?> iter = selection.iterator(); + if (iter.hasNext()) { + version = (VersionArtifact) iter.next(); + } + } + }; + + private class ProgramSelectionListener implements ISelectionChangedListener { + @Override + public void selectionChanged(SelectionChangedEvent event) { + IStructuredSelection selection = (IStructuredSelection) event.getSelectionProvider().getSelection(); + + Iterator<?> iter = selection.iterator(); + if (iter.hasNext()) { + program = (IAtsProgram) iter.next(); + try { + TeamDefinitionArtifact teamDefinitionArtifact = program.getTeamDefHoldingVersions(); + final Collection<VersionArtifact> versionArtifacts = new ArrayList<VersionArtifact>(); + if (teamDefinitionArtifact != null) { + versionArtifacts.addAll(teamDefinitionArtifact.getVersionsArtifacts()); + } + Displays.ensureInDisplayThread(new Runnable() { + @Override + public void run() { + versionsWidget.setInput(versionArtifacts); + } + }); + } catch (OseeCoreException ex) { + System.out.println("Error while processing. Exception:" + ex); + } + } + } + }; +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java index 5ec4467..3a11545 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/copy/CopyAtsConfigurationBlam.java @@ -85,7 +85,7 @@ public class CopyAtsConfigurationBlam extends AbstractBlam { new CopyAtsValidation(data, resultData).validate(); if (resultData.isErrors() || !data.isPersistChanges()) { resultData.log("Validation Complete"); - XResultDataUI.report(resultData,getName()); + XResultDataUI.report(resultData, getName()); return; } @@ -113,10 +113,10 @@ public class CopyAtsConfigurationBlam extends AbstractBlam { @Override public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) throws OseeCoreException { super.widgetCreated(xWidget, toolkit, art, dynamicXWidgetLayout, modListener, isEditable); - if (xWidget.getLabel().equals("Top Team Definition to Copy From (most like new config)")) { + String label = xWidget.getLabel(); + if ("Top Team Definition to Copy From (most like new config)".equals(label)) { xTeamDefinitionCombo = (XTeamDefinitionCombo) xWidget; - } - if (xWidget.getLabel().equals("Top Actionable Item to Copy From")) { + } else if ("Top Actionable Item to Copy From".equals(label)) { xActionableItemCombo = (XActionableItemCombo) xWidget; } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java index 717f375..aafe487 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatusBlam.java @@ -597,7 +597,7 @@ public class DetailedTestStatusBlam extends AbstractBlam { @Override public void widgetCreated(XWidget xWidget, FormToolkit toolkit, Artifact art, DynamicXWidgetLayout dynamicXWidgetLayout, XModifiedListener modListener, boolean isEditable) { String widgetName = xWidget.getLabel(); - if (widgetName.equals("Program")) { + if ("Program".equals(widgetName)) { XAtsProgramComboWidget programWidget = (XAtsProgramComboWidget) xWidget; programWidget.getComboViewer().addSelectionChangedListener(new ProgramSelectionListener()); } @@ -611,7 +611,6 @@ public class DetailedTestStatusBlam extends AbstractBlam { legacyIdToImplementers.put(legacyId, implementers); for (TaskArtifact task : tasks) { - taskNameMatcher.reset(task.getName()); if (taskNameMatcher.find()) { String requirementName = taskNameMatcher.group(2); diff --git a/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee b/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee index 5366a8b..92004d2 100644 --- a/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee +++ b/plugins/org.eclipse.osee.ats/support/OseeTypes_ATS.osee @@ -19,6 +19,11 @@ abstract artifactType "ats.Ats Artifact" extends "Artifact" { attribute "ats.Goal Order Vote" } +artifactType "TaskCreation" extends "Artifact" { + guid "ABR52KH7FwMFi9CFsLgA" + uuid 0x1000000000000198 +} + artifactType "ats.Review" extends "ats.State Machine" { guid "ABMa6P4TwzXA1b8K3RAA" uuid 0x0000000000000040 diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java index cc13ddc..9fbdc59 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/enums/CoreArtifactTypes.java @@ -52,6 +52,7 @@ public final class CoreArtifactTypes { public static final IArtifactType SystemDesign = TokenFactory.createArtifactType(0x000000000000002CL, "System Design"); public static final IArtifactType SystemFunction = TokenFactory.createArtifactType(0x0000000000000023L, "System Function"); public static final IArtifactType SystemRequirement = TokenFactory.createArtifactType(0x000000000000001EL, "System Requirement"); + public static final IArtifactType TaskCreation = TokenFactory.createArtifactType(0x1000000000000198L, "Task Creation"); public static final IArtifactType TestCase = TokenFactory.createArtifactType(0x0000000000000052L, "Test Case"); public static final IArtifactType TestInformationSheet = TokenFactory.createArtifactType(0x0000000000000029L, "Test Information Sheet"); public static final IArtifactType TestPlanElement = TokenFactory.createArtifactType(0x0000000000000025L, "Test Plan Element"); diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java index 814d4c3..38188b1 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java @@ -13,7 +13,6 @@ package org.eclipse.osee.framework.database.core; import java.util.HashMap; import java.util.Map; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.jdk.core.util.Strings; /** * @author Donald G. Dunne @@ -65,10 +64,7 @@ public class OseeInfo { */ public static boolean isCacheEnabled(String key) throws OseeCoreException { String dbProperty = OseeInfo.getCachedValue(key); - if (Strings.isValid(dbProperty)) { - return dbProperty.equals("true"); - } - return false; + return "true".equals(dbProperty); } public static void setEnabled(String key, boolean enabled) throws OseeCoreException { @@ -89,10 +85,7 @@ public class OseeInfo { */ public static boolean isBoolean(String key) throws OseeCoreException { String dbProperty = OseeInfo.getValue(key); - if (Strings.isValid(dbProperty)) { - return dbProperty.equals("true"); - } - return false; + return "true".equals(dbProperty); } public static void putValue(String key, String value) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AHTML.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AHTML.java index 4fb0cf2..8a3c2ab 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AHTML.java +++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/util/AHTML.java @@ -423,7 +423,7 @@ public class AHTML { return addHeaderRowMultiColumnTable(strs.toArray(new String[strs.size()])); } - public static String addHeaderRowMultiColumnTable(String[] str) { + public static String addHeaderRowMultiColumnTable(String... str) { return addHeaderRowMultiColumnTable(str, null); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java index ec99886..12cb4f7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java @@ -56,6 +56,7 @@ public abstract class AbstractBlam implements IDynamicWidgetLayoutListener { public enum BlamUiSource { DEFAULT, + EMPTY, FILE } @@ -90,6 +91,30 @@ public abstract class AbstractBlam implements IDynamicWidgetLayoutListener { return generatedName.toString(); } + /** + * Example usage of VariableMap parameter: + * + * <pre> + * ui: + * {@code + * <xWidgets> + * <XWidget xwidgetType="XComboWidget" displayName="Program1" /> + * </xWidgets> + * } + * </pre> + * + * Variable mapping: + * + * <pre> + * {@code + * ... + * (SpecificType) variableMap.getValue("Program1"); + * ... + * } + * </pre> + * + * @param variableMap mapping of displayName to widget. + */ public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception { throw new OseeStateException( "either runOperation or createOperation but be overriden by subclesses of AbstractBlam"); @@ -109,6 +134,8 @@ public abstract class AbstractBlam implements IDynamicWidgetLayoutListener { switch (source) { case FILE: return getXWidgetsXmlFromUiFile(getClass().getSimpleName(), Activator.PLUGIN_ID); + case EMPTY: + return AbstractBlam.emptyXWidgetsXml; case DEFAULT: default: return AbstractBlam.branchXWidgetXml; @@ -121,8 +148,7 @@ public abstract class AbstractBlam implements IDynamicWidgetLayoutListener { * @param className class name of blam * @param nameOfBundle name of bundle i.e. org.eclipse.rcp.xyz * @return contents of the {@code /bundleName/ui/<className>Ui.xml } - * @throws OseeCoreException usually {@link IOException} or {@link NullPointerException} wrapped in - * {@link OseeCoreException} + * @throws OseeCoreException usually {@link IOException} or {@link NullPointerException} (if resource not found). */ public String getXWidgetsXmlFromUiFile(String className, String nameOfBundle) throws OseeCoreException { String file = String.format("ui/%sUi.xml", className); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java index 38b5d03..e4d95b4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java @@ -36,10 +36,6 @@ public class BlamEditor extends FormEditor implements IDirtiableEditor { private BlamEditorActionBarContributor actionBarContributor; private BlamOverviewPage overviewPage; - public BlamEditor() { - super(); - } - public BlamEditorActionBarContributor getActionBarContributor() { if (actionBarContributor == null) { actionBarContributor = new BlamEditorActionBarContributor(this); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java index e1cdb0f..add3a71 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java @@ -338,7 +338,6 @@ public class FixTemplateContentArtifacts extends AbstractBlam { private final String uri; public AttrData(String gammaId, String hrid, String uri) { - super(); this.gammaId = gammaId; this.hrid = hrid; this.uri = uri; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java index ae00790..0fd7a2c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java @@ -33,11 +33,11 @@ public class ImageCaptureBlam extends AbstractBlam { public Point topLeftPoint; public Point botRightPoint; - public boolean listenerAdded = false; - @Override - public String getName() { - return "Image Capture"; + public ImageCaptureBlam() { + super("Image Capture", + "Mouse Down on top left location, Mouse Up on bottom right. Only works within bounds of workbench window.", + BlamUiSource.EMPTY); } @Override @@ -77,16 +77,6 @@ public class ImageCaptureBlam extends AbstractBlam { }; @Override - public String getXWidgetsXml() { - return "<xWidgets></xWidgets>"; - } - - @Override - public String getDescriptionUsage() { - return "Mouse Down on top left location, Mouse Up on bottom right. Only works within bounds of workbench window."; - } - - @Override public Collection<String> getCategories() { return Arrays.asList("Util"); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowNextTypeRemoteIds.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowNextTypeRemoteIds.java index ab6e715..1140523 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowNextTypeRemoteIds.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowNextTypeRemoteIds.java @@ -75,11 +75,6 @@ public class ShowNextTypeRemoteIds extends AbstractBlam { } @Override - public String getName() { - return "Show Next OseeType Remote_Ids"; - } - - @Override public String getDescriptionUsage() { return "Return the next remote_ids for Artifact, Attribute, Relation and Enum types for both Framework (org.eclipse.osee) and Local (Origin) Types."; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java index b8ea845..5b60e52 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java @@ -63,27 +63,24 @@ public class StringGuidsToArtifactListOperation extends AbstractOperation { monitor.worked(guidIndex + 1); } - try { - //written to minimize calls to db VS individuals gets (+cost of overhead) - if (!monitor.isCanceled()) { - monitor.subTask(subTaskName); - monitor.beginTask(subTaskName, costOfArtifactRetrieval); - artifacts.addAll(ArtifactQuery.getArtifactListFromIds(validGuids, this.branch)); - monitor.done(); - monitor.worked(costOfArtifactRetrieval); + if (!validGuids.isEmpty()) { + try { + //written to minimize calls to db VS individuals gets (+cost of overhead) + if (!monitor.isCanceled()) { + monitor.subTask(subTaskName); + artifacts.addAll(ArtifactQuery.getArtifactListFromIds(validGuids, this.branch)); + monitor.done(); + monitor.worked(costOfArtifactRetrieval); + } + } catch (Exception ex) { + getLogger().log(ex); } - } catch (Exception ex) { - getLogger().log(ex); } - - monitor.done(); - widget.addToInput(artifacts); } else { getLogger().logf("Problem with arguments for this operation: %s", - Strings.buildStatment(Arrays.asList(new String[] {"rawGuidsData", "branch", "widget"})), " or "); - monitor.setCanceled(true); - monitor.done(); + Strings.buildStatment(Arrays.asList("rawGuidsData", "branch", "widget")), " or "); } + monitor.done(); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/StringNameSorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/StringNameSorter.java index 3d1e967..48e4efd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/StringNameSorter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/StringNameSorter.java @@ -15,14 +15,9 @@ import org.eclipse.jface.viewers.ViewerSorter; public class StringNameSorter extends ViewerSorter { - public StringNameSorter() { - super(); - } - @Override @SuppressWarnings("unchecked") public int compare(Viewer viewer, Object o1, Object o2) { - return getComparator().compare(o1.toString(), o2.toString()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java index e87f8a6..52a40c4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java @@ -107,8 +107,8 @@ public class XListDropViewer extends XListViewer implements IXWidgetInputAddable TextTransfer transfer = TextTransfer.getInstance(); String data = (String) cb.getContents(transfer); Branch branch = BranchSelectionDialog.getBranchFromUser(); - Operations.executeAsJob(new StringGuidsToArtifactListOperation(new ClientLogger( - Activator.class), data, branch, XListDropViewer.this), true); + Operations.executeAsJob(new StringGuidsToArtifactListOperation(new ClientLogger(Activator.class), + data, branch, XListDropViewer.this), true); } finally { cb.dispose(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/ui/TaskConfigurationUi.xml b/plugins/org.eclipse.osee.framework.ui.skynet/ui/TaskConfigurationUi.xml new file mode 100644 index 0000000..8441616 --- a/dev/null +++ b/plugins/org.eclipse.osee.framework.ui.skynet/ui/TaskConfigurationUi.xml @@ -0,0 +1,4 @@ +<xWidgets> + <XWidget xwidgetType="XAtsProgramComboWidget" displayName="Program" /> + <XWidget xwidgetType="XListDropViewer" displayName="Version Artifacts" /> +</xWidgets> |

