diff options
32 files changed, 55 insertions, 102 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ResourceHistoryAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ResourceHistoryAction.java index 336d3c06dfd..63531922344 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ResourceHistoryAction.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/ResourceHistoryAction.java @@ -30,7 +30,6 @@ public class ResourceHistoryAction extends Action { public ResourceHistoryAction(AbstractWorkflowArtifact sma) { super("Resource History"); - setToolTipText(getText()); this.sma = sma; setToolTipText(getText()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java index d545a3f7960..4c4e812bd92 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java @@ -64,7 +64,6 @@ public class ArtifactHyperView extends HyperView implements IArtifactEventListen public Artifact currentArtifact; public ArtifactHyperView() { - super(); PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener(this); PlatformUI.getWorkbench().getActiveWorkbenchWindow().addPerspectiveListener(this); HyperView.setNodeColor(whiteColor); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java index 59e7fe75481..b27cd9420dc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java @@ -716,7 +716,6 @@ public class HyperView extends ViewPart implements IPartListener { } NodeFigure figure = new NodeFigure(nameLabel, infoLabel, hvi, center); - // System.out.println(title + " " + figure.hashCode()); container.add(figure); figure.setToolTip(new Label(hvi.getToolTip())); return figure; @@ -941,9 +940,6 @@ public class HyperView extends ViewPart implements IPartListener { refresh(); } - /** - * Passing the focus request to the viewer's control. - */ @Override public void setFocus() { // viewer.getControl().setFocus(); @@ -977,11 +973,6 @@ public class HyperView extends ViewPart implements IPartListener { } @Override - public void dispose() { - // do nothing - } - - @Override public void partActivated(IWorkbenchPart part) { // do nothing } diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java index 4cb01a5dee8..8d27104a144 100644 --- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java +++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateView.java @@ -41,12 +41,6 @@ public class DefineNavigateView extends ViewPart implements IActionable { public static final String VIEW_ID = "org.eclipse.osee.define.DefineNavigateView"; private XNavigateComposite xNavComp; - /** - * The constructor. - */ - public DefineNavigateView() { - } - @Override public void setFocus() { } diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java index b1b870adee4..35cf57ce440 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java @@ -57,15 +57,10 @@ public class AdminView extends ViewPart implements IActionable { private final ArrayList<DbItem> dbItems; private final Cursor handCursor; - /** - * The constructor. - */ public AdminView() { dbItems = new ArrayList<DbItem>(); dbItems.add(new SiteGssflRpcr()); handCursor = new Cursor(null, SWT.CURSOR_HAND); - - // permissionList.addPermission(PermissionEnum.); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java index 3af01c92c40..a923a3bf918 100644 --- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphEditor.java @@ -65,7 +65,6 @@ public class BranchGraphEditor extends GraphicalEditorWithFlyoutPalette { private KeyHandler shareKeyHandler; public BranchGraphEditor() { - super(); setEditDomain(new DefaultEditDomain(this)); } diff --git a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphOutlinePage.java b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphOutlinePage.java index f3ed3f099ae..ef8f7246fa6 100644 --- a/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphOutlinePage.java +++ b/plugins/org.eclipse.osee.framework.ui.branch.graph/src/org/eclipse/osee/framework/ui/branch/graph/core/BranchGraphOutlinePage.java @@ -40,13 +40,12 @@ public class BranchGraphOutlinePage extends Page implements IContentOutlinePage private Thumbnail thumbnail; public BranchGraphOutlinePage(ScalableRootEditPart rootEditPart) { - super(); this.rootEditPart = rootEditPart; } @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { - + // } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/AbstractSelectionEnabledHandler.java b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/AbstractSelectionEnabledHandler.java index 870a2c7cd49..1694852a6f5 100644 --- a/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/AbstractSelectionEnabledHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.plugin/src/org/eclipse/osee/framework/ui/plugin/util/AbstractSelectionEnabledHandler.java @@ -29,6 +29,7 @@ public abstract class AbstractSelectionEnabledHandler extends CommandHandler imp @Override public final void menuHidden(MenuEvent e) { + //Do nothing } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java index bcf14cb01f4..06acddf9949 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java @@ -120,7 +120,7 @@ public class ArtifactImportPage extends WizardDataTransferPage { } public void setDefaultSourceFile(File resource) { - this.defaultSourceFile = resource; + defaultSourceFile = resource; } public void setDefaultDestinationArtifact(Artifact destinationArtifact) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java index d1f9600d1d7..d88fa153567 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java @@ -111,7 +111,7 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget { } private void addAssociated(StringBuilder sb) { - String message = ""; + String message; Artifact associatedArtifact = changeData.getAssociatedArtifact(); if (associatedArtifact != null) { message = AXml.textToXml(associatedArtifact.getName()); @@ -122,12 +122,13 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget { } public static void addTransactionInfo(StringBuilder sb, TransactionRecord transaction) { - String author = "Unknown"; + String author; try { User user = UserManager.getUserByArtId(transaction.getAuthor()); author = user.toString(); } catch (OseeCoreException ex) { OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + author = "Unknown"; } DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG); sb.append(String.format(" <b>On: </b> %s<br/>", dateFormat.format(transaction.getTimeStamp()))); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java index 6707ed02e52..ad9f380e48d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java @@ -44,8 +44,7 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView private final EventRelay eventRelay; public ChangeReportEditor() { - super(); - this.eventRelay = new EventRelay(); + eventRelay = new EventRelay(); } public ChangeReportActionBarContributor getActionBarContributor() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java index 7a82f895d62..5aa4df5878c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java @@ -98,8 +98,8 @@ public class ChangeReportPage extends FormPage { managedForm.getMessageManager().setAutoUpdate(false); ChangeUiData uiData = getEditorInput().getChangeData(); - this.changeReportTable = new ChangeReportTable(uiData); - this.infoPresenter = new ChangeReportInfoPresenter(new ChangeReportInfo(), uiData); + changeReportTable = new ChangeReportTable(uiData); + infoPresenter = new ChangeReportInfoPresenter(new ChangeReportInfo(), uiData); int sectionStyle = ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED | ExpandableComposite.TWISTIE; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/FlatPresentationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/FlatPresentationHandler.java index c94ea6d3663..b5fbda061b6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/FlatPresentationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/FlatPresentationHandler.java @@ -33,7 +33,7 @@ public class FlatPresentationHandler extends AbstractHandler implements IElement private final ICommandService service; public FlatPresentationHandler() { - this.service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class); + service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/HierarchicalPresentationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/HierarchicalPresentationHandler.java index 8fff4953d6d..bc183984271 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/HierarchicalPresentationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/HierarchicalPresentationHandler.java @@ -34,7 +34,7 @@ public final class HierarchicalPresentationHandler extends AbstractHandler imple private final ICommandService service; public HierarchicalPresentationHandler() { - this.service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class); + service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java index e4c77157814..93ec612bc59 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java @@ -313,7 +313,6 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I } public void storeExpandedAndSelection() { - // System.out.println("GE: storeExpandedAndSelection"); // Store selected so can re-select after event re-draw selected = getSelectedItems(); if (treeViewer != null && !treeViewer.getTree().isDisposed()) { @@ -322,7 +321,6 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I } public void restoreExpandedAndSelection() { - // System.out.println("GE: restoreExpandedAndSelection"); if (expanded != null && expanded.length > 0 && rootArt != null) { treeViewer.setExpandedElements(expanded); } @@ -368,7 +366,6 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I } public void refresh() { - // System.out.println("GE: refresh"); if (rootItem != null) { rootItem.dispose(); } @@ -387,7 +384,6 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I } else { rootArt = topArt; rootItem = new GroupExplorerItem(treeViewer, rootArt, null, this); - // rootItem.getGroupItems(); } if (treeViewer != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java index cc3c200d963..90d63c6e13a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java @@ -43,7 +43,7 @@ public class XBranchSelectComboWidget extends XWidget implements Listener { public XBranchSelectComboWidget(String label) { super(label); - this.defaultBranch = -1; + defaultBranch = -1; } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java index 615e4df93d7..e088ef06cba 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java @@ -58,7 +58,7 @@ public class XCombo extends XWidget { } public void setDefaultSelectionAllowed(boolean isAllowed) { - this.isDefaultSelectionAllowed = isAllowed; + isDefaultSelectionAllowed = isAllowed; } public boolean isDefaultSelectionAllowed() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithText.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithText.java index 6431e4c3c67..a874b530fba 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithText.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithText.java @@ -82,7 +82,8 @@ public class XComboWithText extends XCombo { composite.dispose(); } - private boolean isSelected() { + @Override + public boolean isSelected() { return get().equals(moreInfoOption); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithTextAndComboWithText.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithTextAndComboWithText.java index dbfc00b32c5..193461ad323 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithTextAndComboWithText.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboWithTextAndComboWithText.java @@ -92,7 +92,8 @@ public class XComboWithTextAndComboWithText extends XCombo { refreshComposite(); } - private boolean isSelected() { + @Override + public boolean isSelected() { return get().equals(moreInfoOption); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelValueBase.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelValueBase.java index 94495989f07..eec78c92d1c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelValueBase.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelValueBase.java @@ -140,15 +140,14 @@ public abstract class XLabelValueBase extends XWidget { } /** - * @param valueText the valueText to set + * @param valueText to set */ - public void setValueText(String valueText) { - this.valueText = valueText; + public void setValueText(String text) { + valueText = text; if (valueLabel != null && !valueLabel.isDisposed()) { - valueLabel.setText(this.valueText); + valueLabel.setText(valueText); valueLabel.update(); valueLabel.getParent().update(); } - } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java index 73a1e8b617a..51c82bedc5b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java @@ -363,9 +363,7 @@ public class XList extends XWidget { } public void add(Collection<String> names) { - for (String name : names) { - add(name); - } + add(names.toArray(new String[0])); } public void addSelected(String name) { @@ -431,13 +429,10 @@ public class XList extends XWidget { /** * Minimum number of selected items that makes this widget valid - * - * @param minSelected - - * @param maxSelected - */ public void setRequiredSelected(int minSelected, int maxSelected) { - this.requiredMinSelected = minSelected; - this.requiredMaxSelected = maxSelected; + requiredMinSelected = minSelected; + requiredMaxSelected = maxSelected; setRequiredEntry(true); } @@ -445,20 +440,18 @@ public class XList extends XWidget { public void setRequiredEntry(boolean requiredEntry) { super.setRequiredEntry(requiredEntry); if (!requiredEntry) { - this.requiredMinSelected = 1; - this.requiredMaxSelected = 1; + requiredMinSelected = 1; + requiredMaxSelected = 1; } } @Override public String getReportData() { - String s = "\n"; + StringBuilder builder = new StringBuilder(); + builder.append("\n"); for (XListItem xItem : getSelected()) { - s = s + " - " + xItem + "\n"; + builder.append(String.format(" - %s\n", xItem)); } - s = s.replaceAll("\n+$", ""); - return s; - } @Override public String toXml() { @@ -483,12 +476,13 @@ public class XList extends XWidget { @Override public String toHTML(String labelFont) { - String s = "<dl><dt>" + AHTML.getLabelStr(labelFont, getLabel() + ": ") + "<dt><ul type=\"disc\">"; + StringBuilder builder = new StringBuilder(); + builder.append("<dl><dt>" + AHTML.getLabelStr(labelFont, getLabel() + ": ") + "<dt><ul type=\"disc\">"); for (XListItem xItem : getSelected()) { - s += "<li>" + xItem; + builder.append("<li>" + xItem); } - - return s + "</ul></dl>"; + builder.append("</ul></dl>"); + return builder.toString(); } /** diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java index 9b2372d44dc..7b1beac5f42 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java @@ -359,13 +359,10 @@ public class XListViewer extends XWidget { /** * Minimum number of selected items that makes this widget valid - * - * @param minSelected - - * @param maxSelected = */ public void setRequiredSelected(int minSelected, int maxSelected) { - this.requiredMinSelected = minSelected; - this.requiredMaxSelected = maxSelected; + requiredMinSelected = minSelected; + requiredMaxSelected = maxSelected; setRequiredEntry(true); } @@ -373,8 +370,8 @@ public class XListViewer extends XWidget { public void setRequiredEntry(boolean requiredEntry) { super.setRequiredEntry(requiredEntry); if (!requiredEntry) { - this.requiredMinSelected = 1; - this.requiredMaxSelected = 1; + requiredMinSelected = 1; + requiredMaxSelected = 1; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java index 2c8767f1b44..0ecfe14ef83 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java @@ -40,15 +40,13 @@ import org.eclipse.swt.widgets.Label; */ public abstract class XSelectFromDialog<T> extends XText { - private final List<T> selected; - private final List<T> input; + private final List<T> selected = new ArrayList<T>(); + private final List<T> input = new ArrayList<T>(); private int minSelectionRequired, maxSelectionRequired = 1; private Button selectionButton; public XSelectFromDialog(String displayLabel, String xmlRoot) { super(displayLabel, xmlRoot); - this.selected = new ArrayList<T>(); - this.input = new ArrayList<T>(); setToolTip("Click the button on the left to change the current selection."); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java index 0c86b82deb3..ded635a1013 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java @@ -99,7 +99,7 @@ public class XText extends XWidget { @Override public String toString() { - return getLabel() + ": *" + text + "*"; + return String.format("%s: *%s*", getLabel(), text); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java index 94adcbdd4e1..af23181f559 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java @@ -221,7 +221,7 @@ public abstract class XWidget { } protected void setNotificationsAllowed(boolean areAllowed) { - this.isNotificationAllowed.setValue(areAllowed); + isNotificationAllowed.setValue(areAllowed); } protected void createControls(Composite parent, int horizontalSpan) { @@ -331,7 +331,7 @@ public abstract class XWidget { } public void setDisplayLabel(String displayLabel) { - this.label = displayLabel; + label = displayLabel; } public boolean isEditable() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java index 9c6df602a7a..566c1a6de03 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java @@ -69,8 +69,6 @@ public class BranchView extends ViewPart implements IActionable, IBranchEventLis private final Clipboard clipboard = new Clipboard(null); public BranchView() { - super(); - OseeEventManager.addListener(this); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java index 4c12cb5f208..8a9cf1ef6fc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java @@ -48,10 +48,10 @@ public class BranchViewPresentationPreferences { private boolean disposed; public BranchViewPresentationPreferences(BranchView branchView) { - this.preferencesService = Platform.getPreferencesService(); - this.preferenceChangeListener = null; + preferencesService = Platform.getPreferencesService(); + preferenceChangeListener = null; this.branchView = branchView; - this.disposed = false; + disposed = false; IEclipsePreferences instanceNode = (IEclipsePreferences) preferencesService.getRootNode().node(InstanceScope.SCOPE); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java index b59af9e10af..8f20b1e9f2e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchContentProvider.java @@ -54,12 +54,12 @@ public class XBranchContentProvider implements ITreeContentProvider { public XBranchContentProvider(BranchXViewer commitXViewer) { super(); - this.changeXViewer = commitXViewer; - this.showChildBranchesAtMainLevel = false; - this.showMergeBranches = false; - this.showTransactions = false; - this.showChildBranchesUnderParents = false; - this.showArchivedBranches = false; + changeXViewer = commitXViewer; + showChildBranchesAtMainLevel = false; + showMergeBranches = false; + showTransactions = false; + showChildBranchesUnderParents = false; + showArchivedBranches = false; } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java index 8b1546d3299..39d2b32bd17 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java @@ -232,6 +232,7 @@ public class XBranchWidget extends XWidget implements IActionable { @Override public void dispose() { + super.dispose(); branchXViewer.dispose(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryContentProvider.java index ea29076145b..2ae4bb44056 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryContentProvider.java @@ -23,8 +23,7 @@ public class XHistoryContentProvider implements ITreeContentProvider { private static Object[] EMPTY_ARRAY = new Object[0]; public XHistoryContentProvider(HistoryXViewer commitXViewer) { - super(); - this.changeXViewer = commitXViewer; + changeXViewer = commitXViewer; } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 9a674f1f9d0..92eeeccd547 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -148,11 +148,9 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList @Override public void dispose() { + super.dispose(); OseeEventManager.removeListener(this); OseeEventManager.removeListener(this); - super.dispose(); - } - @Override public void setFocus() { if (mergeXWidget != null) { diff --git a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java index d68ec6bb42f..a73f1db1ca6 100644 --- a/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java +++ b/plugins/org.eclipse.osee.ote.ui/src/org/eclipse/osee/ote/ui/navigate/OteNavigateView.java @@ -40,12 +40,6 @@ public class OteNavigateView extends ViewPart implements IActionable { public static final String VIEW_ID = "org.eclipse.osee.ote.ui.navigate.OteNavigateView"; private XNavigateComposite xNavComp; - /** - * The constructor. - */ - public OteNavigateView() { - } - @Override public void setFocus() { } |