diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet/src')
229 files changed, 455 insertions, 455 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java index 1a0d971f094..26997b79dfb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java @@ -86,7 +86,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh if (AccessControlManager.hasPermission(parentItem, PermissionEnum.READ)) { Collection<Artifact> children = parentItem.getChildren(); List<RelationLink> relationsAll = parentItem.getRelationsAll(DeletionFlag.EXCLUDE_DELETED); - List<Object> allChildren = new ArrayList<Object>(); + List<Object> allChildren = new ArrayList<>(); if (children != null) { allChildren.addAll(children); } @@ -100,7 +100,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (parentElement instanceof ArtifactExplorerLinkNode) { - List<Artifact> children = new ArrayList<Artifact>(); + List<Artifact> children = new ArrayList<>(); ArtifactExplorerLinkNode artifactExplorerLinkNode = (ArtifactExplorerLinkNode) parentElement; children.addAll(artifactExplorerLinkNode.getOppositeArtifacts()); @@ -116,7 +116,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh } private void addRelations(Artifact parentItem, List<RelationLink> relationsAll, List<Object> allChildren) { - Set<ArtifactExplorerLinkNode> relationTypes = new HashSet<ArtifactExplorerLinkNode>(); + Set<ArtifactExplorerLinkNode> relationTypes = new HashSet<>(); for (RelationLink link : relationsAll) { if (!link.isOfType(CoreRelationTypes.Default_Hierarchical__Child)) { if (link.getAArtifactId() == parentItem.getArtId()) { @@ -126,7 +126,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh } } } - List<ArtifactExplorerLinkNode> sortedRelationTypes = new ArrayList<ArtifactExplorerLinkNode>(relationTypes); + List<ArtifactExplorerLinkNode> sortedRelationTypes = new ArrayList<>(relationTypes); java.util.Collections.sort(sortedRelationTypes, new Comparator<ArtifactExplorerLinkNode>() { @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java index a0ce3e74169..192c03c73a0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java @@ -219,7 +219,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { Conditions.checkNotNull(artifact, "artifact"); Collection<IAttributeType> selectedItems = attributesAction.getSelected(); - List<String> info = new ArrayList<String>(); + List<String> info = new ArrayList<>(); for (IAttributeType attributeType : artifact.getAttributeTypes()) { if (selectedItems.contains(attributeType)) { String value = artifact.getAttributesToString(attributeType); @@ -331,7 +331,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { public ShowAttributeAction(IBranchProvider branchProvider, KeyedImage image) { super("Show Attributes", IAction.AS_PUSH_BUTTON); this.branchProvider = branchProvider; - this.selectedTypes = new HashSet<IAttributeType>(); + this.selectedTypes = new HashSet<>(); if (image != null) { setImageDescriptor(ImageManager.getImageDescriptor(image)); } @@ -357,7 +357,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { "Select attribute types to display."); dialog.setSelectable(selectableTypes); - List<IAttributeType> initSelection = new ArrayList<IAttributeType>(); + List<IAttributeType> initSelection = new ArrayList<>(); for (IAttributeType entry : selectedTypes) { for (IAttributeType type : selectableTypes) { if (type.equals(entry)) { @@ -420,7 +420,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { } private static void notifySettingsChanged(ArtifactDecorator source) { - List<Object> toRemove = new ArrayList<Object>(); + List<Object> toRemove = new ArrayList<>(); for (WeakReference<ArtifactDecorator> ref : DECORATOR_INSTANCES) { ArtifactDecorator decorator = ref.get(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java index ba5d47d7d9f..4ea1ec1a556 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java @@ -62,7 +62,7 @@ public final class ArtifactImageManager { public synchronized static void loadCache() { - Set<IArtifactType> imageKeys = new HashSet<IArtifactType>(); + Set<IArtifactType> imageKeys = new HashSet<>(); imageKeys.addAll(providersOverrideImageMap.keySet()); imageKeys.addAll(artifactTypeImageMap.keySet()); imageKeys.addAll(artifactTypeImageProviderMap.keySet()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java index c622b035ed2..e80bc06ae2b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java @@ -66,7 +66,7 @@ public class ArtifactLabelProvider extends LabelProvider { //StyledCellLabelProv if (element instanceof Artifact) { Artifact artifact = (Artifact) element; - List<String> extraInfo = new ArrayList<String>(); + List<String> extraInfo = new ArrayList<>(); String name = artifact.getName(); extraInfo.add(name != null ? name : ""); if (artifact.isDeleted()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java index df37642da77..e6c1778ac35 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java @@ -33,7 +33,7 @@ public class ArtifactValidationCheckOperation extends AbstractOperation { public ArtifactValidationCheckOperation(final Collection<Artifact> itemsToCheck, boolean stopOnFirstError) { super("Validate Artifact(s)", Activator.PLUGIN_ID); this.stopOnFirstError = stopOnFirstError; - this.itemsToCheck = new ArrayList<Artifact>(itemsToCheck); + this.itemsToCheck = new ArrayList<>(itemsToCheck); if (itemsToCheck != null) { this.itemsToCheck.addAll(itemsToCheck); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java index a7b3cbddd22..35036f2825a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java @@ -63,7 +63,7 @@ public class AttributesComposite extends Composite { private Artifact artifact; private final IDirtiableEditor editor; private Label warningLabel; - private final ArrayList<ModifyAttributesListener> modifyAttrListeners = new ArrayList<ModifyAttributesListener>(); + private final ArrayList<ModifyAttributesListener> modifyAttrListeners = new ArrayList<>(); private MenuItem deleteItem; private final ToolBar toolBar; @@ -246,7 +246,7 @@ public class AttributesComposite extends Composite { addItem.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - Collection<IAttributeType> selectableTypes = new ArrayList<IAttributeType>(); + Collection<IAttributeType> selectableTypes = new ArrayList<>(); try { for (IAttributeType attrType : artifact.getAttributeTypes()) { if (artifact.getRemainingAttributeCount(attrType) > 0) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/DialogPopupLoggerListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/DialogPopupLoggerListener.java index db32b2242ac..9a436df4fcf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/DialogPopupLoggerListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/DialogPopupLoggerListener.java @@ -33,7 +33,7 @@ public class DialogPopupLoggerListener implements ILoggerListener { final IStatus status; final String realMessageText; if (th != null) { - List<IStatus> exc = new ArrayList<IStatus>(); + List<IStatus> exc = new ArrayList<>(); exceptionToString(true, loggerName, th, exc); status = new MultiStatus(loggerName, IStatus.ERROR, exc.toArray(new IStatus[exc.size()]), th.getMessage(), th); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FindInWorkspaceOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FindInWorkspaceOperation.java index f12155bebe0..64a60cb7ae7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FindInWorkspaceOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FindInWorkspaceOperation.java @@ -66,7 +66,7 @@ public class FindInWorkspaceOperation extends AbstractOperation { } private Map<String, Artifact> getGuidMap() { - Map<String, Artifact> guids = new HashMap<String, Artifact>(); + Map<String, Artifact> guids = new HashMap<>(); for (Artifact art : artifacts) { guids.put(art.getGuid(), art); } @@ -75,7 +75,7 @@ public class FindInWorkspaceOperation extends AbstractOperation { private void findByName(Map<String, Artifact> guids, IProgressMonitor monitor) throws Exception { IContainer ws = ResourcesPlugin.getWorkspace().getRoot(); - List<Artifact> toSearch = new LinkedList<Artifact>(guids.values()); + List<Artifact> toSearch = new LinkedList<>(guids.values()); for (Artifact artifact : toSearch) { if (artifact.getArtifactType().equals(CoreArtifactTypes.TestCase)) { String artifactName = artifact.getName(); @@ -83,7 +83,7 @@ public class FindInWorkspaceOperation extends AbstractOperation { if (endOfPackageName != -1) { String packageName = artifactName.substring(0, endOfPackageName); String fileName = artifactName.substring(endOfPackageName + 1) + ".java"; - List<IResource> finds = new ArrayList<IResource>(); + List<IResource> finds = new ArrayList<>(); AWorkspace.recursiveFileFind(fileName, ws, finds); for (IResource find : finds) { if (find.toString().contains(packageName)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java index 953acef6f96..fc31d8ee209 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java @@ -55,7 +55,7 @@ public class HTMLTransferFormatter { sb.append("Version:1.0\r\nStartHTML:2\r\nEndHTML:170\r\nStartFragment:140\r\nEndFragment:160\r\n" + "StartSelection:140\r\nEndSelection:160\r\n<HTML><HEAD><TITLE> The HTML Clipboard</TITLE></HEAD><BODY>\r\n" + "<!--StartFragment -->\r\n"); } - List<String> urls = new ArrayList<String>(artifacts.length); + List<String> urls = new ArrayList<>(artifacts.length); for (Artifact artifact : artifacts) { String link = null; try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java index 7eb5bd39d74..6fe6d9fb790 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java @@ -155,7 +155,7 @@ public final class ArtifactImportOperationFactory { builder.addOp(new RoughToRealArtifactOperation(transaction, destinationArtifact, collector, resolver, deleteUnmatchedArtifacts, extractor)); - final List<Artifact> children = new ArrayList<Artifact>(); + final List<Artifact> children = new ArrayList<>(); builder.addOp(new FetchAndAddDescendantsOperation(children, destinationArtifact)); builder.addOp(new ArtifactValidationCheckOperation(children, stopOnError)); builder.addOp(new CompleteArtifactImportOperation(transaction, destinationArtifact)); 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 44050676c63..e4bcc2f1aee 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 @@ -92,7 +92,7 @@ public class ArtifactImportPage extends WizardDataTransferPage { protected ArtifactImportPage(File defaultSourceFile, Artifact defaultDestinationArtifact) { super(PAGE_NAME); - selectedArtifactTypes = new ArrayList<IArtifactType>(); + selectedArtifactTypes = new ArrayList<>(); selectionLatch = new SelectionLatch(); collector = new RoughArtifactCollector(new RoughArtifact(RoughArtifactKind.PRIMARY)); artifactSelectPanel = new ArtifactSelectPanel(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java index 65481d4b42c..1dadf9332d8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java @@ -70,7 +70,7 @@ public class OpenContributionItem extends ContributionItem { private static final String DEFAULT_OPEN_CMD_ID = "org.eclipse.osee.framework.ui.skynet.open.command"; - private final Collection<IContributionItem> openWithItems = new ArrayList<IContributionItem>(); + private final Collection<IContributionItem> openWithItems = new ArrayList<>(); private final ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class); private IContributionItem defaultOpenItem; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java index 6cf24d7e47b..1957b058a56 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java @@ -86,7 +86,7 @@ public class OseePreferencePage extends PreferencePage implements IWorkbenchPref OseeLog.log(Activator.class, Level.SEVERE, ex); } - networkButtons = new HashMap<InetAddress, Button>(); + networkButtons = new HashMap<>(); Button defaultButton = new Button(group, SWT.RADIO); defaultButton.setText("Default"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java index 467e0df7027..78af9448244 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java @@ -40,7 +40,7 @@ import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class RelationContentProvider implements ITreeContentProvider { private static Object[] EMPTY_ARRAY = new Object[0]; private Artifact artifactRoot; - private final Map<Object, Object> childToParentMap = new HashMap<Object, Object>(); + private final Map<Object, Object> childToParentMap = new HashMap<>(); @Override public void dispose() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java index f677460b43a..cdf8db00547 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java @@ -47,7 +47,7 @@ public class RelationOrderContributionItem extends ContributionItem { } private final ISelectionProvider selectionProvider; - private final Collection<SelectionListener> listeners = new CopyOnWriteArrayList<SelectionListener>(); + private final Collection<SelectionListener> listeners = new CopyOnWriteArrayList<>(); public RelationOrderContributionItem(ISelectionProvider selectionProvider) { super("relation.order.contribution.item"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java index 8bcb436d18d..ae299ee654e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationSkynetDragAndDrop.java @@ -288,7 +288,7 @@ public final class RelationSkynetDragAndDrop extends SkynetDragAndDrop { @Override protected void doWork(IProgressMonitor monitor) throws Exception { - Collection<URI> resources = new LinkedList<URI>(); + Collection<URI> resources = new LinkedList<>(); for (String path : input) { File file = new File(path); if (file.exists()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java index 29c6e0e2d56..c7e52225281 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java @@ -334,7 +334,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { public void widgetSelected(SelectionEvent e) { TreeViewerReport report = new TreeViewerReport("Relation View Report for " + artifact.getName(), treeViewer); - ArrayList<Integer> ignoreCols = new ArrayList<Integer>(); + ArrayList<Integer> ignoreCols = new ArrayList<>(); ignoreCols.add(COLUMN_ORDER); report.setIgnoreColumns(ignoreCols); report.open(); @@ -380,7 +380,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } private void openWordViewer(IStructuredSelection selection) { - List<Artifact> artifacts = new ArrayList<Artifact>(); + List<Artifact> artifacts = new ArrayList<>(); for (Object object : selection.toArray()) { if (object instanceof WrapperForRelationLink) { @@ -397,7 +397,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } private Set<Artifact> getSelectedArtifacts(IStructuredSelection selection) { - Set<Artifact> selectedArtifacts = new HashSet<Artifact>(); + Set<Artifact> selectedArtifacts = new HashSet<>(); Iterator<?> iter = selection.iterator(); while (iter.hasNext()) { Object object = iter.next(); @@ -452,8 +452,8 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { Collection<MenuItem> artEnabledOnlyitems; public NeedSelectedArtifactListener() { - accessControlitems = new LinkedList<MenuItem>(); - artEnabledOnlyitems = new LinkedList<MenuItem>(); + accessControlitems = new LinkedList<>(); + artEnabledOnlyitems = new LinkedList<>(); } public void addArtifactEnabled(MenuItem item) { @@ -623,7 +623,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { boolean hasPermission = false; try { RelationTypeSide relationTypeSide = null; - ArrayList<Artifact> artifacts = new ArrayList<Artifact>(); + ArrayList<Artifact> artifacts = new ArrayList<>(); if (object instanceof WrapperForRelationLink) {//used for ordering WrapperForRelationLink targetLink = (WrapperForRelationLink) object; relationTypeSide = new RelationTypeSide(targetLink.getRelationType(), targetLink.getRelationSide()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ResServiceContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ResServiceContributionItem.java index 2f3464b6db7..87acc0de36b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ResServiceContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ResServiceContributionItem.java @@ -109,7 +109,7 @@ public class ResServiceContributionItem extends OseeStatusContributionItem imple @Override public void run() { boolean isActive = getStatus(); - Set<OseeStatusContributionItem> toRemove = new HashSet<OseeStatusContributionItem>(); + Set<OseeStatusContributionItem> toRemove = new HashSet<>(); for (OseeStatusContributionItem item : itemsToUpdate) { if (item.isDisposed()) { toRemove.add(item); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java index 95e228c2533..8e8a1e5a2bb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SelectionProviderWrapper.java @@ -28,7 +28,7 @@ public class SelectionProviderWrapper implements ISelectionProvider { @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { if (selectionListeners == null) { - selectionListeners = new ArrayList<Object>(1); + selectionListeners = new ArrayList<>(1); } selectionListeners.add(listener); if (provider != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java index 4e02ede801a..a5c08d0e04d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/TreeViewerReport.java @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.TreeItem; public class TreeViewerReport { private final TreeViewer treeViewer; - private ArrayList<Integer> ignoreCols = new ArrayList<Integer>(); + private ArrayList<Integer> ignoreCols = new ArrayList<>(); private final String title; public TreeViewerReport(String title, TreeViewer treeViewer) { @@ -71,7 +71,7 @@ public class TreeViewerReport { html += AHTML.addHeaderRowMultiColumnTable(colNames, width); // Get column widths and column name and setup the columns ITableLabelProvider labelProv = (ITableLabelProvider) treeViewer.getLabelProvider(); - ArrayList<String[]> list = new ArrayList<String[]>(); + ArrayList<String[]> list = new ArrayList<>(); for (TreeItem item : items) { addRow(item, list, labelProv, cols.length, 1); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java index 77f0ac39d29..54db95716f3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java @@ -65,7 +65,7 @@ public class XWidgetParser { public static List<XWidgetRendererItem> extractlayoutDatas(SwtXWidgetRenderer dynamicXWidgetLayout, Element xWidgets) { NodeList widgets = xWidgets.getElementsByTagName(SwtXWidgetRenderer.XWIDGET); - List<XWidgetRendererItem> layoutDatas = new ArrayList<XWidgetRendererItem>(widgets.getLength()); + List<XWidgetRendererItem> layoutDatas = new ArrayList<>(widgets.getLength()); for (int i = 0; i < widgets.getLength(); i++) { layoutDatas.add(extractWorkAttribute(dynamicXWidgetLayout, (Element) widgets.item(i))); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java index 7a4af370c68..9e3920a9fb4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java @@ -87,7 +87,7 @@ public class PolicyDialog extends Dialog { cmbUsers.setText("-Select Person-"); cmbPermissionLevel.setText("-Select Permission-"); - ArrayList<Artifact> subjectList = new ArrayList<Artifact>(); + ArrayList<Artifact> subjectList = new ArrayList<>(); subjectList.addAll(UserManager.getUsersSortedByName()); subjectList.addAll(ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.UserGroup, BranchManager.getCommonBranch())); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java index d7f2cc3c784..d50833870ca 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java @@ -39,8 +39,8 @@ import org.eclipse.swt.widgets.Composite; */ public class PolicyTableViewer { - private final Map<String, AccessControlData> accessControlList = new HashMap<String, AccessControlData>(); - private final Collection<AccessControlData> deleteControlList = new ArrayList<AccessControlData>(); + private final Map<String, AccessControlData> accessControlList = new HashMap<>(); + private final Collection<AccessControlData> deleteControlList = new ArrayList<>(); private final Object object; private final Composite parent; private PermissionEnum maxModificationLevel = PermissionEnum.FULLACCESS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java index f240d0c4bea..7286b3e9ce8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableXviewer.java @@ -87,7 +87,7 @@ public class PolicyTableXviewer extends XViewer implements IMultiColumnEditProvi } TreeSelection treeSelection = (TreeSelection) getSelection(); Iterator<?> elements = treeSelection.iterator(); - ArrayList<AccessControlData> userData = new ArrayList<AccessControlData>(); + ArrayList<AccessControlData> userData = new ArrayList<>(); while (elements.hasNext()) { AccessControlData ac = (AccessControlData) elements.next(); if (PermissionEnum.getMostRestrictive(ac.getPermission(), maxPermission).equals(ac.getPermission())) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java index 39964cf4320..b492985b726 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/PurgeTransactionAction.java @@ -57,7 +57,7 @@ public class PurgeTransactionAction extends Action { @Override public void run() { - final List<TransactionRecord> useTransactions = new ArrayList<TransactionRecord>(transactions); + final List<TransactionRecord> useTransactions = new ArrayList<>(transactions); if (useTransactions.isEmpty()) { if (!getTransactions(useTransactions)) { return; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java index 53323d47a43..6767e6cc32f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactNameConflictHandler.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.ui.swt.Displays; public class ArtifactNameConflictHandler { public String resolve(IArtifact source) { - final Pair<String, String> beforeAfterNames = new Pair<String, String>("", ""); + final Pair<String, String> beforeAfterNames = new Pair<>("", ""); String startingName = source.getName(); beforeAfterNames.setFirst(startingName); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java index 62499481651..34e3d9d50ce 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java @@ -107,7 +107,7 @@ public class ArtifactPasteOperation extends AbstractOperation { if (!(source instanceof User)) { newArtifact = source.duplicate(destination.getBranch()); destination.addChild(newArtifact); - List<Artifact> copiedChildren = new ArrayList<Artifact>(); + List<Artifact> copiedChildren = new ArrayList<>(); if (config.isIncludeChildrenOfCopiedElements()) { Collection<Artifact> children = source.getChildren(); if (!children.isEmpty()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java index f7c4c1188df..f514fee3180 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSelectionDialog.java @@ -63,7 +63,7 @@ public class EnumSelectionDialog extends FilteredCheckboxTreeDialog { selected = Selection.ReplaceAll; } } catch (OseeCoreException ex) { - options = new HashSet<String>(); + options = new HashSet<>(); options.add(ex.getLocalizedMessage()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSingletonSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSingletonSelectionDialog.java index 8ffda3bcaef..9d5a6708c20 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSingletonSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/EnumSingletonSelectionDialog.java @@ -46,7 +46,7 @@ public class EnumSingletonSelectionDialog extends ListDialog { isRemoveAllAllowed = AttributeTypeManager.checkIfRemovalAllowed(attributeType, artifacts); } catch (OseeCoreException ex) { - options = new HashSet<String>(); + options = new HashSet<>(); options.add(ex.getLocalizedMessage()); } setInput(options); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationManager.java index 25dc8a752bd..d7be4c7ba94 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationManager.java @@ -55,7 +55,7 @@ public class AttributeAnnotationManager { return Collections.emptySet(); } ensureLoaded(); - Set<ArtifactAnnotation> annotations = new HashSet<ArtifactAnnotation>(); + Set<ArtifactAnnotation> annotations = new HashSet<>(); for (IArtifactAnnotation annotation : extensionDefinedObjects.getObjects()) { annotation.getAnnotations(artifact, annotations); } @@ -76,7 +76,7 @@ public class AttributeAnnotationManager { * annotation for this artifact as annotations can be added via extension point. */ public List<ArtifactAnnotation> getAnnotations() throws OseeCoreException { - List<ArtifactAnnotation> annotations = new ArrayList<ArtifactAnnotation>(); + List<ArtifactAnnotation> annotations = new ArrayList<>(); for (String value : artifact.getAttributesToStringList(CoreAttributeTypes.Annotation)) { ArtifactAnnotation annotation = new ArtifactAnnotation(value); annotations.add(annotation); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java index 70cdfb87c4e..1e1a39945e1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java @@ -44,7 +44,7 @@ import org.eclipse.osee.framework.ui.swt.Displays; */ public class ArtifactEditorEventManager implements IArtifactEventListener, IBranchEventListener, IAccessControlEventListener { - List<IArtifactEditorEventHandler> handlers = new CopyOnWriteArrayList<IArtifactEditorEventHandler>(); + List<IArtifactEditorEventHandler> handlers = new CopyOnWriteArrayList<>(); static ArtifactEditorEventManager instance; public static void add(IArtifactEditorEventHandler iWorldEventHandler) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java index 2f4639484bf..654cbff083f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java @@ -100,7 +100,7 @@ public class ArtifactEditorOutlinePage extends ContentOutlinePage { private final List<AttributeTypeContainer> containers; public InternalLabelProvider() { - this.containers = new ArrayList<AttributeTypeContainer>(); + this.containers = new ArrayList<>(); } @Override @@ -148,7 +148,7 @@ public class ArtifactEditorOutlinePage extends ContentOutlinePage { @Override public Object[] getChildren(Object element) { - List<Object> items = new ArrayList<Object>(); + List<Object> items = new ArrayList<>(); if (element instanceof ArtifactEditor) { ArtifactEditorInput editorInput = ((ArtifactEditor) element).getEditorInput(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java index 8ddcb67fca1..1ddb2c77649 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactFormPage.java @@ -70,7 +70,7 @@ public class ArtifactFormPage extends FormPage { public ArtifactFormPage(FormEditor editor, String id, String title) { super(editor, id, title); - sectionParts = new LinkedHashMap<SectionEnum, SectionPart>(); + sectionParts = new LinkedHashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java index 6e5c2df84b3..1f1fcbce7af 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java @@ -72,7 +72,7 @@ public class AttributeFormPart extends AbstractFormPart { private final ArtifactEditor editor; private Composite composite; private final XWidgetDecorator decorator = new XWidgetDecorator(); - private final Map<IAttributeType, Composite> xWidgetsMap = new HashMap<IAttributeType, Composite>(); + private final Map<IAttributeType, Composite> xWidgetsMap = new HashMap<>(); private final XModifiedListener widgetModifiedListener = new XModifiedListener() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java index 0995b3385e9..c04d55b5c53 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java @@ -72,7 +72,7 @@ public final class AttributeTypeEditDisplay implements AttributeTypeEditPresente dialog.setInput(input); int result = dialog.open(); if (result == Window.OK) { - toReturn = new ArrayList<IAttributeType>(); + toReturn = new ArrayList<>(); for (Object object : dialog.getResult()) { if (object instanceof IAttributeType) { toReturn.add((IAttributeType) object); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java index 24b30949e6b..9d68443fa28 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeUtil.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Attribute; public class AttributeTypeUtil { public static List<IAttributeType> getEmptyTypes(Artifact artifact) throws OseeCoreException { - List<IAttributeType> items = new ArrayList<IAttributeType>(); + List<IAttributeType> items = new ArrayList<>(); for (IAttributeType type : artifact.getAttributeTypes()) { if (!CoreAttributeTypes.Name.equals(type) && artifact.getAttributes(type).isEmpty()) { items.add(type); @@ -39,7 +39,7 @@ public class AttributeTypeUtil { } private static Set<AttributeType> toTypes(List<Attribute<?>> attributes) { - Set<AttributeType> types = new HashSet<AttributeType>(); + Set<AttributeType> types = new HashSet<>(); for (Attribute<?> attribute : attributes) { types.add(attribute.getAttributeType()); } @@ -47,7 +47,7 @@ public class AttributeTypeUtil { } public static List<IAttributeType> getTypesWithData(Artifact artifact) throws OseeCoreException { - List<IAttributeType> items = new ArrayList<IAttributeType>(); + List<IAttributeType> items = new ArrayList<>(); List<Attribute<?>> attributeInstances = artifact.getAttributes(artifact.isDeleted()); Set<AttributeType> typesInExistence = toTypes(attributeInstances); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java index 232e2c5fead..e029b3cf5d5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java @@ -91,14 +91,14 @@ public class MassArtifactEditor extends AbstractArtifactEditor { } public static void editArtifacts(final String name, final Collection<? extends Artifact> artifacts, TableLoadOption... tableLoadOptions) { - Set<TableLoadOption> options = new HashSet<TableLoadOption>(); + Set<TableLoadOption> options = new HashSet<>(); options.addAll(Arrays.asList(tableLoadOptions)); Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { boolean accessControlFilteredResults = false; try { - Set<Artifact> accessibleArts = new HashSet<Artifact>(); + Set<Artifact> accessibleArts = new HashSet<>(); for (Artifact artifact : artifacts) { if (!AccessControlManager.hasPermission(artifact, PermissionEnum.READ)) { OseeLog.log(Activator.class, Level.INFO, @@ -339,7 +339,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor { } public static Collection<MassArtifactEditor> getEditors() { - final List<MassArtifactEditor> editors = new ArrayList<MassArtifactEditor>(); + final List<MassArtifactEditor> editors = new ArrayList<>(); Displays.pendInDisplayThread(new Runnable() { @Override public void run() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassContentProvider.java index d7bb25ff747..72ab4c1df22 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassContentProvider.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.ui.swt.Displays; * @author Donald G. Dunne */ public class MassContentProvider implements ITreeContentProvider { - protected Collection<Artifact> rootSet = new HashSet<Artifact>(); + protected Collection<Artifact> rootSet = new HashSet<>(); private final MassXViewer xViewer; private static Object[] EMPTY_ARRAY = new Object[0]; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java index 5e39db22b5d..421a818e3ec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java @@ -64,7 +64,7 @@ import org.eclipse.swt.widgets.TreeItem; public class MassXViewer extends XViewer implements IMassViewerEventHandler { private String title; - private final Set<Artifact> artifacts = new HashSet<Artifact>(50); + private final Set<Artifact> artifacts = new HashSet<>(50); private final IDirtiableEditor editor; private final List<String> EXTRA_COLUMNS = Arrays.asList(new String[] {"GUID", "Artifact Type"}); private final Composite parent; @@ -88,7 +88,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { @Override public void handleColumnMultiEdit(TreeColumn treeColumn, Collection<TreeItem> treeItems) { String colName = treeColumn.getText(); - Set<Artifact> artifacts = new HashSet<Artifact>(); + Set<Artifact> artifacts = new HashSet<>(); for (TreeItem item : treeItems) { artifacts.add((Artifact) item.getData()); } @@ -166,7 +166,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { return; } // get attributes that can be deleted (from artifact and validity) - Set<IAttributeType> attrTypesUsed = new HashSet<IAttributeType>(); + Set<IAttributeType> attrTypesUsed = new HashSet<>(); for (Artifact art : artifacts) { // include attribute types that are used even if invalid for (Attribute<?> attr : art.getAttributes()) { @@ -288,7 +288,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { } public ArrayList<Artifact> getLoadedArtifacts() { - ArrayList<Artifact> arts = new ArrayList<Artifact>(); + ArrayList<Artifact> arts = new ArrayList<>(); TreeItem items[] = getTree().getItems(); if (items.length > 0) { for (TreeItem item : items) { @@ -306,7 +306,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { } public ArrayList<Artifact> getSelectedArtifacts() { - ArrayList<Artifact> arts = new ArrayList<Artifact>(); + ArrayList<Artifact> arts = new ArrayList<>(); TreeItem items[] = getTree().getSelection(); if (items.length > 0) { for (TreeItem item : items) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java index f25b3bb1d9f..67cce478ca1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.ui.swt.Displays; */ public class MassXViewerEventManager implements IArtifactEventListener { - List<IMassViewerEventHandler> handlers = new CopyOnWriteArrayList<IMassViewerEventHandler>(); + List<IMassViewerEventHandler> handlers = new CopyOnWriteArrayList<>(); static MassXViewerEventManager instance; public static void add(IMassViewerEventHandler iWorldEventHandler) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java index 7dc8bc726ba..39f404a2a0c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java @@ -107,7 +107,7 @@ public class EnumeratedHandlePromptChange implements IHandlePromptChange { private boolean storeNonSingleton() throws OseeCoreException { boolean result = false; - Set<String> selected = new HashSet<String>(); + Set<String> selected = new HashSet<>(); for (Object obj : dialog.getResult()) { selected.add((String) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java index c02f1f5bb99..e8fed07e696 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java @@ -37,7 +37,7 @@ public class BlamContributionManager implements IXNavigateCommonItem { public synchronized static Map<String, AbstractBlam> getBlamMap() { if (blams == null) { - blams = new TreeMap<String, AbstractBlam>(); + blams = new TreeMap<>(); ExtensionDefinedObjects<AbstractBlam> definedObjects = new ExtensionDefinedObjects<AbstractBlam>("org.eclipse.osee.framework.ui.skynet.BlamOperation", "Operation", "className"); @@ -83,7 +83,7 @@ public class BlamContributionManager implements IXNavigateCommonItem { @Override public void createCommonSection(List<XNavigateItem> items, List<String> excludeSectionIds) { - Map<String, XNavigateItem> nameToParent = new HashMap<String, XNavigateItem>(); + Map<String, XNavigateItem> nameToParent = new HashMap<>(); XNavigateItem blamOperationItems = new XNavigateItem(null, "Blam Operations", FrameworkImage.BLAM); for (AbstractBlam blamOperation : getBlamOperations()) { 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 47f9a4d4e3d..ef7b688e06e 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 @@ -158,7 +158,7 @@ public class BlamEditor extends FormEditor implements IDirtiableEditor { } public static Collection<BlamEditor> getEditors() { - final List<BlamEditor> editors = new ArrayList<BlamEditor>(); + final List<BlamEditor> editors = new ArrayList<>(); Displays.pendInDisplayThread(new Runnable() { @Override public void run() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java index 87e01216fb9..fca45d7cc36 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/VariableMap.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; * @author Ryan D. Brooks */ public class VariableMap { - private final Map<String, Object> variableMap = new HashMap<String, Object>(); + private final Map<String, Object> variableMap = new HashMap<>(); public VariableMap() { // provides a constructor that does not throw OseeArgumentException @@ -105,7 +105,7 @@ public class VariableMap { @SuppressWarnings("unchecked") public <T> Collection<T> getCollection(Class<T> clazz, String parameterName) throws OseeArgumentException { - List<T> results = new ArrayList<T>(); + List<T> results = new ArrayList<>(); for (Object obj : getValue(Collection.class, parameterName)) { if (clazz.isInstance(obj)) { results.add((T) obj); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java index f5383e4338a..e9c0072f8ec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AdvancedKeywordSearchBlam.java @@ -59,7 +59,7 @@ public class AdvancedKeywordSearchBlam extends AbstractBlam { return; } Collection<AttributeType> attrTypes = variableMap.getAttributeTypes("Include Attribute Values in Results"); - HashCollection<Artifact, String> artifactToMatch = new HashCollection<Artifact, String>(100); + HashCollection<Artifact, String> artifactToMatch = new HashCollection<>(100); for (String keywords : keywordgroups.split(System.getProperty("line.separator"))) { for (Artifact art : ArtifactQuery.getArtifactListFromAttributeKeywords(branch, keywords, true, EXCLUDE_DELETED, false)) { @@ -71,14 +71,14 @@ public class AdvancedKeywordSearchBlam extends AbstractBlam { XResultData resultData = new XResultData(false); resultData.log(String.format("[%s] on branch [%s] (keyword groups listed below results)", getName(), branch)); resultData.addRaw(AHTML.beginMultiColumnTable(100, 1)); - List<String> headerList = new ArrayList<String>(); + List<String> headerList = new ArrayList<>(); headerList.addAll(Arrays.asList("Artifact", "Keywords matched", "Guid", "Link", "Artifact Type")); for (AttributeType attrType : attrTypes) { headerList.add(attrType.getName()); } resultData.addRaw(AHTML.addHeaderRowMultiColumnTable(headerList)); for (Entry<Artifact, Collection<String>> entry : artifactToMatch.entrySet()) { - List<String> valueList = new ArrayList<String>(); + List<String> valueList = new ArrayList<>(); valueList.addAll(Arrays.asList(entry.getKey().getName(), Collections.toString(";", entry.getValue()), entry.getKey().getGuid(), XResultDataUI.getHyperlink("open", entry.getKey()), entry.getKey().getArtifactTypeName())); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java index 1705d1c7aef..68b3eec6024 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/AttributeCheckOperation.java @@ -63,7 +63,7 @@ public class AttributeCheckOperation extends AbstractOperation { } private String findMostPopularAttributeValue(List<Artifact> allDescendants, IProgressMonitor monitor) throws OseeCoreException { - CountingMap<String> countingMap = new CountingMap<String>(); + CountingMap<String> countingMap = new CountingMap<>(); for (Artifact child : allDescendants) { if (!monitor.isCanceled()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java index 9e7dfe277d1..ca87f8722dd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java @@ -107,8 +107,8 @@ public class DatabaseHealth extends AbstractBlam { private final class MasterDbHealthOperation extends AbstractOperation { - private final Set<DatabaseHealthOperation> fixOperations = new HashSet<DatabaseHealthOperation>(); - private final Set<DatabaseHealthOperation> verifyOperations = new HashSet<DatabaseHealthOperation>(); + private final Set<DatabaseHealthOperation> fixOperations = new HashSet<>(); + private final Set<DatabaseHealthOperation> verifyOperations = new HashSet<>(); public MasterDbHealthOperation(String operationName) { super(operationName, Activator.PLUGIN_ID); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java index ff58030ca0c..7a2d68d2282 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java @@ -59,7 +59,7 @@ public class EmailGroupsBlam extends AbstractBlam { private XText subjectTextBox, replyToAddressTextBox; private XCheckBox isBodyHtmlCheckbox; private ExecutorService emailTheadPool; - private final Collection<Future<String>> futures = new ArrayList<Future<String>>(300); + private final Collection<Future<String>> futures = new ArrayList<>(300); private final XModifiedListener listener = new ModificationListerner(); @Override @@ -105,7 +105,7 @@ public class EmailGroupsBlam extends AbstractBlam { emailTheadPool = Executors.newFixedThreadPool(30); futures.clear(); - TreeSet<Artifact> users = new TreeSet<Artifact>(data.getUserToGroupMap().keySet()); + TreeSet<Artifact> users = new TreeSet<>(data.getUserToGroupMap().keySet()); for (Artifact user : users) { sendEmailTo(data, (User) user); } @@ -239,7 +239,7 @@ public class EmailGroupsBlam extends AbstractBlam { bodyTextBox.set(body); } else { XArtifactList groupList = (XArtifactList) xWidget; - Collection<Artifact> templates = new ArrayList<Artifact>(); + Collection<Artifact> templates = new ArrayList<>(); for (Object group : groupList.getSelected()) { templates.addAll(((Artifact) group).getChildren()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java index b585907ac1a..e35e3f39e1a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsData.java @@ -33,7 +33,7 @@ public class EmailGroupsData { private String subject; private String body; private boolean bodyIsHtml; - private final Set<Artifact> groups = new HashSet<Artifact>(5); + private final Set<Artifact> groups = new HashSet<>(5); public String getSubject() { return subject; @@ -64,7 +64,7 @@ public class EmailGroupsData { } public HashCollection<Artifact, Artifact> getUserToGroupMap() throws OseeCoreException { - HashCollection<Artifact, Artifact> userToGroupMap = new HashCollection<Artifact, Artifact>(); + HashCollection<Artifact, Artifact> userToGroupMap = new HashCollection<>(); for (Artifact group : groups) { for (Artifact user : group.getRelatedArtifacts(CoreRelationTypes.Users_User)) { Boolean isActive = user.getSoleAttributeValue(CoreAttributeTypes.Active); @@ -93,7 +93,7 @@ public class EmailGroupsData { if (groups.isEmpty()) { return new Result("No groups selected"); } - Set<Artifact> groupArts = new HashSet<Artifact>(); + Set<Artifact> groupArts = new HashSet<>(); groupArts.addAll(getUserToGroupMap().getValues()); if (groupArts.isEmpty()) { return new Result("No valid users in groups selected"); @@ -113,7 +113,7 @@ public class EmailGroupsData { html.append("</pre>"); } - Set<String> groupsAllowed = new HashSet<String>(); + Set<String> groupsAllowed = new HashSet<>(); for (Artifact group : groups) { groupsAllowed.add(group.getName()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java index e8cb1e9b645..b3113d272a6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExportArtifacts.java @@ -56,7 +56,7 @@ public class ExportArtifacts extends AbstractBlam { List<Artifact> artifacts; if (variableMap.getBoolean("Include Children")) { - artifacts = new ArrayList<Artifact>(400); + artifacts = new ArrayList<>(400); for (Artifact artifact : parentArtifacts) { artifacts.add(artifact); artifacts.addAll(artifact.getDescendants()); @@ -101,7 +101,7 @@ public class ExportArtifacts extends AbstractBlam { } private void mapAttributeTypeToColumn(List<Artifact> artifacts) throws OseeCoreException { - HashSet<IAttributeType> attributeTypes = new HashSet<IAttributeType>(); + HashSet<IAttributeType> attributeTypes = new HashSet<>(); for (Artifact artifact : artifacts) { for (IAttributeType attributeType : artifact.getAttributeTypes()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExtractReqPriority.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExtractReqPriority.java index e64ec4c457b..fe067663003 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExtractReqPriority.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ExtractReqPriority.java @@ -31,7 +31,7 @@ public class ExtractReqPriority implements RowProcessor { private final HashMap<String, String> reqPriorities; public ExtractReqPriority(String excelMlPath) throws UnsupportedEncodingException, FileNotFoundException, IOException, SAXException { - this.reqPriorities = new HashMap<String, String>(); + this.reqPriorities = new HashMap<>(); File file = new File(excelMlPath); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java index f99e9c40c99..746ce489db6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java @@ -40,7 +40,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; * @author Ryan D. Brooks */ public class PopulateUserGroupBlam extends AbstractBlam { - HashMap<String, User> emailToUser = new HashMap<String, User>(); + HashMap<String, User> emailToUser = new HashMap<>(); @Override public String getName() { @@ -57,7 +57,7 @@ public class PopulateUserGroupBlam extends AbstractBlam { emailToUser.put(user.getSoleAttributeValue(CoreAttributeTypes.Email, ""), user); } - List<User> users = new ArrayList<User>(); + List<User> users = new ArrayList<>(); int count = 0; for (String emailAddress : emailAddresses.split("[\n\r\t ,;]+")) { User user = emailToUser.get(emailAddress); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributesBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributesBlam.java index 6bcda1f1b4e..1303a89f783 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributesBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeAttributesBlam.java @@ -51,7 +51,7 @@ public class PurgeAttributesBlam extends AbstractBlam { List<Artifact> artifacts = variableMap.getArtifacts("artifacts"); - List<Attribute<?>> attributesToPurge = new ArrayList<Attribute<?>>(); + List<Attribute<?>> attributesToPurge = new ArrayList<>(); for (Artifact artifact : artifacts) { for (IAttributeType attributeType : purgeAttributeTypes) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceAttributeWithBaselineOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceAttributeWithBaselineOperation.java index c30a1f53c7b..2d52720070c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceAttributeWithBaselineOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ReplaceAttributeWithBaselineOperation.java @@ -46,7 +46,7 @@ public class ReplaceAttributeWithBaselineOperation extends AbstractOperation { protected void doWork(IProgressMonitor monitor) throws Exception { if (!monitor.isCanceled() && Conditions.notNull(changes) && !changes.isEmpty()) { monitor.beginTask("Reverting attribute", changes.size()); - Set<Artifact> artifactHistory = new HashSet<Artifact>(); + Set<Artifact> artifactHistory = new HashSet<>(); Change firstChange = changes.iterator().next(); SkynetTransaction transaction = 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 ec0ecde9930..b4b6a67897a 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,8 +63,8 @@ public class StringGuidsToArtifactListOperation extends AbstractOperation { String[] guids = this.rawGuidsData.split(splitRegex); monitor.beginTask(taskName, guids.length + costOfArtifactRetrieval); - List<String> validGuids = new ArrayList<String>(guids.length); - final Collection<Object> artifacts = new ArrayList<Object>(guids.length); //widget accepts Collection<Object> + List<String> validGuids = new ArrayList<>(guids.length); + final Collection<Object> artifacts = new ArrayList<>(guids.length); //widget accepts Collection<Object> for (int guidIndex = 0; !monitor.isCanceled() && guidIndex < guids.length; guidIndex++) { if (GUID.isValid(guids[guidIndex])) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java index aae67d85571..f6794429f05 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java @@ -39,7 +39,7 @@ import org.eclipse.ui.forms.widgets.Section; * @author Roberto E. Escobar */ public class BlamInputSection extends BaseBlamSection { - private final Collection<XWidgetRendererItem> dynamicInputLayouts = new ArrayList<XWidgetRendererItem>(); + private final Collection<XWidgetRendererItem> dynamicInputLayouts = new ArrayList<>(); public BlamInputSection(FormEditor editor, AbstractBlam abstractBlam, Composite parent, FormToolkit toolkit, int style) { super(editor, abstractBlam, parent, toolkit, style); @@ -104,7 +104,7 @@ public class BlamInputSection extends BaseBlamSection { } private List<XWidgetRendererItem> getDynamicXWidgetLayouts() throws Exception { - List<XWidgetRendererItem> itemsToReturn = new ArrayList<XWidgetRendererItem>(); + List<XWidgetRendererItem> itemsToReturn = new ArrayList<>(); itemsToReturn.addAll(getAbstractBlam().getLayoutDatas()); itemsToReturn.addAll(dynamicInputLayouts); return itemsToReturn; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java index 8495b9be79b..b5be4d97432 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiData.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.Change; public class ChangeUiData { - private final Collection<Change> changes = new ArrayList<Change>(); + private final Collection<Change> changes = new ArrayList<>(); private Artifact associatedArtifact; private boolean isLoaded; private boolean loadOnOpen; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java index 163114ca89d..5f8e11a6d28 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/UiSelectBetweenDeltasBranchProvider.java @@ -43,7 +43,7 @@ public final class UiSelectBetweenDeltasBranchProvider implements IBranchProvide if (txDelta.areOnTheSameBranch()) { selectedBranch[0] = txDelta.getStartTx().getFullBranch(); } else { - final Collection<Branch> selectable = new ArrayList<Branch>(); + final Collection<Branch> selectable = new ArrayList<>(); selectable.add(uiData.getTxDelta().getStartTx().getFullBranch()); selectable.add(uiData.getTxDelta().getEndTx().getFullBranch()); IStatus status = executeInUiThread(selectable, selectedBranch); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java index f156d1c010c..c24e6db7781 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportTable.java @@ -134,7 +134,7 @@ public class ChangeReportTable implements EditorSection.IWidget { @Override public Artifact[] getArtifacts() { IStructuredSelection selection = (IStructuredSelection) xChangeViewer.getSelection(); - ArrayList<Artifact> artifacts = new ArrayList<Artifact>(); + ArrayList<Artifact> artifacts = new ArrayList<>(); if (selection != null && !selection.isEmpty()) { for (Object object : selection.toArray()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java index 2ef74e0df9d..5817d4dd6c6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java @@ -44,8 +44,8 @@ public class CopyHandler extends AbstractHandler { if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) { IStructuredSelection selection = (IStructuredSelection) selectionProvider.getSelection(); - List<String> names = new LinkedList<String>(); - List<Artifact> artifacts = new LinkedList<Artifact>(); + List<String> names = new LinkedList<>(); + List<Artifact> artifacts = new LinkedList<>(); ArtifactClipboard clipboard = new ArtifactClipboard(view.getSite().getId()); Iterator<?> iterator = selection.iterator(); Object selectionObject = null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java index 6d9626a3e98..158a2d4d952 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/Handlers.java @@ -70,7 +70,7 @@ public class Handlers { * @return Returns a list of objects from the sturctruedSelection that are an instance of the Class */ public static <E> List<E> processSelectionObjects(Class<E> clazz, IStructuredSelection structuredSelection) { - List<E> objects = new LinkedList<E>(); + List<E> objects = new LinkedList<>(); Iterator<?> iterator = structuredSelection.iterator(); while (iterator.hasNext()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java index 7142a66de4a..6c3b4f46de3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ArchiveBranchCompoundContributionItem.java @@ -47,7 +47,7 @@ public class ArchiveBranchCompoundContributionItem extends CompoundContributionP @Override protected IContributionItem[] getContributionItems() { ISelectionProvider selectionProvider = getSelectionProvider(); - ArrayList<IContributionItem> contributionItems = new ArrayList<IContributionItem>(40); + ArrayList<IContributionItem> contributionItems = new ArrayList<>(40); if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java index 8b8eac6e858..adfe5b7eaf5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/GeneralBranchHandler.java @@ -57,7 +57,7 @@ public abstract class GeneralBranchHandler extends CommandHandler { List<Branch> selectedBranches = Handlers.getBranchesFromStructuredSelection(selection); Iterator<Branch> iterator = selectedBranches.iterator(); - List<Branch> hasChildren = new LinkedList<Branch>(); + List<Branch> hasChildren = new LinkedList<>(); while (iterator.hasNext()) { Branch branch = iterator.next(); Collection<Branch> childBranches = branch.getChildBranches(); @@ -71,7 +71,7 @@ public abstract class GeneralBranchHandler extends CommandHandler { StringBuilder children = new StringBuilder(); children.append(String.format("The following branches have children and cannot be %sd:\n", type.dialogType)); for (Branch b : hasChildren) { - List<Branch> branches = new LinkedList<Branch>(b.getChildBranches(true)); + List<Branch> branches = new LinkedList<>(b.getChildBranches(true)); children.append(String.format("Branch %s has children: %s\n", b.getName(), Strings.buildStatment(branches))); } MessageDialog.openError(Displays.getActiveShell(), type.dialogTitle, children.toString()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java index 4450afa76f5..53401211796 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java @@ -34,7 +34,7 @@ public final class PurgeBranchHandler extends GeneralBranchHandler { @Override public void performOperation(List<Branch> branches) { - List<Branch> hasChildren = new LinkedList<Branch>(); + List<Branch> hasChildren = new LinkedList<>(); for (Branch branch : branches) { try { if (branch.getAllChildBranches(false).isEmpty()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java index 33bb3cd63b3..f3e80c7247d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java @@ -44,7 +44,7 @@ public class ToggleFavoriteBranchContributionItem extends CompoundContributionPr @Override protected IContributionItem[] getContributionItems() { ISelectionProvider selectionProvider = getSelectionProvider(); - ArrayList<IContributionItem> contributionItems = new ArrayList<IContributionItem>(40); + ArrayList<IContributionItem> contributionItems = new ArrayList<>(40); if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java index 59b2a60fc09..8af3780b562 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java @@ -56,7 +56,7 @@ public class CommitIntoParentCompoundContributionItem extends CompoundContributi @Override protected IContributionItem[] getContributionItems() { ISelectionProvider selectionProvider = getSelectionProvider(); - ArrayList<IContributionItem> contributionItems = new ArrayList<IContributionItem>(40); + ArrayList<IContributionItem> contributionItems = new ArrayList<>(40); if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection(); @@ -88,7 +88,7 @@ public class CommitIntoParentCompoundContributionItem extends CompoundContributi private CommandContributionItem createCommand(Branch branch, String commandId) throws OseeCoreException { - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); parameters.put(BranchView.BRANCH_ID, Long.toString(branch.getUuid())); parameters.put(CommitBranchParameter.ARCHIVE_PARENT_BRANCH, "true"); CommandContributionItem contributionItem; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/GenericDiffHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/GenericDiffHandler.java index a36a7e2b58c..4f1a39eb82c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/GenericDiffHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/GenericDiffHandler.java @@ -42,8 +42,8 @@ public class GenericDiffHandler extends CommandHandler { public Object executeWithException(ExecutionEvent event, IStructuredSelection selection) throws OseeCoreException { List<Change> localChanges = Handlers.getArtifactChangesFromStructuredSelection(selection); if (!localChanges.isEmpty()) { - Collection<Change> changes = new ArrayList<Change>(localChanges.size()); - Set<Artifact> artifacts = new HashSet<Artifact>(); + Collection<Change> changes = new ArrayList<>(localChanges.size()); + Set<Artifact> artifacts = new HashSet<>(); for (Change change : localChanges) { Artifact artifact = change.getChangeArtifact(); if (!artifacts.contains(artifact)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java index 71e57527f46..6f6f4106998 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/SingleNativeDiffHandler.java @@ -34,7 +34,7 @@ public class SingleNativeDiffHandler extends CommandHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - changes = new ArrayList<Change>(Handlers.getArtifactChangesFromStructuredSelection(structuredSelection)); + changes = new ArrayList<>(Handlers.getArtifactChangesFromStructuredSelection(structuredSelection)); if (changes.size() == 1) { Artifact sampleArtifact = changes.iterator().next().getChangeArtifact(); return AccessControlManager.hasPermission(sampleArtifact, PermissionEnum.READ); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/ViewWordChangeReportHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/ViewWordChangeReportHandler.java index 6c383fb70fb..020dd5a0d33 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/ViewWordChangeReportHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/change/ViewWordChangeReportHandler.java @@ -39,8 +39,8 @@ public class ViewWordChangeReportHandler extends CommandHandler { public Object executeWithException(ExecutionEvent event, IStructuredSelection selection) throws OseeCoreException { List<Change> localChanges = Handlers.getArtifactChangesFromStructuredSelection(selection); if (!localChanges.isEmpty()) { - Collection<Change> changes = new ArrayList<Change>(localChanges.size()); - Set<Artifact> artifacts = new HashSet<Artifact>(); + Collection<Change> changes = new ArrayList<>(localChanges.size()); + Set<Artifact> artifacts = new HashSet<>(); for (Change change : localChanges) { Artifact artifact = change.getChangeArtifact(); if (!artifacts.contains(artifact)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java index 2c5a59799e9..5cb7ce2db3c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java @@ -58,7 +58,7 @@ public class MergeCompoundContributionItem extends CompoundContributionProvider @Override protected IContributionItem[] getContributionItems() { ISelectionProvider selectionProvider = getSelectionProvider(); - ArrayList<IContributionItem> contributionItems = new ArrayList<IContributionItem>(40); + ArrayList<IContributionItem> contributionItems = new ArrayList<>(40); if (selectionProvider != null && selectionProvider.getSelection() instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection) selectionProvider.getSelection(); @@ -95,7 +95,7 @@ public class MergeCompoundContributionItem extends CompoundContributionProvider } private CommandContributionItem createCommand(Long branchUuid, String commandId) throws OseeCoreException { - Map<String, String> parameters = new HashMap<String, String>(); + Map<String, String> parameters = new HashMap<>(); parameters.put(BranchView.BRANCH_ID, Long.toString(branchUuid)); CommandContributionItem contributionItem; String label = branchUuid == 0 ? "Can't Merge a Root Branch" : BranchManager.getBranch(branchUuid).getName(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java index c3194b89b93..302a946dcee 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AuthorIdCheck.java @@ -54,7 +54,7 @@ public class AuthorIdCheck extends DatabaseHealthOperation { rd.addRaw(AHTML.beginMultiColumnTable(100, 1)); rd.addRaw(AHTML.addHeaderRowMultiColumnTable(columnHeaders)); - Set<Integer> authors = new HashSet<Integer>(); + Set<Integer> authors = new HashSet<>(); JdbcStatement chStmt1 = ConnectionHandler.getStatement(); try { chStmt1.runPreparedQuery(GET_AUTHOR_IDS); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java index 6d9590aab58..f34e2b5d28e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java @@ -38,7 +38,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { @Override protected void doHealthCheck(IProgressMonitor monitor) throws Exception { monitor.setTaskName("Loading Branch information"); - List<BranchData> itemsToFix = new ArrayList<BranchData>(); + List<BranchData> itemsToFix = new ArrayList<>(); Collection<BranchData> branchDatas = getAllBranchData(); monitor.worked(calculateWork(0.25)); @@ -102,7 +102,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { setItemsToFix(itemsToFix.size()); if (isFixOperationEnabled() && getItemsToFixCount() > 0) { monitor.setTaskName("Fixing Branch State data"); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); for (BranchData branchData : itemsToFix) { data.add(new Object[] {branchData.getBranchState().getValue(), branchData.getId()}); } @@ -168,7 +168,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { } private Collection<BranchData> getAllBranchData() throws OseeCoreException { - Map<Long, BranchData> data = new HashMap<Long, BranchData>(); + Map<Long, BranchData> data = new HashMap<>(); JdbcStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery("select * from osee_branch"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java index a7c3ba9466f..ecdf9b7d22e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java @@ -26,8 +26,8 @@ public class DatabaseHealthOpsExtensionManager { private static final String CLASS_ATTRIBUTE_NAME = "className"; private static final String EXTENSION_POINT = Activator.PLUGIN_ID + "." + EXTENSION_ELEMENT; - private static final Map<String, DatabaseHealthOperation> fixOps = new TreeMap<String, DatabaseHealthOperation>(); - private static final Map<String, DatabaseHealthOperation> verifyOps = new TreeMap<String, DatabaseHealthOperation>(); + private static final Map<String, DatabaseHealthOperation> fixOps = new TreeMap<>(); + private static final Map<String, DatabaseHealthOperation> verifyOps = new TreeMap<>(); public static Set<String> getFixOperationNames() { return getOperationNames(true); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java index 5eee2d57158..9dc9a6aad2e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseIntegrityCheckApplication.java @@ -80,7 +80,7 @@ public class DatabaseIntegrityCheckApplication implements IApplication { operation.setFixOperationEnabled(false); Operations.executeWorkAndCheckStatus(operation); - List<String> summaryLinks = new ArrayList<String>(); + List<String> summaryLinks = new ArrayList<>(); int count = operation.getItemsToFixCount(); if (count > 0) { writeReport(operation, reportsDirectory, summaryLinks); @@ -143,7 +143,7 @@ public class DatabaseIntegrityCheckApplication implements IApplication { public SummaryTab(String title) { this.title = title; - this.tabs = new ArrayList<IResultsEditorTab>(); + this.tabs = new ArrayList<>(); mainTab = new ResultsEditorTableTab(title); mainTab.addColumn(new XViewerColumn("1", "Operation", 220, SWT.LEFT, true, SortDataType.String, false, "")); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java index f3c294d4439..2f447621532 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ItemsDeletedWithNoOtherModification.java @@ -107,7 +107,7 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation boolean verify = !isFixOperationEnabled(); if (verify || addressing == null) { - addressing = new HashSet<LocalValues>(); + addressing = new HashSet<>(); detectAndCollectErrors(monitor, TxChange.DELETED, ModificationType.DELETED); detectAndCollectErrors(monitor, TxChange.ARTIFACT_DELETED, ModificationType.ARTIFACT_DELETED); } else { @@ -126,7 +126,7 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation setItemsToFix(addressing != null ? addressing.size() : 0); if (isFixOperationEnabled() && getItemsToFixCount() > 0) { - List<Object[]> insertParameters = new LinkedList<Object[]>(); + List<Object[]> insertParameters = new LinkedList<>(); for (LocalValues value : addressing) { insertParameters.add(new Object[] {value.gammaId, value.transactionId}); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java index 01d8e6af629..722be607e88 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java @@ -136,8 +136,8 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { private boolean verify; //Containers for different cases - private final Collection<LocalRelationLink> unExpectedCases = new ArrayList<LocalRelationLink>(); - private final Collection<LocalRelationLink> newRelationOnDeletedArtifact = new ArrayList<LocalRelationLink>(); + private final Collection<LocalRelationLink> unExpectedCases = new ArrayList<>(); + private final Collection<LocalRelationLink> newRelationOnDeletedArtifact = new ArrayList<>(); private List<Object[]> insertArtifactDeleted; private List<Object[]> updatePreviousAddressing; @@ -177,8 +177,8 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { private void loadBrokenRelations() throws OseeCoreException { if (isLoadingBrokenRelationsNecessary()) { - deleteMap = new DoubleKeyHashMap<Integer, Integer, LocalRelationLink>(); - updateMap = new DoubleKeyHashMap<Integer, Integer, LocalRelationLink>(); + deleteMap = new DoubleKeyHashMap<>(); + updateMap = new DoubleKeyHashMap<>(); loadData("Loading Relations with nonexistent artifacts on the A side", NO_ADDRESSING_ARTIFACTS_A, true); loadData("Loading Relations with nonexistent artifacts on the B side", NO_ADDRESSING_ARTIFACTS_B, true); @@ -192,10 +192,10 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { private void classifyResults() { - insertArtifactDeleted = new LinkedList<Object[]>(); - updatePreviousAddressing = new LinkedList<Object[]>(); - updateCurrentAddressing = new LinkedList<Object[]>(); - commitOfNewRelationOnDeletedArtifactCases = new ArrayList<Object[]>(); + insertArtifactDeleted = new LinkedList<>(); + updatePreviousAddressing = new LinkedList<>(); + updateCurrentAddressing = new LinkedList<>(); + commitOfNewRelationOnDeletedArtifactCases = new ArrayList<>(); for (LocalRelationLink relLink : updateMap.allValues()) { if (relLink.relTransId > relLink.transIdForArtifactDeletion) { @@ -239,7 +239,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { } private void deleteInvalidRelationAddressing() throws OseeCoreException { - List<Object[]> rowsToDelete = new LinkedList<Object[]>(); + List<Object[]> rowsToDelete = new LinkedList<>(); for (LocalRelationLink relLink : deleteMap.allValues()) { rowsToDelete.add(new Object[] {relLink.gammaId, relLink.relTransId, relLink.branchUuid}); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java index cb18aedd860..dd416911a67 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java @@ -53,7 +53,7 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { @Override protected void doHealthCheck(IProgressMonitor monitor) throws Exception { - HashCollection<Branch, AttrData> attributesWithErrors = new HashCollection<Branch, AttrData>(); + HashCollection<Branch, AttrData> attributesWithErrors = new HashCollection<>(); List<Branch> branches = BranchManager.getBaselineBranches(); if (branches.isEmpty()) { throw new OseeStateException("no branches found"); @@ -87,7 +87,7 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { if (isFixOperationEnabled() && hadItemsToFix()) { for (Branch branch : attributesWithErrors.keySet()) { Collection<AttrData> attributeData = attributesWithErrors.getValues(branch); - List<String> artifactGuids = new ArrayList<String>(attributeData.size()); + List<String> artifactGuids = new ArrayList<>(attributeData.size()); for (AttrData attrData : attributeData) { artifactGuids.add(attrData.getArtifactGuid()); } @@ -124,7 +124,7 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { } private Set<AttrData> getRepeatEnumeratedAttrs(IProgressMonitor monitor, Branch branch) throws OseeCoreException { - Set<AttrData> attrData = new HashSet<AttrData>(); + Set<AttrData> attrData = new HashSet<>(); JdbcStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(FIND_REPEAT_ENUMS, branch.getUuid(), branch.getUuid()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java index e4252a67377..ed073434abe 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java @@ -217,7 +217,7 @@ public class ArtifactSelectionDialog extends SelectionStatusDialog { updateOKStatus(); } }); - List<Object> data = new ArrayList<Object>(1); + List<Object> data = new ArrayList<>(1); data.add(input); treeViewer.setInput(data); return treeViewer; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java index 989fbfc4f73..76720cc2275 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorer.java @@ -164,7 +164,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor private static final String ROOT_UUID = "artifact.explorer.last.root_uuid"; private static final String ROOT_BRANCH = "artifact.explorer.last.root_branch"; private static final ArtifactClipboard artifactClipboard = new ArtifactClipboard(VIEW_ID); - private static final LinkedList<Tree> trees = new LinkedList<Tree>(); + private static final LinkedList<Tree> trees = new LinkedList<>(); private TreeViewer treeViewer; private Action upAction; @@ -914,8 +914,8 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor public void widgetSelected(SelectionEvent e) { IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection(); Iterator<?> iterator = selection.iterator(); - Set<Artifact> lockArtifacts = new HashSet<Artifact>(); - Set<Artifact> unlockArtifacts = new HashSet<Artifact>(); + Set<Artifact> lockArtifacts = new HashSet<>(); + Set<Artifact> unlockArtifacts = new HashSet<>(); while (iterator.hasNext()) { try { Artifact object = (Artifact) iterator.next(); @@ -959,7 +959,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor private void performCopy() throws OseeCoreException { IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection(); - List<Artifact> artifactTransferData = new ArrayList<Artifact>(); + List<Artifact> artifactTransferData = new ArrayList<>(); Artifact artifact; if (selection != null && !selection.isEmpty()) { @@ -1121,7 +1121,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor private final HashCollection<Class<? extends Artifact>, MenuItem> menuItemMap; public NeedArtifactMenuListener() { - menuItemMap = new HashCollection<Class<? extends Artifact>, MenuItem>(); + menuItemMap = new HashCollection<>(); } public void add(MenuItem item) { @@ -1159,7 +1159,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor Collection<MenuItem> items; public NeedProjectMenuListener() { - items = new LinkedList<MenuItem>(); + items = new LinkedList<>(); } public void add(MenuItem item) { @@ -1317,7 +1317,7 @@ public class ArtifactExplorer extends GenericViewPart implements IArtifactExplor @Override public ArtifactStructuredSelection getSelection() { - final List<Artifact> selectedItems = new LinkedList<Artifact>(); + final List<Artifact> selectedItems = new LinkedList<>(); TreeViewerUtility.getPreorderSelection(treeViewer, selectedItems); return new ArtifactStructuredSelection(selectedItems); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java index a933667e460..1ad446b0f19 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerDragAndDrop.java @@ -120,7 +120,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { try { AccessPolicy policy = ServiceUtil.getAccessPolicy(); Artifact[] artifactsBeingDropped = toBeDropped.getArtifacts(); - List<Artifact> artsOnSameBranchAsDestination = new LinkedList<Artifact>(); + List<Artifact> artsOnSameBranchAsDestination = new LinkedList<>(); IOseeBranch destinationBranch = dropTarget.getBranch(); for (Artifact art : artifactsBeingDropped) { if (art.getBranch().equals(destinationBranch)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerEventManager.java index 6d12dcf329f..c7207c0acc0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerEventManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerEventManager.java @@ -42,7 +42,7 @@ import org.eclipse.ui.PlatformUI; */ public class ArtifactExplorerEventManager implements IArtifactEventListener { - List<IArtifactExplorerEventHandler> handlers = new CopyOnWriteArrayList<IArtifactExplorerEventHandler>(); + List<IArtifactExplorerEventHandler> handlers = new CopyOnWriteArrayList<>(); static ArtifactExplorerEventManager instance; public static void add(IArtifactExplorerEventHandler iWorldEventHandler) { @@ -86,7 +86,7 @@ public class ArtifactExplorerEventManager implements IArtifactEventListener { } // Do not process event if branch is null, deleted or purged. But, don't want to remove as handler cause another branch may be selected - final List<IArtifactExplorerEventHandler> handlersToProcess = new ArrayList<IArtifactExplorerEventHandler>(); + final List<IArtifactExplorerEventHandler> handlersToProcess = new ArrayList<>(); for (IArtifactExplorerEventHandler handler : handlers) { if (handler.isDisposed()) { handlers.remove(handler); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerLinkNode.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerLinkNode.java index 710c418f408..aa513f91b32 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerLinkNode.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/explorer/ArtifactExplorerLinkNode.java @@ -90,7 +90,7 @@ public class ArtifactExplorerLinkNode { } public List<Artifact> getOppositeArtifacts() { - List<Artifact> oppositeArtifacts = new ArrayList<Artifact>(); + List<Artifact> oppositeArtifacts = new ArrayList<>(); for (RelationLink link : artifact.getRelationsAll(DeletionFlag.EXCLUDE_DELETED)) { if (link.getRelationType().getName().equals(relationTypeName)) { if (link.getAArtifactId() == artifactId) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java index a8143b2903f..86d580ff6bf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java @@ -41,7 +41,7 @@ public class ArtifactExportPage extends WizardDataTransferPage { super("Main"); this.exportPath = OseeData.getPath().toFile(); - selectedArtifacts = new ArrayList<Artifact>(); + selectedArtifacts = new ArrayList<>(); if (selection != null) { Iterator<?> selectionIterator = selection.iterator(); while (selectionIterator.hasNext()) { 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 0b697cddb04..2fcaa457111 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 @@ -221,7 +221,7 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList } private class OpenOnShowListener implements MenuListener { - private final List<MenuItem> items = new LinkedList<MenuItem>(); + private final List<MenuItem> items = new LinkedList<>(); public void add(MenuItem item) { items.add(item); @@ -354,7 +354,7 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList } private ArrayList<GroupExplorerItem> getSelectedItems() { - ArrayList<GroupExplorerItem> arts = new ArrayList<GroupExplorerItem>(); + ArrayList<GroupExplorerItem> arts = new ArrayList<>(); Iterator<?> i = ((IStructuredSelection) treeViewer.getSelection()).iterator(); while (i.hasNext()) { Object obj = i.next(); @@ -366,7 +366,7 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList } private ArrayList<GroupExplorerItem> getSelectedUniversalGroupItems() { - ArrayList<GroupExplorerItem> arts = new ArrayList<GroupExplorerItem>(); + ArrayList<GroupExplorerItem> arts = new ArrayList<>(); Iterator<?> i = ((IStructuredSelection) treeViewer.getSelection()).iterator(); while (i.hasNext()) { Object obj = i.next(); @@ -421,7 +421,7 @@ public class GroupExplorer extends GenericViewPart implements IArtifactEventList Collection<MenuItem> items; public NeedProjectMenuListener() { - this.items = new LinkedList<MenuItem>(); + this.items = new LinkedList<>(); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java index 8065ebb75de..24c0cd5db56 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java @@ -88,7 +88,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { public Artifact[] getArtifacts() { IStructuredSelection selection = (IStructuredSelection) treeViewer.getSelection(); Iterator<?> i = selection.iterator(); - List<Artifact> artifacts = new ArrayList<Artifact>(); + List<Artifact> artifacts = new ArrayList<>(); while (i.hasNext()) { Object object = i.next(); if (object instanceof GroupExplorerItem) { @@ -196,7 +196,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { else { IStructuredSelection selectedItem = (IStructuredSelection) treeViewer.getSelection(); Iterator<?> iterator = selectedItem.iterator(); - final Set<Artifact> insertArts = new HashSet<Artifact>(); + final Set<Artifact> insertArts = new HashSet<>(); while (iterator.hasNext()) { Object obj = iterator.next(); if (obj instanceof GroupExplorerItem) { @@ -228,7 +228,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { if (((ArtifactData) event.data).getSource().equals(viewId)) { IStructuredSelection selectedItem = (IStructuredSelection) treeViewer.getSelection(); Iterator<?> iterator = selectedItem.iterator(); - Set<Artifact> insertArts = new HashSet<Artifact>(); + Set<Artifact> insertArts = new HashSet<>(); while (iterator.hasNext()) { Object obj = iterator.next(); if (obj instanceof GroupExplorerItem) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java index b204c28faae..1274393c945 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java @@ -109,11 +109,11 @@ public class GroupExplorerItem implements IAdaptable { public List<GroupExplorerItem> getGroupItems() { // Light loading; load the first time getChildren is called if (groupItems == null) { - groupItems = new ArrayList<GroupExplorerItem>(); + groupItems = new ArrayList<>(); // populateUpdateCategory(); } // populateUpdateCategory(); - // List<GroupExplorerItem> items = new ArrayList<GroupExplorerItem>(); + // List<GroupExplorerItem> items = new ArrayList<>(); // if (groupItems != null) items.addAll(groupItems); // return items; @@ -125,7 +125,7 @@ public class GroupExplorerItem implements IAdaptable { } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } - List<GroupExplorerItem> items = new ArrayList<GroupExplorerItem>(); + List<GroupExplorerItem> items = new ArrayList<>(); if (groupItems != null) { items.addAll(groupItems); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java index c2e76f01511..b0b103bcddd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java @@ -40,7 +40,7 @@ public class RemoveTrackChangesHandler implements IStatusHandler { final MutableBoolean isOkToRemove = new MutableBoolean(false); final String message = (String) source; - final Pair<MutableBoolean, Integer> answer = new Pair<MutableBoolean, Integer>(isOkToRemove, NO); + final Pair<MutableBoolean, Integer> answer = new Pair<>(isOkToRemove, NO); if (RenderingUtil.arePopupsAllowed()) { Displays.pendInDisplayThread(new Runnable() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactTreeViewerGlobalMenuHelper.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactTreeViewerGlobalMenuHelper.java index b42372a8974..7d60e77275c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactTreeViewerGlobalMenuHelper.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactTreeViewerGlobalMenuHelper.java @@ -32,7 +32,7 @@ public class ArtifactTreeViewerGlobalMenuHelper implements IGlobalMenuHelper { @Override public Collection<Artifact> getArtifacts() { - Set<Artifact> artifacts = new HashSet<Artifact>(); + Set<Artifact> artifacts = new HashSet<>(); if (treeViewer == null || treeViewer.getTree().isDisposed()) { return artifacts; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java index 40f82d80074..71dd6e0f4f9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java @@ -68,7 +68,7 @@ public class GlobalMenu { public static final Collection<GlobalMenuItem> ALL = Arrays.asList(GlobalMenuItem.values()); }; - private final ArrayList<GlobalMenuListener> listeners = new ArrayList<GlobalMenuListener>(); + private final ArrayList<GlobalMenuListener> listeners = new ArrayList<>(); public GlobalMenu(Menu parentMenu, IGlobalMenuHelper globalMenuHelper) { this.globalMenuHelper = globalMenuHelper; @@ -215,7 +215,7 @@ public class GlobalMenu { try { boolean recurseChildren = dialog.getToggleState(); - Collection<Artifact> toPurge = new LinkedHashSet<Artifact>(); + Collection<Artifact> toPurge = new LinkedHashSet<>(); for (Artifact artifactToPurge : artifactsToBePurged) { if (!artifactToPurge.isDeleted()) { toPurge.add(artifactToPurge); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java index a4f86dc9ca3..a7da4e35a3b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java @@ -78,10 +78,10 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { } editor = new EmbeddedEnumEditor(PROMPT); editor.createEditor(composite); - TreeSet<String> options = new TreeSet<String>(); + TreeSet<String> options = new TreeSet<>(); try { if (obj instanceof Artifact) { - options = new TreeSet<String>(AttributeTypeManager.getEnumerationValues(attributeType)); + options = new TreeSet<>(AttributeTypeManager.getEnumerationValues(attributeType)); } if (obj instanceof AttributeConflict) { options = ((AttributeConflict) obj).getEnumerationAttributeValues(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java index 94a8ccab475..64999ea3890 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java @@ -48,7 +48,7 @@ public abstract class AbstractItemSelectPanel<T> { private final IContentProvider contentProvider; protected AbstractItemSelectPanel(IBaseLabelProvider labelProvider, IContentProvider contentProvider) { - listeners = new HashSet<Listener>(); + listeners = new HashSet<>(); this.labelProvider = labelProvider; this.contentProvider = contentProvider; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactExtractorSelectPanel.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactExtractorSelectPanel.java index 4aed0ab0412..bfe24431f0a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactExtractorSelectPanel.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactExtractorSelectPanel.java @@ -39,7 +39,7 @@ public class ArtifactExtractorSelectPanel { private IArtifactExtractor selectedParser; public ArtifactExtractorSelectPanel(ArtifactExtractorContributionManager importContributionManager) { - this.listeners = new HashSet<Listener>(); + this.listeners = new HashSet<>(); this.importContributionManager = importContributionManager; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java index 24f86d868aa..a17bf03e3e3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java @@ -93,9 +93,9 @@ public class AuthenticationComposite extends Composite { public AuthenticationComposite(Composite parent, int style, boolean buildSubmitButton) { super(parent, style); this.buildSubmitButton = buildSubmitButton; - fieldMap = new HashMap<LabelEnum, Control>(); - dataMap = new HashMap<LabelEnum, String>(); - statusMap = new HashMap<LabelEnum, Label>(); + fieldMap = new HashMap<>(); + dataMap = new HashMap<>(); + statusMap = new HashMap<>(); createControl(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java index 0b543ac06ab..abac69f5aa9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java @@ -182,7 +182,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener { } } - List<String> branchUuidsToUse = new ArrayList<String>(); + List<String> branchUuidsToUse = new ArrayList<>(); for (String id : branchUuids) { try { Branch branch = BranchManager.getBranch(Long.parseLong(id)); @@ -232,7 +232,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener { public String[] getBranchIds() { String[] items = branchSelectCombo.getItems(); - List<String> toReturn = new ArrayList<String>(); + List<String> toReturn = new ArrayList<>(); for (String item : items) { Branch branch = (Branch) branchSelectCombo.getData(item); if (branch != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java index c5589abf9e9..1d64dff3575 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/SearchComposite.java @@ -58,7 +58,7 @@ public class SearchComposite extends Composite implements Listener { public SearchComposite(Composite parent, int style, String buttonText, String groupBoxText) { super(parent, style); - this.listeners = new HashSet<Listener>(); + this.listeners = new HashSet<>(); this.entryChanged = false; this.buttonText = buttonText; this.groupBoxText = groupBoxText; @@ -257,7 +257,7 @@ public class SearchComposite extends Composite implements Listener { if (querySearches == null || querySearches.isEmpty()) { if (Strings.isValid(lastSelected)) { - querySearches = new ArrayList<String>(); + querySearches = new ArrayList<>(); querySearches.add(lastSelected); } else { querySearches = Collections.emptyList(); @@ -294,7 +294,7 @@ public class SearchComposite extends Composite implements Listener { } public List<Control> getSearchChildren() { - List<Control> children = new ArrayList<Control>(); + List<Control> children = new ArrayList<>(); if (Widgets.isAccessible(this.searchArea) && Widgets.isAccessible(this.executeSearch) && Widgets.isAccessible(this.clear)) { children = Arrays.asList(this, searchArea, executeSearch, clear); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModelList.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModelList.java index 609648dc553..09fb3f3a2e0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModelList.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/ArtifactModelList.java @@ -17,16 +17,16 @@ import java.util.Set; public class ArtifactModelList { - private ArrayList<ArtifactModel> artifacts = new ArrayList<ArtifactModel>(); - private Set<IArtifactListViewer> changeListeners = new HashSet<IArtifactListViewer>(); + private ArrayList<ArtifactModel> artifacts = new ArrayList<>(); + private Set<IArtifactListViewer> changeListeners = new HashSet<>(); /** * Constructor */ public ArtifactModelList() { super(); - artifacts = new ArrayList<ArtifactModel>(); - changeListeners = new HashSet<IArtifactListViewer>(); + artifacts = new ArrayList<>(); + changeListeners = new HashSet<>(); } /** diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java index 65c39ce75b8..ef5926a5aee 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java @@ -78,14 +78,14 @@ public class RelationExplorerWindow { public static final int REASON_NUM = 1; public RelationExplorerWindow(StructuredViewer viewer, RelationTypeSideSorter group, boolean persistOnOk) { - this.validArtifacts = new ArrayList<Artifact>(); - this.invalidArtifacts = new ArrayList<Artifact>(); + this.validArtifacts = new ArrayList<>(); + this.invalidArtifacts = new ArrayList<>(); - this.urls = new ArrayList<String>(); - this.names = new ArrayList<String>(); + this.urls = new ArrayList<>(); + this.names = new ArrayList<>(); - this.invalidName = new ArrayList<String>(); - this.invalidReason = new ArrayList<String>(); + this.invalidName = new ArrayList<>(); + this.invalidReason = new ArrayList<>(); this.viewer = viewer; this.relationGroup = group; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java index 72853142a5e..f4b4261f5a1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java @@ -60,7 +60,7 @@ public class RelationTableViewer { public RelationTableViewer(Table validTable, Table invalidTable, IOseeBranch branch) { try { - fullDescriptorList = new ArrayList<ArtifactType>(ArtifactTypeManager.getValidArtifactTypes(branch)); + fullDescriptorList = new ArrayList<>(ArtifactTypeManager.getValidArtifactTypes(branch)); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java index 942d662a56b..6d1dd12a729 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java @@ -38,7 +38,7 @@ final class ArtifactFileMonitor implements IFileWatcherListener { private final ResourceAttributes readonlyfileAttributes; private final FileWatcher watcher; private final boolean firstTime; - private final Map<File, IOperation> fileMap = new ConcurrentHashMap<File, IOperation>(128); + private final Map<File, IOperation> fileMap = new ConcurrentHashMap<>(128); public ArtifactFileMonitor() { firstTime = true; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java index 6d04dba7d01..ff2397cc8a1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuidToWordML.java @@ -31,7 +31,7 @@ public class ArtifactGuidToWordML { } public List<String> resolveAsOseeLinks(IOseeBranch branch, List<String> artifactGuids) throws OseeCoreException { - List<String> mlLinks = new ArrayList<String>(); + List<String> mlLinks = new ArrayList<>(); for (String guid : artifactGuids) { Long uuidFromGuid = ArtifactQuery.getUuidFromGuid(guid, branch); Artifact artifact = ArtifactQuery.checkArtifactFromId(uuidFromGuid, branch); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java index e4f55b2088c..a0bd29956ca 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactGuis.java @@ -42,7 +42,7 @@ public final class ArtifactGuis { Conditions.checkExpressionFailOnTrue(artifacts.isEmpty(), "Must have at least one artifact for checking"); StringBuilder message = new StringBuilder(); - Set<String> otherBranches = new HashSet<String>(); + Set<String> otherBranches = new HashSet<>(); int modifiedCount = artifactsModified(artifacts, otherBranches); if (modifiedCount > 0) { message.append(String.format(EDIT_MESSAGE, modifiedCount, artifacts.size())); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java index 7283d184f01..b266d23e502 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java @@ -191,7 +191,7 @@ public class DefaultArtifactRenderer implements IRenderer { @Override public List<IAttributeType> getOrderedAttributeTypes(Artifact artifact, Collection<IAttributeType> attributeTypes) { - ArrayList<IAttributeType> orderedAttributeTypes = new ArrayList<IAttributeType>(attributeTypes.size()); + ArrayList<IAttributeType> orderedAttributeTypes = new ArrayList<>(attributeTypes.size()); IAttributeType contentType = null; for (IAttributeType attributeType : attributeTypes) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java index a0bf476e05a..7daad4b7566 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/HTMLRenderer.java @@ -134,7 +134,7 @@ public class HTMLRenderer extends FileSystemRenderer { } private void renderHtmlArtifact(StringBuilder output, IOseeBranch branch, Artifact artifact) throws Exception { - Map<String, String> fileNameReplace = new HashMap<String, String>(); + Map<String, String> fileNameReplace = new HashMap<>(); String htmlContent = ""; String blankLine = "<br /><br />"; String underline = "<span style=\"text-decoration: underline;\">"; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java index ba617339396..e00614ff12e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/JavaRenderer.java @@ -84,7 +84,7 @@ public class JavaRenderer extends FileSystemRenderer { @Override public void open(final List<Artifact> artifacts, PresentationType presentationType) { - final List<Artifact> notMatched = new LinkedList<Artifact>(); + final List<Artifact> notMatched = new LinkedList<>(); final StringBuffer findErrorMessage = new StringBuffer(); FindInWorkspaceCollector collector = new FindInWorkspaceCollector() { @@ -159,8 +159,8 @@ public class JavaRenderer extends FileSystemRenderer { @Override public InputStream getRenderInputStream(PresentationType presentationType, List<Artifact> artifacts) throws OseeCoreException { - final List<IResource> matches = new LinkedList<IResource>(); - final List<Artifact> notMatched = new LinkedList<Artifact>(); + final List<IResource> matches = new LinkedList<>(); + final List<Artifact> notMatched = new LinkedList<>(); FindInWorkspaceCollector collector = new FindInWorkspaceCollector() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java index 9d02c9994ee..d633d7b593c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java @@ -44,7 +44,7 @@ import org.eclipse.osee.framework.ui.skynet.render.word.Producer; * @author Ryan D. Brooks */ public final class RendererManager { - private static final List<IRenderer> renderers = new ArrayList<IRenderer>(20); + private static final List<IRenderer> renderers = new ArrayList<>(20); private static boolean firstTimeThrough = true; private RendererManager() { @@ -137,7 +137,7 @@ public final class RendererManager { } private static List<IRenderer> getApplicableRenderers(PresentationType presentationType, Artifact artifact) throws OseeCoreException { - ArrayList<IRenderer> applicableRenderers = new ArrayList<IRenderer>(); + ArrayList<IRenderer> applicableRenderers = new ArrayList<>(); IRenderer bestRenderer = getBestRenderer(presentationType, artifact); int rendererMinimumRanking = bestRenderer.minimumRanking(); int minimumRank = Math.max(rendererMinimumRanking, IRenderer.BASE_MATCH); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java index ac5388b96b2..3fc4391ddca 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/TisRenderer.java @@ -76,7 +76,7 @@ public class TisRenderer extends WordTemplateRenderer { template = getTemplate(firstArtifact, presentationType); } - List<ITemplateAttributeHandler> handlers = new ArrayList<ITemplateAttributeHandler>(); + List<ITemplateAttributeHandler> handlers = new ArrayList<>(); handlers.add(new SRSSpecialPublishingAttributeHandler()); handlers.add(new TISAttributeHandler()); handlers.add(new WordAttributeTypeAttributeHandler()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java index a4b46e9fa60..7d7f1e30247 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java @@ -102,7 +102,7 @@ public class UpdateArtifactOperation extends AbstractOperation { } private Collection<AttributeChange> getAttributeChanges(Artifact artifact, WordArtifactChange change) { - List<AttributeChange> attributeChanges = new LinkedList<AttributeChange>(); + List<AttributeChange> attributeChanges = new LinkedList<>(); for (long attrTypeId : change.getChangedAttrTypes()) { AttributeType type = AttributeTypeManager.getTypeByGuid(attrTypeId); Attribute<?> attribute = artifact.getSoleAttribute(type); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java index 6de742b1077..dfc1612753f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeWordRenderer.java @@ -105,7 +105,7 @@ public class WholeWordRenderer extends WordRenderer { artifact.getName(), artifact.getBranch().getName()); } - Set<String> unknownGuids = new HashSet<String>(); + Set<String> unknownGuids = new HashSet<>(); LinkType linkType = LinkType.OSEE_SERVER_LINK; content = WordMlLinkHandler.link(linkType, artifact, content, unknownGuids); WordUiUtil.displayUnknownGuids(artifact, unknownGuids); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java index c17f83d8bbe..f961d3f6d64 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java @@ -79,7 +79,7 @@ public class WordImageChecker { private static List<WordmlPicture> createPictureList(String wordml, Attribute<String> attribute) { int startIndex = 0; - List<WordmlPicture> pictures = new LinkedList<WordmlPicture>(); + List<WordmlPicture> pictures = new LinkedList<>(); while (wordml.indexOf("<w:pict>", startIndex) > 0) { int currentStartIndex = wordml.indexOf("<w:pict>", startIndex); int currentEndIndex = wordml.indexOf("</w:pict", currentStartIndex); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java index df459e81ee1..d858f6023de 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java @@ -158,7 +158,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende data = WordUtil.reassignBinDataID(data); LinkType linkType = (LinkType) getOption("linkType"); - Set<String> unknownGuids = new HashSet<String>(); + Set<String> unknownGuids = new HashSet<>(); data = WordMlLinkHandler.link(linkType, artifact, data, unknownGuids); WordUiUtil.displayUnknownGuids(artifact, unknownGuids); @@ -188,7 +188,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende @Override public InputStream getRenderInputStream(PresentationType presentationType, List<Artifact> artifacts) throws OseeCoreException { - final List<Artifact> notMultiEditableArtifacts = new LinkedList<Artifact>(); + final List<Artifact> notMultiEditableArtifacts = new LinkedList<>(); String template; if (artifacts.isEmpty()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/MergeEditArtifactElementExtractor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/MergeEditArtifactElementExtractor.java index c2cb60c68ac..a06dc66315e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/MergeEditArtifactElementExtractor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/MergeEditArtifactElementExtractor.java @@ -39,8 +39,8 @@ public class MergeEditArtifactElementExtractor implements IElementExtractor { @Override public Collection<WordExtractorData> extractElements() throws DOMException, OseeCoreException { - final Collection<WordExtractorData> artifactElements = new LinkedList<WordExtractorData>(); - Collection<Element> sectList = new LinkedList<Element>(); + final Collection<WordExtractorData> artifactElements = new LinkedList<>(); + Collection<Element> sectList = new LinkedList<>(); Element rootElement = document.getDocumentElement(); oleDataElement = null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordImageArtifactElementExtractor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordImageArtifactElementExtractor.java index dc7365883db..a1b8ba1a5c2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordImageArtifactElementExtractor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/artifactElement/WordImageArtifactElementExtractor.java @@ -62,7 +62,7 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { this.document = document; this.numberOfEndTags = 0; this.numberOfStartTags = 0; - this.pictureMap = new HashMap<String, Element>(); + this.pictureMap = new HashMap<>(); WordImageArtifactElementExtractor.START_IMAGE_CHECKSUM = -1; WordImageArtifactElementExtractor.END_IMAGE_CHECKSUM = -1; @@ -88,7 +88,7 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { } public List<WordExtractorData> extractElements(OseeLinkBuilder linkBuilder) throws DOMException, OseeCoreException { - final List<WordExtractorData> artifactElements = new LinkedList<WordExtractorData>(); + final List<WordExtractorData> artifactElements = new LinkedList<>(); Element rootElement = document.getDocumentElement(); resetClassFields(); @@ -168,7 +168,7 @@ public class WordImageArtifactElementExtractor implements IElementExtractor { } private Node cloneWithoutArtifactEditImage(Element element, Side keepSide, OseeLinkBuilder linkBuilder) { - Collection<Node> removals = new LinkedList<Node>(); + Collection<Node> removals = new LinkedList<>(); Element clonedElement = (Element) element.cloneNode(true); boolean beforeEditTag = true; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java index c62955edad4..68c38333fe7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/AbstractWordCompare.java @@ -45,7 +45,7 @@ import org.eclipse.osee.framework.ui.skynet.util.WordUiUtil; public abstract class AbstractWordCompare implements IComparator { private final FileSystemRenderer renderer; private final ArtifactDeltaToFileConverter converter; - private final List<IAttributeType> wordAttributeType = new ArrayList<IAttributeType>(); + private final List<IAttributeType> wordAttributeType = new ArrayList<>(); private static final Pattern authorPattern = Pattern.compile("aml:author=\".*?\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL | Pattern.MULTILINE); @@ -138,7 +138,7 @@ public abstract class AbstractWordCompare implements IComparator { compareFiles = converter.convertToFile(presentationType, artifactDelta); } else { // The artifactDelta is a 3 Way Merge - List<IFile> outputFiles = new ArrayList<IFile>(); + List<IFile> outputFiles = new ArrayList<>(); converter.convertToFileForMerge(outputFiles, artifactDelta.getBaseArtifact(), artifactDelta.getStartArtifact()); converter.convertToFileForMerge(outputFiles, artifactDelta.getBaseArtifact(), artifactDelta.getEndArtifact()); // this is where we are getting the exception that the length of outputFiles is 1 @@ -155,7 +155,7 @@ public abstract class AbstractWordCompare implements IComparator { throw new OseeCoreException(ex, "Empty file for comparison could not be created, [%s]", outputFileName); } } - compareFiles = new Pair<IFile, IFile>(outputFiles.get(0), outputFiles.get(1)); + compareFiles = new Pair<>(outputFiles.get(0), outputFiles.get(1)); data.addMerge(outputFiles.get(0).getLocation().toOSString()); } WordImageChecker.restoreOriginalValue(baseContent, originalValue); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/CompareData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/CompareData.java index aac4b2a45b5..38aa4b31bb0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/CompareData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/CompareData.java @@ -19,8 +19,8 @@ import java.util.Set; public class CompareData { - private final Map<String, String> dataToCompare = new LinkedHashMap<String, String>(); - private final List<String> mergeList = new ArrayList<String>(); + private final Map<String, String> dataToCompare = new LinkedHashMap<>(); + private final List<String> mergeList = new ArrayList<>(); private final String outputPath; private final String generatorScriptPath; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java index 3961d49a303..51f4ebd8401 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java @@ -63,7 +63,7 @@ public class WordMLProducer extends Producer { outlineLevel = 0; flattenedLevelCount = 0; - alphabetMap = new HashMap<String, Integer>(); + alphabetMap = new HashMap<>(); alphabetMap.put("A.0", 1); alphabetMap.put("B.0", 2); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java index 44c3d38fd87..b4917758ed7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java @@ -93,7 +93,7 @@ public final class WordTemplateFileDiffer { boolean recurseOnLoad = renderer.getBooleanOption(WordTemplateProcessor.RECURSE_ON_LOAD); Collection<Artifact> toProcess = (recurseChildren || recurseOnLoad) ? getAllArtifacts(endArtifacts) : endArtifacts; - List<Change> changes = new LinkedList<Change>(); + List<Change> changes = new LinkedList<>(); ChangeDataLoader changeLoader = new ChangeDataLoader(changes, txDelta); IProgressMonitor monitor = (IProgressMonitor) renderer.getOption("Progress Monitor"); if (monitor == null) { @@ -110,7 +110,7 @@ public final class WordTemplateFileDiffer { } private Collection<Artifact> getAllArtifacts(List<Artifact> endArtifacts) throws OseeCoreException { - Set<Artifact> toReturn = new LinkedHashSet<Artifact>(); + Set<Artifact> toReturn = new LinkedHashSet<>(); for (Artifact art : endArtifacts) { toReturn.add(art); toReturn.addAll(art.getDescendants()); @@ -120,9 +120,9 @@ public final class WordTemplateFileDiffer { private void diff(List<Change> changes, Collection<Artifact> endArtifacts, String diffPrefix, TransactionDelta txDelta) throws OseeCoreException { - Collection<ArtifactDelta> artifactDeltas = new ArrayList<ArtifactDelta>(); - Set<Integer> addedIds = new HashSet<Integer>(); - Set<Integer> changeIds = new HashSet<Integer>(changes.size()); + Collection<ArtifactDelta> artifactDeltas = new ArrayList<>(); + Set<Integer> addedIds = new HashSet<>(); + Set<Integer> changeIds = new HashSet<>(changes.size()); for (Change change : changes) { changeIds.add(change.getArtId()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java index 39e8bad495f..754db5ba6b3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java @@ -117,10 +117,10 @@ public class WordTemplateProcessor { private boolean recurseChildren; private String outlineNumber; private IAttributeType headingAttributeType; - private final List<AttributeElement> attributeElements = new LinkedList<AttributeElement>(); - final List<Artifact> nonTemplateArtifacts = new LinkedList<Artifact>(); - private final Set<String> ignoreAttributeExtensions = new HashSet<String>(); - private final Set<Artifact> processedArtifacts = new HashSet<Artifact>(); + private final List<AttributeElement> attributeElements = new LinkedList<>(); + final List<Artifact> nonTemplateArtifacts = new LinkedList<>(); + private final Set<String> ignoreAttributeExtensions = new HashSet<>(); + private final Set<Artifact> processedArtifacts = new HashSet<>(); private final WordTemplateRenderer renderer; private boolean isDiff; private boolean excludeFolders; @@ -468,7 +468,7 @@ public class WordTemplateProcessor { private void populateRequest(List<Artifact> artifacts, DataRightInput request) { if (request.isEmpty()) { - List<Artifact> allArtifacts = new ArrayList<Artifact>(); + List<Artifact> allArtifacts = new ArrayList<>(); if (recurseChildren) { for (Artifact art : artifacts) { allArtifacts.add(art); @@ -603,7 +603,7 @@ public class WordTemplateProcessor { @Override public void run() { - ArrayList<Artifact> nonTempArtifacts = new ArrayList<Artifact>(artifacts.size()); + ArrayList<Artifact> nonTempArtifacts = new ArrayList<>(artifacts.size()); nonTempArtifacts.addAll(artifacts); WordUiUtil.displayUnhandledArtifacts(artifacts, warningString); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java index a0f004c18a8..ee1caf305b6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/BasicTemplateAttributeHandler.java @@ -31,7 +31,7 @@ public final class BasicTemplateAttributeHandler implements ITemplateAttributeHa private final Set<String> ignoreAttributeExtensions; public BasicTemplateAttributeHandler() { - this.ignoreAttributeExtensions = new HashSet<String>(); + this.ignoreAttributeExtensions = new HashSet<>(); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java index 496d9b4c5dd..38c9215d4a9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/template/WordTemplateManager.java @@ -70,7 +70,7 @@ public class WordTemplateManager { private String template; private final String artifactSetName; - private final List<ITemplateTask> tasks = new ArrayList<ITemplateTask>(); + private final List<ITemplateTask> tasks = new ArrayList<>(); private final List<ITemplateAttributeHandler> attributeHandlers; public WordTemplateManager(String template, List<ITemplateAttributeHandler> attributeHandlers) { @@ -149,7 +149,7 @@ public class WordTemplateManager { tasks.add(new AddTemplateText(last, start, template)); int end = headElementsMatcher.end(); last = end; - List<ITemplateTask> innerTasks = new ArrayList<ITemplateTask>(); + List<ITemplateTask> innerTasks = new ArrayList<>(); String artifactSection = headElementsMatcher.group(4); String elementType = headElementsMatcher.group(3); @@ -209,7 +209,7 @@ public class WordTemplateManager { } private List<Artifact> recurseArtifactChildren(List<Artifact> artifacts) throws OseeCoreException { - List<Artifact> arts = new ArrayList<Artifact>(); + List<Artifact> arts = new ArrayList<>(); for (Artifact art : artifacts) { recursiveChildResolver(art, arts); } @@ -227,7 +227,7 @@ public class WordTemplateManager { * This method expands wildcard(*) attribute names into all of the attribute types of a particular artifact. */ private List<ITemplateTask> preProcessTemplateTasks(List<ITemplateTask> tasks, Artifact artifact) throws OseeCoreException { - List<ITemplateTask> newTasks = new ArrayList<ITemplateTask>(); + List<ITemplateTask> newTasks = new ArrayList<>(); for (ITemplateTask task : tasks) { if (task instanceof TemplateAttribute && ((TemplateAttribute) task).isTypeNameWildcard()) { TemplateAttribute attributeTask = (TemplateAttribute) task; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/MultiPageResultsProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/MultiPageResultsProvider.java index b4c66e9329b..d418628d5df 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/MultiPageResultsProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/MultiPageResultsProvider.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOperation; */ public class MultiPageResultsProvider implements IResultsEditorProvider { private final DatabaseHealthOperation healthOperation; - private final List<IResultsEditorTab> resultsTabs = new ArrayList<IResultsEditorTab>(4); + private final List<IResultsEditorTab> resultsTabs = new ArrayList<>(4); public MultiPageResultsProvider(DatabaseHealthOperation healthOperation) { super(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java index 5053df28d5a..f490e192b1d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java @@ -91,7 +91,7 @@ public class ResultsEditor extends AbstractArtifactEditor { } private List<Object> rowsToData(ISelection selection) { - List<Object> datas = new LinkedList<Object>(); + List<Object> datas = new LinkedList<>(); if (selection instanceof IStructuredSelection) { IStructuredSelection selected = (IStructuredSelection) selection; Iterator<?> iterator = selected.iterator(); @@ -230,7 +230,7 @@ public class ResultsEditor extends AbstractArtifactEditor { @Override public List<IResultsEditorTab> getResultsEditorTabs() { - List<IResultsEditorTab> tabs = new ArrayList<IResultsEditorTab>(); + List<IResultsEditorTab> tabs = new ArrayList<>(); tabs.add(new ResultsEditorHtmlTab(title, tabName, html)); return tabs; } @@ -247,7 +247,7 @@ public class ResultsEditor extends AbstractArtifactEditor { @Override public List<IResultsEditorTab> getResultsEditorTabs() { - List<IResultsEditorTab> tabs = new ArrayList<IResultsEditorTab>(); + List<IResultsEditorTab> tabs = new ArrayList<>(); tabs.add(new ResultsEditorHtmlTab(XResultDataUI.getReport(data, name))); return tabs; } @@ -265,7 +265,7 @@ public class ResultsEditor extends AbstractArtifactEditor { @Override public List<IResultsEditorTab> getResultsEditorTabs() { - List<IResultsEditorTab> tabs = new ArrayList<IResultsEditorTab>(); + List<IResultsEditorTab> tabs = new ArrayList<>(); tabs.add(new ResultsEditorHtmlTab(xResultPage)); return tabs; } @@ -302,7 +302,7 @@ public class ResultsEditor extends AbstractArtifactEditor { } public static Collection<ResultsEditor> getEditors() { - final List<ResultsEditor> editors = new ArrayList<ResultsEditor>(); + final List<ResultsEditor> editors = new ArrayList<>(); Displays.pendInDisplayThread(new Runnable() { @Override public void run() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorConverter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorConverter.java index ddc5731990d..23eb178c9f6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorConverter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorConverter.java @@ -36,7 +36,7 @@ public class ResultsEditorConverter { private final List<IEditorTabConverter> converters; public ResultsEditorConverter() { - converters = new ArrayList<IEditorTabConverter>(); + converters = new ArrayList<>(); converters.add(new HTMLEditorTabConverter()); converters.add(new ExcelEditorTabConverter()); converters.add(new MultiTypeEditorTabConverter("PDF")); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/ResultsEditorExample.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/ResultsEditorExample.java index 4dbec92514d..c517dbd80ae 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/ResultsEditorExample.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/ResultsEditorExample.java @@ -99,7 +99,7 @@ public class ResultsEditorExample extends XNavigateItemAction { @Override public List<IResultsEditorTab> getResultsEditorTabs() { if (tabs == null) { - tabs = new LinkedList<IResultsEditorTab>(); + tabs = new LinkedList<>(); tabs.add(createChartTab()); tabs.add(createDataTab()); tabs.add(createHtmlTab()); @@ -115,7 +115,7 @@ public class ResultsEditorExample extends XNavigateItemAction { } private IResultsEditorTab createDataTab() { - List<IResultsXViewerRow> rows = new ArrayList<IResultsXViewerRow>(); + List<IResultsXViewerRow> rows = new ArrayList<>(); for (int x = 0; x < chartDateStrs.size(); x++) { rows.add(new ResultsXViewerRow(new String[] { chartDateStrs.get(x), @@ -143,7 +143,7 @@ public class ResultsEditorExample extends XNavigateItemAction { "Requirement Artifact"), new XViewerColumn("GUID", "GUID", 200, SWT.LEFT, true, SortDataType.String, false, "TestScript Name")); - List<IResultsXViewerRow> artRows = new ArrayList<IResultsXViewerRow>(); + List<IResultsXViewerRow> artRows = new ArrayList<>(); List<Artifact> userArts = null; try { userArts = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.User, CoreBranches.COMMON); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XViewerExample.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XViewerExample.java index af4792f889b..e3dc9ad86d7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XViewerExample.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/example/XViewerExample.java @@ -54,8 +54,8 @@ public final class XViewerExample extends XNavigateItemAction { @Override public List<IResultsEditorTab> getResultsEditorTabs() { - List<IResultsXViewerRow> rows = new ArrayList<IResultsXViewerRow>(); - List<IResultsXViewerRow> bigRows = new ArrayList<IResultsXViewerRow>(); + List<IResultsXViewerRow> rows = new ArrayList<>(); + List<IResultsXViewerRow> bigRows = new ArrayList<>(); for (int x = 0; x < 50000; x++) { if (x < 15000) { rows.add(new ResultsXViewerRow(new String[] {"Date " + x, "hello", "world"})); @@ -67,7 +67,7 @@ public final class XViewerExample extends XNavigateItemAction { SortDataType.String, false, ""), new XViewerColumn(Columns.String1.name(), Columns.String1.name(), 80, SWT.LEFT, true, SortDataType.Integer, false, ""), new XViewerColumn(Columns.String2.name(), Columns.String2.name(), 80, SWT.LEFT, true, SortDataType.Integer, false, "")); - List<IResultsEditorTab> tabs = new ArrayList<IResultsEditorTab>(); + List<IResultsEditorTab> tabs = new ArrayList<>(); tabs.add(new ResultsEditorTableTab("15,000 entries", columns, rows)); tabs.add(new ResultsEditorTableTab("50,000 entries", columns, bigRows)); return tabs; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java index d00e8e3be8b..d0d2cf39c22 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java @@ -115,7 +115,7 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi item.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent event) { - Set<Manipulations> manipulations = new HashSet<Manipulations>(); + Set<Manipulations> manipulations = new HashSet<>(); manipulations.add(Manipulations.NONE); Dialogs.emailDialog(resultsEditor.getTitle(), xResultPage.getManipulatedHtml(manipulations)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java index d9bfcae21d4..66e31f87650 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java @@ -56,7 +56,7 @@ public class XResultPage { private String html; private final String id; // Used to add and remove to menu item private String manipulatedHtml; - private Set<Manipulations> manipulations = new HashSet<Manipulations>(); + private Set<Manipulations> manipulations = new HashSet<>(); private int numWarnings = Integer.MAX_VALUE; private int numErrors = Integer.MAX_VALUE; @@ -171,7 +171,7 @@ public class XResultPage { // Match getText so it doesn't mess up replace // Retireve all ATS=WPN_PAGE:HSRID matches Matcher m = ATS_NAME_AND_GUID_REGEX.matcher(str); - Set<String> cmdNameGuids = new HashSet<String>(); + Set<String> cmdNameGuids = new HashSet<>(); while (m.find()) { cmdNameGuids.add(m.group()); } @@ -196,7 +196,7 @@ public class XResultPage { } // Retrieve all ATS=GUID matches and replace with hyperlinking m = ATS_GUID_REGEX.matcher(str); - Set<String> cmdGuids = new HashSet<String>(); + Set<String> cmdGuids = new HashSet<>(); while (m.find()) { cmdGuids.add(m.group()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java index 2c54b1dca2f..35bab90c06f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java @@ -129,7 +129,7 @@ public class XResultsComposite extends Composite { AWorkbench.popup("ERROR", "Nothing to email"); return; } - Set<Manipulations> manipulations = new HashSet<Manipulations>(); + Set<Manipulations> manipulations = new HashSet<>(); manipulations.add(Manipulations.ALL); manipulations.add(Manipulations.ERROR_WARNING_HEADER); Dialogs.emailDialog(title, htmlText); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java index 97f03be18a4..9f43a85aa64 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java @@ -189,7 +189,7 @@ public class ResultsEditorTableTab implements IResultsEditorTableTab { item.addSelectionListener(new SelectionAdapter() { private List<String> getColumns() { - List<String> cols = new ArrayList<String>(); + List<String> cols = new ArrayList<>(); for (XViewerColumn col : columns) { cols.add(col.getName()); } @@ -197,7 +197,7 @@ public class ResultsEditorTableTab implements IResultsEditorTableTab { } private void writeRows(TableWriterAdaptor writerAdaptor) { - List<String> rws = new ArrayList<String>(); + List<String> rws = new ArrayList<>(); for (IResultsXViewerRow row : rows) { for (int i = 0; i < columns.size(); i++) { rws.add(row.getValue(i)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewer.java index ee5f8ba6887..60555f14732 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewer.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.TreeItem; */ public class ResultsXViewer extends XViewer { - List<IResultsEditorTableListener> listeners = new ArrayList<IResultsEditorTableListener>(); + List<IResultsEditorTableListener> listeners = new ArrayList<>(); public ResultsXViewer(Composite parent, int style, List<XViewerColumn> xColumns, XViewerFactory xViewerFactory) { super(parent, style, xViewerFactory); @@ -58,7 +58,7 @@ public class ResultsXViewer extends XViewer { } public ArrayList<ResultsXViewerRow> getSelectedRows() { - ArrayList<ResultsXViewerRow> arts = new ArrayList<ResultsXViewerRow>(); + ArrayList<ResultsXViewerRow> arts = new ArrayList<>(); TreeItem items[] = getTree().getSelection(); for (TreeItem item : items) { arts.add((ResultsXViewerRow) item.getData()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewerContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewerContentProvider.java index 6277d11778c..dc684e15868 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewerContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/xresults/ResultsXViewerContentProvider.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.ui.skynet.results.table.IResultsXViewerRow; public class ResultsXViewerContentProvider implements ITreeContentProvider { - protected Collection<IResultsXViewerRow> rootSet = new HashSet<IResultsXViewerRow>(); + protected Collection<IResultsXViewerRow> rootSet = new HashSet<>(); private static Object[] EMPTY_ARRAY = new Object[0]; public ResultsXViewerContentProvider() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java index 4f7b3151cc4..15e4b318bdc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java @@ -35,7 +35,7 @@ public abstract class AbstractArtifactSearchResult extends AbstractTextSearchRes } public List<Artifact> getArtifactResults() { - List<Artifact> toReturn = new ArrayList<Artifact>(); + List<Artifact> toReturn = new ArrayList<>(); for (Object element : getElements()) { if (element instanceof Artifact) { toReturn.add((Artifact) element); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index e673acf5e99..55a3fdd4f49 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -545,7 +545,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl IDialogSettings dialogSettings = Activator.getInstance().getDialogSettings(); if (dialogSettings != null) { - List<String> filterString = new ArrayList<String>(); + List<String> filterString = new ArrayList<>(); FilterModelList filterList = filterviewer.getFilterList(); for (FilterModel model : filterList.getFilters()) { filterString.add(asString(model)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java index 4017c97dbe6..ebbbc127215 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/FilterArtifactSearchQuery.java @@ -50,7 +50,7 @@ public class FilterArtifactSearchQuery extends AbstractLegacyArtifactSearchQuery firstTime = false; } - List<Artifact> toReturn = new LinkedList<Artifact>(); + List<Artifact> toReturn = new LinkedList<>(); for (Artifact art : queryBuilderArtifact.getResults()) { toReturn.add(art); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java index c3c10f971b6..f1e9459c345 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/IdArtifactSearch.java @@ -40,8 +40,8 @@ final class IdArtifactSearch extends AbstractLegacyArtifactSearchQuery { @Override public Collection<Artifact> getArtifacts() throws Exception { - List<Integer> artIds = new LinkedList<Integer>(); - List<String> guids = new LinkedList<String>(); + List<Integer> artIds = new LinkedList<>(); + List<String> guids = new LinkedList<>(); for (String id : Arrays.asList(searchString.split("[\\s,]+"))) { if (Strings.isNumeric(id)) { artIds.add(Integer.parseInt(id)); @@ -50,7 +50,7 @@ final class IdArtifactSearch extends AbstractLegacyArtifactSearchQuery { } } - List<Artifact> toReturn = new LinkedList<Artifact>(); + List<Artifact> toReturn = new LinkedList<>(); if (!artIds.isEmpty()) { QueryBuilderArtifact query = ArtifactQuery.createQueryBuilder(branchToSearch); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java index f70e8ac61a5..a7c7241eb65 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java @@ -78,10 +78,10 @@ public class QuickSearchOptionComposite extends Composite { public QuickSearchOptionComposite(Composite parent, int style) { super(parent, style); - this.optionsButtons = new LinkedHashMap<SearchOption, Button>(); - this.textAreas = new HashMap<SearchOption, Text>(); - this.optionsMap = new LinkedHashMap<SearchOption, Boolean>(); - this.configurableOptionSet = new HashMap<SearchOption, IOptionConfigurationHandler<?>>(); + this.optionsButtons = new LinkedHashMap<>(); + this.textAreas = new HashMap<>(); + this.optionsMap = new LinkedHashMap<>(); + this.configurableOptionSet = new HashMap<>(); for (SearchOption option : SearchOption.values()) { this.optionsMap.put(option, false); @@ -270,8 +270,8 @@ public class QuickSearchOptionComposite extends Composite { } public void loadState(IMemento memento) { - Map<SearchOption, String[]> configs = new HashMap<SearchOption, String[]>(); - Map<SearchOption, Boolean> options = new HashMap<SearchOption, Boolean>(); + Map<SearchOption, String[]> configs = new HashMap<>(); + Map<SearchOption, Boolean> options = new HashMap<>(); for (SearchOption option : SearchOption.values()) { options.put(option, new Boolean(memento.getString(OPTIONS_KEY_ID + option.name()))); @@ -377,7 +377,7 @@ public class QuickSearchOptionComposite extends Composite { public static Map<SearchOption, IOptionConfigurationHandler<?>> getConfigurableOptions() { if (configurable == null) { - configurable = new HashMap<SearchOption, IOptionConfigurationHandler<?>>(); + configurable = new HashMap<>(); for (SearchOption option : SearchOption.values()) { if (option.isConfigurable()) { configurable.put(option, option.getConfigHandler()); @@ -410,7 +410,7 @@ public class QuickSearchOptionComposite extends Composite { public AttributeTypeFilterConfigHandler() { this.attrTypeComparator = new AttributeTypeComparator(); - this.configuration = new ArrayList<IAttributeType>(); + this.configuration = new ArrayList<>(); this.configuration.add(getDefault()); } @@ -424,7 +424,7 @@ public class QuickSearchOptionComposite extends Composite { dialog.setSelectable(taggableItems); dialog.setShowSelectButtons(true); - List<IAttributeType> selectedElements = new ArrayList<IAttributeType>(); + List<IAttributeType> selectedElements = new ArrayList<>(); for (IAttributeType type : taggableItems) { if (configuration.contains(type)) { selectedElements.add(type); @@ -515,7 +515,7 @@ public class QuickSearchOptionComposite extends Composite { public ArtifactTypeFilterConfigHandler() { this.artTypeComparator = new ArtifactTypeComparator(); - this.configuration = new ArrayList<IArtifactType>(); + this.configuration = new ArrayList<>(); } @Override @@ -528,7 +528,7 @@ public class QuickSearchOptionComposite extends Composite { dialog.setShowSelectButtons(true); dialog.setInput(artifactTypes); - List<IArtifactType> selectedElements = new ArrayList<IArtifactType>(); + List<IArtifactType> selectedElements = new ArrayList<>(); for (ArtifactType type : artifactTypes) { if (configuration.contains(type)) { selectedElements.add(type); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java index 09606b2fe02..f57ee9c60e3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java @@ -126,7 +126,7 @@ public class QuickSearchView extends GenericViewPart { if (DbConnectionExceptionComposite.dbConnectionIsOk() && memento != null) { if (Widgets.isAccessible(attrSearchComposite)) { String lastQuery = memento.getString(LAST_QUERY_KEY_ID); - List<String> queries = new ArrayList<String>(); + List<String> queries = new ArrayList<>(); String rawHistory = memento.getString(QUERY_HISTORY_KEY_ID); if (rawHistory != null) { String[] values = rawHistory.split(ENTRY_SEPARATOR); @@ -309,7 +309,7 @@ public class QuickSearchView extends GenericViewPart { } } else if (Widgets.isAccessible(guidSearchComposite) && guidSearchComposite.isExecuteSearchEvent(event)) { String searchString = guidSearchComposite.getQuery(); - List<String> invalids = new LinkedList<String>(); + List<String> invalids = new LinkedList<>(); for (String id : Arrays.asList(searchString.split("[\\s,]+"))) { if (!Strings.isValid(id) || !(GUID.isValid(id) || Strings.isNumeric(id))) { invalids.add(id); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java index 3846569e083..39946012592 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java @@ -51,7 +51,7 @@ public final class RemoteArtifactSearch extends AbstractArtifactSearchQuery { @Override public String getCriteriaLabel() { SearchOptions options = searchRequest.getOptions(); - List<String> optionsList = new ArrayList<String>(); + List<String> optionsList = new ArrayList<>(); if (options.getDeletionFlag().areDeletedAllowed()) { optionsList.add("Include Deleted"); } @@ -133,7 +133,7 @@ public final class RemoteArtifactSearch extends AbstractArtifactSearchQuery { private final AbstractTextSearchResult fResult; private ArrayList<Match> fCachedMatches; - private final Map<Integer, String> attrContent = new HashMap<Integer, String>(); + private final Map<Integer, String> attrContent = new HashMap<>(); private static final int HALF_LINE_CHAR_COUNT = 40; private ResultCollector(AbstractTextSearchResult result) { @@ -266,7 +266,7 @@ public final class RemoteArtifactSearch extends AbstractArtifactSearchQuery { } public void beginReporting() { - fCachedMatches = new ArrayList<Match>(); + fCachedMatches = new ArrayList<>(); } public void endReporting() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/filter/FilterModelList.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/filter/FilterModelList.java index ec72a2c629f..6a307fa5119 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/filter/FilterModelList.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/filter/FilterModelList.java @@ -17,8 +17,8 @@ import org.eclipse.osee.framework.ui.skynet.search.ui.IFilterListViewer; public class FilterModelList { - private ArrayList<FilterModel> filters = new ArrayList<FilterModel>(); - private Set<IFilterListViewer> changeListeners = new HashSet<IFilterListViewer>(); + private ArrayList<FilterModel> filters = new ArrayList<>(); + private Set<IFilterListViewer> changeListeners = new HashSet<>(); private boolean isAllSelected; /** @@ -26,8 +26,8 @@ public class FilterModelList { */ public FilterModelList() { super(); - filters = new ArrayList<FilterModel>(); - changeListeners = new HashSet<IFilterListViewer>(); + filters = new ArrayList<>(); + changeListeners = new HashSet<>(); } /** diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java index 6f4471f147a..34e6afaeb48 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java @@ -56,7 +56,7 @@ public class ArtifactSearchLabelProvider extends LabelProvider implements IStyle public ArtifactSearchLabelProvider(AbstractArtifactSearchViewPage page, ArtifactDecorator artifactDecorator) { this.artifactDecorator = artifactDecorator; - this.disabledImageMap = new HashMap<Image, Image>(); + this.disabledImageMap = new HashMap<>(); fPage = page; fMatchComparator = new Comparator() { @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java index 7c0db65c865..7498b23c5b6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java @@ -395,7 +395,7 @@ public class ArtifactSearchPage extends AbstractArtifactSearchViewPage implement return Collections.emptyList(); } - Set<Artifact> artifacts = new LinkedHashSet<Artifact>(); + Set<Artifact> artifacts = new LinkedHashSet<>(); for (Object object : objects) { Artifact toAdd = null; if (object instanceof AttributeLineElement) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java index 88515460ae7..6dd9b4944de 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java @@ -78,7 +78,7 @@ public class ArtifactTreeContentProvider implements ITreeContentProvider, IArtif @SuppressWarnings("rawtypes") private synchronized void initialize(AbstractArtifactSearchResult result) { searchResult = result; - childrenMap = new HashMap<Object, Set>(); + childrenMap = new HashMap<>(); boolean showLineMatches = searchResult.hasAttributeMatches(); if (result != null) { @@ -133,7 +133,7 @@ public class ArtifactTreeContentProvider implements ITreeContentProvider, IArtif private boolean insertChild(Object parent, Object child) { Set<Object> children = childrenMap.get(parent); if (children == null) { - children = new HashSet<Object>(); + children = new HashSet<>(); childrenMap.put(parent, children); } return children.add(child); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/AttributeLineElement.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/AttributeLineElement.java index 636af96aa4e..0e766586b9a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/AttributeLineElement.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/AttributeLineElement.java @@ -61,7 +61,7 @@ public class AttributeLineElement implements IAdaptable { } public AttributeMatch[] getMatches(AbstractArtifactSearchResult result) { - ArrayList<AttributeMatch> res = new ArrayList<AttributeMatch>(); + ArrayList<AttributeMatch> res = new ArrayList<>(); Match[] matches = result.getMatches(parent); for (int i = 0; i < matches.length; i++) { AttributeMatch curr = (AttributeMatch) matches[i]; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java index 22f70391bd5..aa562778abb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java @@ -33,7 +33,7 @@ import org.eclipse.zest.core.viewers.IGraphEntityContentProvider; * @author Donald G. Dunne */ public class ArtifactGraphContentProvider implements IGraphEntityContentProvider { - // private static final Collection<Artifact>EMPTY_LIST = new ArrayList<Artifact>(0); + // private static final Collection<Artifact>EMPTY_LIST = new ArrayList<>(0); private final SkyWalkerOptions options; public ArtifactGraphContentProvider(SkyWalkerOptions options) { @@ -43,7 +43,7 @@ public class ArtifactGraphContentProvider implements IGraphEntityContentProvider @Override public Object[] getConnectedTo(Object entity) { - List<Artifact> otherItems = new LinkedList<Artifact>(); + List<Artifact> otherItems = new LinkedList<>(); // Don't want to create any links to artifacts that are NOT in displayArtifacts try { @@ -87,7 +87,7 @@ public class ArtifactGraphContentProvider implements IGraphEntityContentProvider } return otherItems.toArray(); } - private final Set<Artifact> displayArtifacts = new HashSet<Artifact>(); + private final Set<Artifact> displayArtifacts = new HashSet<>(); @Override public Object[] getElements(Object inputElement) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java index 64b2e8e0bb0..ac13a2e9cd8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java @@ -61,7 +61,7 @@ public class ArtifactGraphLabelProvider implements ILabelProvider { Collection<RelationLink> links = dest.internalGetRelations(source); - Collection<String> linkNames = new ArrayList<String>(links.size()); + Collection<String> linkNames = new ArrayList<>(links.size()); for (RelationLink link : links) { if (options.getLinkName() == LinkName.Phrasing_A_to_B) { if (link.getArtifactA().equals(source)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java index 2367717b8c7..ace45c2ce41 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerArtTypeTabItem.java @@ -142,7 +142,7 @@ public class SkyWalkerArtTypeTabItem { } public void storeSelected() { - Set<IArtifactType> selected = new HashSet<IArtifactType>(); + Set<IArtifactType> selected = new HashSet<>(); for (Object obj : treeViewer.getCheckedElements()) { if (obj instanceof IArtifactType) { selected.add((IArtifactType) obj); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java index 8eaff4c3761..e367ef5c3df 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java @@ -60,7 +60,7 @@ public final class SkyWalkerOptions { // RelationLinkDescriptor and RelationLinkDescriptorSide private Map<Object, Boolean> relTypes; private boolean filterEnabled = true; - private final Set<ISkyWalkerOptionsChangeListener> listeners = new HashSet<ISkyWalkerOptionsChangeListener>(); + private final Set<ISkyWalkerOptionsChangeListener> listeners = new HashSet<>(); public static final String RADIAL_DOWN_LAYOUT = "Radial - Down"; public static final String RADIAL_RIGHT_LAYOUT = "Radial - Right"; public static final String SPRING_LAYOUT = "Spring"; @@ -100,7 +100,7 @@ public final class SkyWalkerOptions { private void loadArtTypes() { if (artTypes == null) { - artTypes = new HashMap<IArtifactType, Boolean>(); + artTypes = new HashMap<>(); try { for (IArtifactType descriptor : ArtifactTypeManager.getValidArtifactTypes(artifact.getBranch())) { artTypes.put(descriptor, true); @@ -113,7 +113,7 @@ public final class SkyWalkerOptions { private void loadAttributeTypes() { if (showAttributes == null) { - showAttributes = new HashMap<IAttributeType, Boolean>(); + showAttributes = new HashMap<>(); try { for (IAttributeType descriptor : AttributeTypeManager.getValidAttributeTypes(artifact.getBranch())) { showAttributes.put(descriptor, false); @@ -126,7 +126,7 @@ public final class SkyWalkerOptions { private void loadRelTypes() { if (relTypes == null) { - relTypes = new HashMap<Object, Boolean>(); + relTypes = new HashMap<>(); try { for (RelationType relationType : RelationTypeManager.getValidTypes(artifact.getBranch())) { relTypes.put(relationType, true); @@ -243,7 +243,7 @@ public final class SkyWalkerOptions { private Map<AbstractLayoutAlgorithm, String> loadLayouts() { if (layouts == null) { - layouts = new HashMap<AbstractLayoutAlgorithm, String>(); + layouts = new HashMap<>(); RadialLayoutAlgorithm radLayout = new RadialLayoutAlgorithm(LayoutStyles.NO_LAYOUT_NODE_RESIZING); radLayout.setRangeToLayout(-90 * Math.PI / 360, 90 * Math.PI / 360); @@ -368,7 +368,7 @@ public final class SkyWalkerOptions { if (relTypes == null) { loadRelTypes(); } - List<Object> selList = new ArrayList<Object>(); + List<Object> selList = new ArrayList<>(); for (Object obj : selected) { selList.add(obj); } @@ -379,7 +379,7 @@ public final class SkyWalkerOptions { } public void setSelectedShowAttributes(Object[] selected) { - List<Object> selList = new ArrayList<Object>(); + List<Object> selList = new ArrayList<>(); for (Object obj : selected) { selList.add(obj); } @@ -400,7 +400,7 @@ public final class SkyWalkerOptions { } public Set<IArtifactType> getSelectedArtTypes() { - Set<IArtifactType> selected = new HashSet<IArtifactType>(); + Set<IArtifactType> selected = new HashSet<>(); if (artTypes == null) { return selected; } @@ -413,7 +413,7 @@ public final class SkyWalkerOptions { } public Set<Object> getSelectedRelTypes() { - Set<Object> selected = new HashSet<Object>(); + Set<Object> selected = new HashSet<>(); if (relTypes == null) { return selected; } @@ -426,7 +426,7 @@ public final class SkyWalkerOptions { } public Set<IAttributeType> getSelectedShowAttributeTypes() { - Set<IAttributeType> selected = new HashSet<IAttributeType>(); + Set<IAttributeType> selected = new HashSet<>(); if (showAttributes == null) { return selected; } @@ -463,7 +463,7 @@ public final class SkyWalkerOptions { if (relTypes == null) { return new HashSet<RelationType>(); } - Set<RelationType> descs = new HashSet<RelationType>(); + Set<RelationType> descs = new HashSet<>(); for (Object obj : relTypes.keySet()) { if (obj instanceof RelationType) { descs.add((RelationType) obj); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java index e144bbf4a13..c592bc2042c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java @@ -74,7 +74,7 @@ public class SkyWalkerView extends GenericViewPart { private String storedGuid; private String storedBrandId; private final SkyWalkerOptions options = new SkyWalkerOptions(); - private final List<Artifact> history = new LinkedList<Artifact>(); + private final List<Artifact> history = new LinkedList<>(); private Action filterAction; private Composite viewerComp; protected SashForm sashForm; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java index 3346f176c5a..25d457bb75a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java @@ -25,7 +25,7 @@ import org.eclipse.zest.core.viewers.IGraphEntityContentProvider; * @author Donald G. Dunne */ public class ArtifactTypeContentProvider implements IGraphEntityContentProvider { - // private static final Collection<Artifact>EMPTY_LIST = new ArrayList<Artifact>(0); + // private static final Collection<Artifact>EMPTY_LIST = new ArrayList<>(0); public ArtifactTypeContentProvider() { super(); @@ -47,7 +47,7 @@ public class ArtifactTypeContentProvider implements IGraphEntityContentProvider public Object[] getElements(Object inputElement) { try { if (inputElement instanceof ArtifactType) { - Set<ArtifactType> artifactTypes = new HashSet<ArtifactType>(); + Set<ArtifactType> artifactTypes = new HashSet<>(); artifactTypes.add((ArtifactType) inputElement); getDecendents((ArtifactType) inputElement, artifactTypes); return artifactTypes.toArray(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java index 2a559925e24..9457f5f388b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java @@ -43,7 +43,7 @@ public class ArtifactTemplateProvider implements ITemplateProvider { private synchronized void ensureTemplateCachePopulated() throws OseeCoreException { if (templateMap == null) { - templateMap = new HashMap<String, Artifact>(); + templateMap = new HashMap<>(); templates = ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.RendererTemplate, BranchManager.getCommonBranch()); for (Artifact art : templates) { @@ -114,7 +114,7 @@ public class ArtifactTemplateProvider implements ITemplateProvider { throw new OseeArgumentException("Invalid renderer[%s] or presentationType[%s]", renderer.toString(), presentationType.toString()); } - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); String rendererId = renderer.getClass().getCanonicalName(); if (artifact != null && option != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java index 871b70a78a2..0335da8e627 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java @@ -53,7 +53,7 @@ public class TemplateManager { } public static List<Artifact> getAllTemplates() { - List<Artifact> templates = new ArrayList<Artifact>(); + List<Artifact> templates = new ArrayList<>(); try { for (ITemplateProvider provider : instance.templateProviders) { templates.addAll(provider.getAllTemplates()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandlerOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandlerOperation.java index aa8bf3b73c5..1fa84474dcc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandlerOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/InterArtifactExplorerDropHandlerOperation.java @@ -52,7 +52,7 @@ public class InterArtifactExplorerDropHandlerOperation extends AbstractOperation super("Introduce Artifact(s)", Activator.PLUGIN_ID); this.destinationParentArtifact = destinationParentArtifact; this.prompt = prompt; - this.sourceArtifacts = new ArrayList<Artifact>(Arrays.asList(sourceArtifacts)); + this.sourceArtifacts = new ArrayList<>(Arrays.asList(sourceArtifacts)); } @Override @@ -126,7 +126,7 @@ public class InterArtifactExplorerDropHandlerOperation extends AbstractOperation } private Collection<Artifact> getRecurseChildren() throws OseeCoreException { - Collection<Artifact> allArtifacts = new ArrayList<Artifact>(); + Collection<Artifact> allArtifacts = new ArrayList<>(); for (Artifact art : sourceArtifacts) { allArtifacts.addAll(art.getDescendants(DeletionFlag.INCLUDE_DELETED)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java index 100a39c02d7..35b1de16b01 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/update/RevertLabelProvider.java @@ -33,7 +33,7 @@ public class RevertLabelProvider extends LabelProvider implements IStyledLabelPr public RevertLabelProvider() { super(); - this.disabledMap = new HashMap<Image, Image>(); + this.disabledMap = new HashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java index 9f7839c5dd1..428d4b3bee3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java @@ -39,7 +39,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemBlam; public class UserNavigateViewItems implements XNavigateViewItems, IXNavigateCommonItem { private final static UserNavigateViewItems instance = new UserNavigateViewItems(); - private final List<XNavigateItem> items = new CopyOnWriteArrayList<XNavigateItem>(); + private final List<XNavigateItem> items = new CopyOnWriteArrayList<>(); private boolean ensurePopulatedRanOnce = false; public static UserNavigateViewItems getInstance() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactClipboard.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactClipboard.java index db77a74f587..69bf12d8b7e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactClipboard.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/ArtifactClipboard.java @@ -45,7 +45,7 @@ public class ArtifactClipboard { } private List<Artifact> getArtifactsWithPermission(AccessPolicy accessService, PermissionEnum permission, List<Artifact> artifacts) throws OseeCoreException { - ArrayList<Artifact> toReturn = new ArrayList<Artifact>(artifacts); + ArrayList<Artifact> toReturn = new ArrayList<>(artifacts); Iterator<Artifact> artIterator = toReturn.iterator(); // Remove Artifact that do not have write permission. @@ -75,14 +75,14 @@ public class ArtifactClipboard { this.clipboard = new Clipboard(null); } - List<Artifact> authFailedList = new ArrayList<Artifact>(artifactTransferData); + List<Artifact> authFailedList = new ArrayList<>(artifactTransferData); List<Artifact> authorizedArtifacts = getArtifactsWithPermission(policyHandlerService, PermissionEnum.READ, artifactTransferData); authFailedList.removeAll(authorizedArtifacts); if (authorizedArtifacts.size() > 0) { - ArrayList<String> textTransferData = new ArrayList<String>(); + ArrayList<String> textTransferData = new ArrayList<>(); for (Artifact cur : authorizedArtifacts) { textTransferData.add(cur.getName()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java index 2a601e9cd57..77680ba21cf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java @@ -25,7 +25,7 @@ import org.osgi.framework.Bundle; * @author Donald G. Dunne */ public class OseeMainDictionary implements IOseeDictionary { - private final Set<String> dictionary = new HashSet<String>(); + private final Set<String> dictionary = new HashSet<>(); private volatile boolean wasLoaded = false; @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java index 5172f4a5f26..51ed2365eb4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java @@ -156,7 +156,7 @@ public abstract class SkynetDragAndDrop { try { if (getArtifacts() != null && getArtifacts().length > 0) { Artifact[] artifacts = getArtifacts(); - Collection<String> names = new ArrayList<String>(artifacts.length); + Collection<String> names = new ArrayList<>(artifacts.length); for (Artifact artifact : artifacts) { names.add(artifact.getName()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java index 2bcb5dd9c53..5c75c563f62 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java @@ -51,7 +51,7 @@ public class EmailUserGroups extends XNavigateItemAction { } public static Set<Artifact> getEmailGroupsAndUserGroups(User user) throws OseeCoreException { - Set<Artifact> artifacts = new HashSet<Artifact>(); + Set<Artifact> artifacts = new HashSet<>(); for (Artifact art : ArtifactQuery.getArtifactListFromTypeWithInheritence(CoreArtifactTypes.UserGroup, BranchManager.getCommonBranch(), DeletionFlag.EXCLUDE_DELETED)) { // Only add group if have read permissions @@ -70,7 +70,7 @@ public class EmailUserGroups extends XNavigateItemAction { new FilteredCheckboxTreeArtifactDialog("Select Groups to Email", groupOptions); if (dialog.open() == 0) { - Set<String> emails = new HashSet<String>(); + Set<String> emails = new HashSet<>(); for (Artifact artifact : dialog.getChecked()) { if (artifact.isOfType(CoreArtifactTypes.UniversalGroup)) { for (Artifact userArt : artifact.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Members)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java index fc5864c9a1f..d3889bbe3a0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java @@ -94,7 +94,7 @@ public class EmailWizardPage extends WizardPage { namesComp.setLayoutData(gd); // Fill names array - ArrayList<Object> names = new ArrayList<Object>(); + ArrayList<Object> names = new ArrayList<>(); if (groups != null) { names.addAll(groups); if (groups.size() > 0) { @@ -325,7 +325,7 @@ public class EmailWizardPage extends WizardPage { public String[] getEmails(ListViewer list) throws OseeCoreException { - ArrayList<String> emails = new ArrayList<String>(); + ArrayList<String> emails = new ArrayList<>(); for (int x = 0; x < list.getList().getItemCount(); x++) { Object obj = list.getElementAt(x); if (obj instanceof User) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/Matrix.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/Matrix.java index fdf4b6fee01..87cacc5e299 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/Matrix.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/Matrix.java @@ -28,11 +28,11 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML; public class Matrix { private final String title; private final ArrayList<MatrixItem> items; - private final Map<String, MatrixItem> nameToItem = new HashMap<String, MatrixItem>(); - private final Set<String> values = new HashSet<String>(); - private final Map<String, Set<String>> nameToValues = new HashMap<String, Set<String>>(); + private final Map<String, MatrixItem> nameToItem = new HashMap<>(); + private final Set<String> values = new HashSet<>(); + private final Map<String, Set<String>> nameToValues = new HashMap<>(); // Names with no values will be listed at the bottom of the report so they don't take up space - private final Set<String> noValueNames = new HashSet<String>(); + private final Set<String> noValueNames = new HashSet<>(); private boolean useNameAsMark = false; private IProgressMonitor monitor; @@ -68,7 +68,7 @@ public class Matrix { StringBuilder sb = new StringBuilder(); sb.append(AHTML.beginMultiColumnTable(100, 1)); // Determine all the names to deal with - Set<String> names = new HashSet<String>(); + Set<String> names = new HashSet<>(); // Don't want to take up valuable table space with names that have no values; keep track // of them and print them at the end of the report for (String name : nameToItem.keySet()) { @@ -98,7 +98,7 @@ public class Matrix { if (monitor != null) { monitor.subTask(str); } - List<String> marks = new ArrayList<String>(); + List<String> marks = new ArrayList<>(); marks.add(value); for (String name : sortedNames) { if (nameToValues.get(name) != null && nameToValues.get(name).contains(value)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/MatrixItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/MatrixItem.java index 643dee68a57..72b9f25363e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/MatrixItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/matrix/MatrixItem.java @@ -20,7 +20,7 @@ import java.util.Set; public class MatrixItem { private String name; - private Set<String> values = new HashSet<String>(); + private Set<String> values = new HashSet<>(); public MatrixItem() { this("Unset", null); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java index 4165497188a..c99809694ee 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java @@ -33,7 +33,7 @@ public class AttributeContentProvider implements ITreeContentProvider { @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof Branch) { - ArrayList<Object> descriptors = new ArrayList<Object>(); + ArrayList<Object> descriptors = new ArrayList<>(); try { for (IAttributeType descriptor : AttributeTypeManager.getValidAttributeTypes((Branch) parentElement)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java index 559b8111107..e15afd6479c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java @@ -33,7 +33,7 @@ public class RelationTypeContentProvider implements ITreeContentProvider { @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof Branch) { - ArrayList<Object> descriptors = new ArrayList<Object>(); + ArrayList<Object> descriptors = new ArrayList<>(); try { for (RelationType descriptor : RelationTypeManager.getValidTypes((Branch) parentElement)) { descriptors.add(descriptor); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java index 424c2a7b253..154719296c9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java @@ -58,7 +58,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, if (MessageDialog.openConfirm(Displays.getActiveShell(), "Add to " + type + " Dictionary", "Add \"" + word + "\" to " + type + " Dictionary")) { try { - Set<String> words = new HashSet<String>(); + Set<String> words = new HashSet<>(); for (String str : art.getSoleAttributeValue(CoreAttributeTypes.Dictionary, "").split(";")) { words.add(str); } @@ -92,7 +92,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, return; } try { - dictionary = new HashSet<String>(); + dictionary = new HashSet<>(); User user = UserManager.getUser(); if (user != null) { String value = user.getSoleAttributeValue(CoreAttributeTypes.Dictionary, ""); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java index 08fa548adc2..6d985a0408b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java @@ -43,14 +43,14 @@ public class XArtifactTypeComboViewer extends XComboViewer { try { Collection<ArtifactType> artifactTypes = ArtifactTypeManager.getAllTypes(); - List<ArtifactType> sortedArtifatTypes = new ArrayList<ArtifactType>(); + List<ArtifactType> sortedArtifatTypes = new ArrayList<>(); sortedArtifatTypes.addAll(artifactTypes); Collections.sort(sortedArtifatTypes); getComboViewer().setInput(sortedArtifatTypes); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } - ArrayList<Object> defaultSelection = new ArrayList<Object>(); + ArrayList<Object> defaultSelection = new ArrayList<>(); defaultSelection.add("--select--"); setSelected(defaultSelection); addXModifiedListener(new XModifiedListener() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java index e3cf08848db..352a2a20d1f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java @@ -43,14 +43,14 @@ public class XAttributeTypeComboViewer extends XComboViewer { try { Collection<AttributeType> AttributeTypes = AttributeTypeManager.getAllTypes(); - List<AttributeType> sortedArtifatTypes = new ArrayList<AttributeType>(); + List<AttributeType> sortedArtifatTypes = new ArrayList<>(); sortedArtifatTypes.addAll(AttributeTypes); Collections.sort(sortedArtifatTypes); getComboViewer().setInput(sortedArtifatTypes); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } - ArrayList<Object> defaultSelection = new ArrayList<Object>(); + ArrayList<Object> defaultSelection = new ArrayList<>(); defaultSelection.add("--select--"); setSelected(defaultSelection); addXModifiedListener(new XModifiedListener() { 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 9363e50d548..9a51ad4a6b7 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 @@ -39,7 +39,7 @@ public class XBranchSelectComboWidget extends GenericXWidget implements Listener private Composite composite; private final int defaultBranch; - private final List<Listener> listeners = new ArrayList<Listener>(); + private final List<Listener> listeners = new ArrayList<>(); public XBranchSelectComboWidget(String label) { super(label); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java index 81db152dafc..6b6a277e738 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java @@ -40,7 +40,7 @@ public class XBranchSelectWidget extends GenericXWidget implements Listener { private Composite composite; private IOseeBranch defaultBranch; - private final List<Listener> listeners = new ArrayList<Listener>(); + private final List<Listener> listeners = new ArrayList<>(); public XBranchSelectWidget(String label) { super(label); 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 559cc476f7b..bf6e801606a 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 @@ -35,7 +35,7 @@ public class XCombo extends XButtonCommon { protected String data = ""; protected String[] inDataStrings; // Strings sent in for display // - private final Map<String, Integer> displayDataStrings = new LinkedHashMap<String, Integer>(); + private final Map<String, Integer> displayDataStrings = new LinkedHashMap<>(); private String displayArray[]; private boolean isDefaultSelectionAllowed; 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 fdd5207eabf..f4efbaf2b72 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 @@ -220,7 +220,7 @@ public class XComboWithTextAndComboWithText extends XCombo { @Override public Collection<? extends XWidget> getChildrenXWidgets() { - List<XWidget> widgets = new ArrayList<XWidget>(); + List<XWidget> widgets = new ArrayList<>(); if (text != null) { widgets.add(text); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java index 37c8a415fbb..e993660bb67 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Label; */ public class XDate extends XWidget { - private final ArrayList<ModifyListener> listeners = new ArrayList<ModifyListener>(); + private final ArrayList<ModifyListener> listeners = new ArrayList<>(); private String defaultFormat = DateUtil.MMDDYYHHMM; private boolean requireFutureDate = false; private CalendarWidget dateCombo; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFilteredTree.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFilteredTree.java index 04f69685b53..847216eadc0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFilteredTree.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFilteredTree.java @@ -177,7 +177,7 @@ public class XFilteredTree extends GenericXWidget { } public Collection<Object> getSelected() { - List<Object> results = new ArrayList<Object>(); + List<Object> results = new ArrayList<>(); Iterator<?> i = ((IStructuredSelection) filteredTree.getViewer().getSelection()).iterator(); while (i.hasNext()) { Object obj = i.next(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java index 5db6f4695c4..376567569b1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java @@ -284,10 +284,10 @@ public abstract class XFlatWidget<T> extends XLabel { private final class FlatControl { private final List<String> pageIds; private Composite flatComposite; - private final Map<String, Composite> pages = new HashMap<String, Composite>(); + private final Map<String, Composite> pages = new HashMap<>(); public FlatControl() { - this.pageIds = new ArrayList<String>(); + this.pageIds = new ArrayList<>(); } private void createControl(Composite parent) { @@ -371,7 +371,7 @@ public abstract class XFlatWidget<T> extends XLabel { if (minPage <= numberOfPages && maxPage >= numberOfPages) { status = Status.OK_STATUS; } else { - List<String> message = new ArrayList<String>(); + List<String> message = new ArrayList<>(); if (numberOfPages < minPage) { message.add(String.format("Must have at least [%s] page%s", minPage, minPage == 1 ? "" : "s")); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java index 3d02b26d76e..82f04fef6e1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.dialog.FilteredCheckboxTreeD public class XHyperlabelGroupSelection extends XHyperlinkLabelCmdValueSelection { public static final String WIDGET_ID = XHyperlabelGroupSelection.class.getSimpleName(); - Set<Artifact> selectedGroups = new HashSet<Artifact>(); + Set<Artifact> selectedGroups = new HashSet<>(); public XHyperlabelGroupSelection(String label) { super(label, true, 80); @@ -80,7 +80,7 @@ public class XHyperlabelGroupSelection extends XHyperlinkLabelCmdValueSelection } private Collection<Artifact> getGroups() { - List<Artifact> groups = new ArrayList<Artifact>(); + List<Artifact> groups = new ArrayList<>(); for (Artifact art : UniversalGroup.getGroups(BranchManager.getCommonBranch())) { if (!art.isOfType(CoreArtifactTypes.RootArtifact)) { groups.add(art); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java index c3d6b790253..28aada7c925 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java @@ -57,7 +57,7 @@ public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implemen } public Set<User> getStoredUsers() { - Set<User> users = new HashSet<User>(); + Set<User> users = new HashSet<>(); try { for (String userId : artifact.getAttributesToStringList(attributeType)) { try { @@ -76,7 +76,7 @@ public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implemen @Override public void saveToArtifact() { try { - Set<String> userIds = new HashSet<String>(); + Set<String> userIds = new HashSet<>(); for (User user : getSelectedUsers()) { userIds.add(user.getUserId()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java index 74973d1346b..acc690f8efb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog; */ public class XHyperlabelMemberSelection extends XHyperlinkLabelCmdValueSelection { - Set<User> selectedUsers = new HashSet<User>(); + Set<User> selectedUsers = new HashSet<>(); private final Collection<User> users; public XHyperlabelMemberSelection(String label) { 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 3383fa82e76..f6946020269 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 @@ -91,7 +91,7 @@ public class XList extends GenericXWidget { private Menu listMenu; private Composite parent; private Composite composite; - private final Map<String, XListItem> items = new TreeMap<String, XListItem>(); + private final Map<String, XListItem> items = new TreeMap<>(); private int requiredMinSelected = 0; private int requiredMaxSelected = 0; private boolean grabHorizontal = false; @@ -224,7 +224,7 @@ public class XList extends GenericXWidget { } public Set<XListItem> getSelected() { - Set<XListItem> sel = new HashSet<XListItem>(); + Set<XListItem> sel = new HashSet<>(); for (XListItem xItem : items.values()) { if (xItem.isSelected()) { sel.add(xItem); @@ -251,7 +251,7 @@ public class XList extends GenericXWidget { } public Collection<String> getSelectedStrs() { - Set<String> selected = new HashSet<String>(); + Set<String> selected = new HashSet<>(); for (XListItem item : getSelected()) { selected.add(item.getName()); } @@ -272,8 +272,8 @@ public class XList extends GenericXWidget { return; } String listItems[] = listList.getItems(); - Set<String> listItemsSet = new HashSet<String>(); - Set<String> selected = new HashSet<String>(); + Set<String> listItemsSet = new HashSet<>(); + Set<String> selected = new HashSet<>(); for (String listItem : listItems) { listItemsSet.add(listItem); } @@ -332,7 +332,7 @@ public class XList extends GenericXWidget { } public void setSelected(Collection<String> names) { - ArrayList<String> handledNames = new ArrayList<String>(); + ArrayList<String> handledNames = new ArrayList<>(); for (Entry<String, XListItem> entry : items.entrySet()) { if (names.contains(entry.getKey())) { entry.getValue().selected = true; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewWithSave.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewWithSave.java index da534dc601d..5181e628e5b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewWithSave.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewWithSave.java @@ -81,7 +81,7 @@ public class XListDropViewWithSave extends XListDropViewer implements IAttribute public Result isDirty() { if (isEditable()) { try { - List<Artifact> enteredValues = new ArrayList<Artifact>(); + List<Artifact> enteredValues = new ArrayList<>(); Collections.flatten(getArtifacts(), enteredValues); Collection<Artifact> storedValues = getStored(); if (!Collections.isEqual(enteredValues, storedValues)) { 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 ac819c2c05e..9a64db7d2af 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 @@ -86,7 +86,7 @@ public class XListDropViewer extends XListViewer implements IXWidgetInputAddable Collection<Object> items = getCollectionInput(); if (items != null && !items.isEmpty()) { - List<Object> modList = new ArrayList<Object>(); + List<Object> modList = new ArrayList<>(); while (iterator.hasNext()) { modList.remove(iterator.next()); @@ -134,7 +134,7 @@ public class XListDropViewer extends XListViewer implements IXWidgetInputAddable } public List<Artifact> getSelectedArtifacts() { - List<Object> selectedArtifacts = new ArrayList<Object>(); + List<Object> selectedArtifacts = new ArrayList<>(); Collections.flatten(getSelected(), selectedArtifacts); return Collections.castAll(Artifact.class, selectedArtifacts); } @@ -143,7 +143,7 @@ public class XListDropViewer extends XListViewer implements IXWidgetInputAddable * Adds artifacts to the viewer's input. */ public void addToInput(Artifact... artifacts) { - List<Object> objects = new ArrayList<Object>(); + List<Object> objects = new ArrayList<>(); for (Artifact artifact : artifacts) { objects.add(artifact); } 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 77537284dd4..1a514f07eaf 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 @@ -249,7 +249,7 @@ public class XListViewer extends GenericXWidget { } public ArrayList<Object> getSelected() { - ArrayList<Object> selected = new ArrayList<Object>(); + ArrayList<Object> selected = new ArrayList<>(); IStructuredSelection selection = (IStructuredSelection) listViewer.getSelection(); Iterator<?> i = selection.iterator(); while (i.hasNext()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersList.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersList.java index c59e6d298d3..a2c7e7a8647 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersList.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersList.java @@ -36,7 +36,7 @@ public class XMembersList extends XListViewer { } public String[] getEmails() throws OseeCoreException { - ArrayList<String> v = new ArrayList<String>(); + ArrayList<String> v = new ArrayList<>(); for (Object obj : this.getSelected()) { User u = (User) obj; String name = u.getName(); @@ -51,7 +51,7 @@ public class XMembersList extends XListViewer { } public ArrayList<User> getUsers() { - ArrayList<User> v = new ArrayList<User>(); + ArrayList<User> v = new ArrayList<>(); for (Object obj : this.getSelected()) { v.add((User) obj); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XOptionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XOptionHandler.java index 19c379299b1..8407c310029 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XOptionHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XOptionHandler.java @@ -19,7 +19,7 @@ import java.util.Set; */ public class XOptionHandler { - private final Set<XOption> xOptions = new HashSet<XOption>(); + private final Set<XOption> xOptions = new HashSet<>(); public XOptionHandler(XOption... xOption) { set(xOption); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java index 1583f2261cb..de327b4637b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java @@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Label; public class XRadioButtons extends GenericXWidget { private Composite comp; - private final ArrayList<XRadioButton> xButtons = new ArrayList<XRadioButton>(); + private final ArrayList<XRadioButton> xButtons = new ArrayList<>(); private boolean multiSelect; private boolean vertical; private int verticalColumns; @@ -122,7 +122,7 @@ public class XRadioButtons extends GenericXWidget { @Override protected void createControls(Composite parent, int horizontalSpan) { - Map<String, XRadioButton> nameToButton = new HashMap<String, XRadioButton>(); + Map<String, XRadioButton> nameToButton = new HashMap<>(); String names[] = new String[xButtons.size()]; int x = 0; for (XRadioButton rb : xButtons) { @@ -229,7 +229,7 @@ public class XRadioButtons extends GenericXWidget { } public Set<String> getSelectedNames() { - Set<String> names = new HashSet<String>(); + Set<String> names = new HashSet<>(); for (XRadioButton rb : xButtons) { if (rb.isSelected()) { names.add(rb.getLabel()); 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 82002fba145..d3f8d25c48e 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,8 +40,8 @@ import org.eclipse.swt.widgets.Label; */ public abstract class XSelectFromDialog<T> extends XText { - private final List<T> selected = new ArrayList<T>(); - private final List<T> input = new ArrayList<T>(); + private final List<T> selected = new ArrayList<>(); + private final List<T> input = new ArrayList<>(); private int minSelectionRequired, maxSelectionRequired = 1; private Button selectionButton; @@ -165,14 +165,14 @@ public abstract class XSelectFromDialog<T> extends XText { } else { try { FilteredCheckboxTreeDialog dialog = createDialog(); - Set<T> choices = new HashSet<T>(selected); + Set<T> choices = new HashSet<>(selected); choices.addAll(input); dialog.setInput(choices); dialog.setInitialSelections(getSelected()); int result = dialog.open(); if (result == 0) { - List<T> dialogSelections = new ArrayList<T>(); + List<T> dialogSelections = new ArrayList<>(); for (Object obj : dialog.getResult()) { dialogSelections.add((T) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java index 4843a2b619d..0d43a574784 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java @@ -58,7 +58,7 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid public XStackedDam(String displayLabel) { super(displayLabel); - this.xWidgets = new LinkedHashMap<String, XWidget>(); + this.xWidgets = new LinkedHashMap<>(); this.artifact = null; this.xModifiedListener = new XModifiedListener() { @Override @@ -94,7 +94,7 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid @Override protected void createControls(Composite parent, int horizontalSpan) { super.createControls(parent, horizontalSpan); - final Collection<String> values = new ArrayList<String>(); + final Collection<String> values = new ArrayList<>(); try { boolean attributeTypeIsPlainTextEditable = false; for (Attribute<Object> attribute : getArtifact().getAttributes(getAttributeType())) { @@ -134,7 +134,7 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid } public List<String> getInput() { - List<String> data = new ArrayList<String>(); + List<String> data = new ArrayList<>(); for (XWidget widget : xWidgets.values()) { if (widget instanceof XText) { data.add(((XText) widget).get()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java index 8936c45deee..be3c8211f9b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java @@ -367,7 +367,7 @@ public abstract class XStackedWidget<T> extends XLabel { public StackedControl() { this.stackedViewer = null; this.currentPage = -1; - this.pageIds = new ArrayList<String>(); + this.pageIds = new ArrayList<>(); } private void createControl(Composite parent) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java index ebdfdd50383..5f5f4b6c80c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java @@ -63,7 +63,7 @@ public class XTextDam extends XText implements IAttributeWidget { private void setArtifact(Artifact artifact) { if (isWeakReference) { - this.artifactRef = new WeakReference<Artifact>(artifact); + this.artifactRef = new WeakReference<>(artifact); } else { artifactStrongRef = artifact; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java index 0703014a121..4a43c7d095b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java @@ -59,7 +59,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge public XTextFlatDam(String displayLabel) { super(displayLabel); - this.xWidgets = new LinkedHashMap<String, XWidget>(); + this.xWidgets = new LinkedHashMap<>(); this.artifact = null; this.xModifiedListener = new XModifiedListener() { @Override @@ -101,7 +101,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge @Override protected void createControls(Composite parent, int horizontalSpan) { super.createControls(parent, horizontalSpan); - final Collection<String> values = new ArrayList<String>(); + final Collection<String> values = new ArrayList<>(); try { values.addAll(getStored()); for (int index = 0; index < values.size(); index++) { @@ -135,7 +135,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge } public List<String> getInput() { - List<String> data = new ArrayList<String>(); + List<String> data = new ArrayList<>(); for (XWidget widget : xWidgets.values()) { if (widget instanceof XText) { data.add(((XText) widget).get()); @@ -157,7 +157,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge public Result isDirty() throws OseeCoreException { if (isEditable()) { try { - Collection<String> enteredValues = new ArrayList<String>();//getSelected(); + Collection<String> enteredValues = new ArrayList<>();//getSelected(); Collection<String> storedValues = getStored(); if (!Collections.isEqual(enteredValues, storedValues)) { return new Result(true, getAttributeType() + " is dirty"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java index 799581a0ad8..616ace8d51d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextResourceDropDam.java @@ -73,7 +73,7 @@ public class XTextResourceDropDam extends XTextDam { } private void performDrop(DropTargetEvent e) { - Set<String> strs = new HashSet<String>(); + Set<String> strs = new HashSet<>(); if (e.data instanceof String) { strs.add((String) e.data); } else if (e.data instanceof String[]) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckListener.java index fe525ae8ddd..408f24ca316 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextSpellCheckListener.java @@ -44,7 +44,7 @@ public class XTextSpellCheckListener implements ModifyListener { private final IDictionary dict; private final XText xText; - private final Set<ASpellWord> errors = new LinkedHashSet<ASpellWord>(); + private final Set<ASpellWord> errors = new LinkedHashSet<>(); private XTextSpellModifyDictionary modDict; private Integer maxLength = 50000; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextUrlListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextUrlListener.java index 82d368edcb8..2b754983da4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextUrlListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextUrlListener.java @@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.Display; public class XTextUrlListener implements ModifyListener { private final XText xText; - private final Set<UrlWord> urls = new HashSet<UrlWord>(); + private final Set<UrlWord> urls = new HashSet<>(); private Integer maxLength = 50000; public class UrlWord { 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 f205f65c050..633e508b3db 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 @@ -56,7 +56,7 @@ public abstract class XWidget { protected boolean fillHorizontally = false; private boolean displayLabel = true; - private final Set<XModifiedListener> modifiedListeners = new LinkedHashSet<XModifiedListener>(); + private final Set<XModifiedListener> modifiedListeners = new LinkedHashSet<>(); private MouseListener mouseLabelListener; protected FormToolkit toolkit; private Object object; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetDecorator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetDecorator.java index 4a5d0ae7c12..90910f91cac 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetDecorator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetDecorator.java @@ -46,8 +46,8 @@ public class XWidgetDecorator { } public XWidgetDecorator() { - decoratorMap = new HashMap<XWidget, Decorator>(); - providers = new ArrayList<DecorationProvider>(); + decoratorMap = new HashMap<>(); + providers = new ArrayList<>(); } public void addWidget(XWidget xWidget) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java index 3d7f232d1ef..63b8d2b68ab 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetUtility.java @@ -26,7 +26,7 @@ public final class XWidgetUtility { } public static List<XWidget> findXWidgetsInControl(Widget parent) { - List<XWidget> xWidgets = new ArrayList<XWidget>(); + List<XWidget> xWidgets = new ArrayList<>(); XWidget xWidget = asXWidget(parent); if (xWidget != null) { xWidgets.add(xWidget); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchArchivedStateDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchArchivedStateDialog.java index c77c46b76b0..8a76d797b28 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchArchivedStateDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchArchivedStateDialog.java @@ -62,7 +62,7 @@ public class ChangeBranchArchivedStateDialog extends ListDialog { layout.marginWidth = 20; getTableViewer().getTable().getParent().setLayout(layout); if (selected != null) { - ArrayList<Object> sel = new ArrayList<Object>(); + ArrayList<Object> sel = new ArrayList<>(); sel.add(selected); getTableViewer().setSelection(new StructuredSelection(sel.toArray(new Object[sel.size()]))); getTableViewer().getTable().setFocus(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchStateDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchStateDialog.java index 82b811e14eb..b8e45d209ae 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchStateDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchStateDialog.java @@ -62,7 +62,7 @@ public class ChangeBranchStateDialog extends ListDialog { layout.marginWidth = 20; getTableViewer().getTable().getParent().setLayout(layout); if (selected != null) { - ArrayList<Object> sel = new ArrayList<Object>(); + ArrayList<Object> sel = new ArrayList<>(); sel.add(selected); getTableViewer().setSelection(new StructuredSelection(sel.toArray(new Object[sel.size()]))); getTableViewer().getTable().setFocus(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchTypeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchTypeDialog.java index 491771e503a..e565100b5bb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchTypeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ChangeBranchTypeDialog.java @@ -62,7 +62,7 @@ public class ChangeBranchTypeDialog extends ListDialog { layout.marginWidth = 20; getTableViewer().getTable().getParent().setLayout(layout); if (selected != null) { - ArrayList<Object> sel = new ArrayList<Object>(); + ArrayList<Object> sel = new ArrayList<>(); sel.add(selected); getTableViewer().setSelection(new StructuredSelection(sel.toArray(new Object[sel.size()]))); getTableViewer().getTable().setFocus(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryComboDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryComboDialog.java index cc8da12a7b6..c519f41abb6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryComboDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryComboDialog.java @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite; public class EntryComboDialog extends EntryDialog { private final String comboMessage; - private List<String> options = new ArrayList<String>(); + private List<String> options = new ArrayList<>(); private String defaultSelection = null; private String selection = ""; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java index ef6bb50aafb..77a7c17f47d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialog.java @@ -64,7 +64,7 @@ public class EntryDialog extends MessageDialog { private String label; private Integer textHeight = null; - private final List<IShellCloseEvent> closeEventListeners = new ArrayList<IShellCloseEvent>(); + private final List<IShellCloseEvent> closeEventListeners = new ArrayList<>(); private final String dialogTitle; public EntryDialog(String dialogTitle, String dialogMessage) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java index 28c7adf7dd7..b7079efb50e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/EntryDialogWithBranchSelect.java @@ -52,7 +52,7 @@ public class EntryDialogWithBranchSelect extends MessageDialog { BranchSelectComposite branchSelect; boolean fillVertically = false; - private final List<IShellCloseEvent> closeEventListeners = new ArrayList<IShellCloseEvent>(); + private final List<IShellCloseEvent> closeEventListeners = new ArrayList<>(); public EntryDialogWithBranchSelect(String dialogTitle, String dialogMessage) { super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[] { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxArtifactTypeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxArtifactTypeDialog.java index 5ff67fc1316..f0e519195e3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxArtifactTypeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxArtifactTypeDialog.java @@ -64,7 +64,7 @@ public class FilteredCheckboxArtifactTypeDialog extends FilteredCheckboxTreeDial if (super.getTreeViewer() == null) { return Collections.emptyList(); } - Set<IArtifactType> checked = new HashSet<IArtifactType>(); + Set<IArtifactType> checked = new HashSet<>(); for (Object obj : getResult()) { checked.add((IArtifactType) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxAttributeTypeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxAttributeTypeDialog.java index d36fbd2f687..9ebff90b849 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxAttributeTypeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxAttributeTypeDialog.java @@ -62,7 +62,7 @@ public class FilteredCheckboxAttributeTypeDialog extends FilteredCheckboxTreeDia if (super.getTreeViewer() == null) { return Collections.emptyList(); } - Set<IAttributeType> checked = new HashSet<IAttributeType>(); + Set<IAttributeType> checked = new HashSet<>(); for (Object obj : getResult()) { checked.add((IAttributeType) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java index f0f0bb4eddc..4a00363ef76 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxBranchDialog.java @@ -57,7 +57,7 @@ public class FilteredCheckboxBranchDialog extends FilteredCheckboxTreeDialog { if (super.getTreeViewer() == null) { return Collections.emptyList(); } - Set<IOseeBranch> checked = new HashSet<IOseeBranch>(); + Set<IOseeBranch> checked = new HashSet<>(); for (Object obj : getResult()) { checked.add((IOseeBranch) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTree.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTree.java index 804e61f3216..07cfbea507c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTree.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTree.java @@ -127,7 +127,7 @@ public class FilteredCheckboxTree extends FilteredTree { @SuppressWarnings("unchecked") public <T> Collection<T> getChecked() { - List<T> checked = new ArrayList<T>(); + List<T> checked = new ArrayList<>(); for (Object obj : getCheckboxTreeViewer().getCheckedElements()) { checked.add((T) obj); } @@ -212,7 +212,7 @@ public class FilteredCheckboxTree extends FilteredTree { class FilteredCheckboxTreeItem { Object data; // Data element String state; // Checked State - List<FilteredCheckboxTreeItem> children = new ArrayList<FilteredCheckboxTreeItem>(); + List<FilteredCheckboxTreeItem> children = new ArrayList<>(); public FilteredCheckboxTreeItem(Object data, String state, Map<Object, FilteredCheckboxTreeItem> itemCache, FilteredCheckboxTreeItem parent) { this.data = data; @@ -225,13 +225,13 @@ public class FilteredCheckboxTree extends FilteredTree { } /* A cache of all the nodes */ - Map<Object, FilteredCheckboxTreeItem> itemCache = new HashMap<Object, FilteredCheckboxTreeItem>(); + Map<Object, FilteredCheckboxTreeItem> itemCache = new HashMap<>(); /* The preRefresh Listeners */ - List<PreRefreshNotifier> refreshingListeners = new ArrayList<PreRefreshNotifier>(); + List<PreRefreshNotifier> refreshingListeners = new ArrayList<>(); @Override protected void unmapAllElements() { - itemCache = new HashMap<Object, FilteredCheckboxTreeItem>(); + itemCache = new HashMap<>(); super.unmapAllElements(); } @@ -299,7 +299,7 @@ public class FilteredCheckboxTree extends FilteredTree { public Object[] getCheckedChildren(Object element) { FilteredCheckboxTreeItem item = itemCache.get(element); - List<Object> checkedChildren = new ArrayList<Object>(); + List<Object> checkedChildren = new ArrayList<>(); if (item != null) { List<FilteredCheckboxTreeItem> children = item.children; Iterator<FilteredCheckboxTreeItem> iterator = children.iterator(); @@ -320,7 +320,7 @@ public class FilteredCheckboxTree extends FilteredTree { @Override public Object[] getCheckedElements() { Iterator<FilteredCheckboxTreeItem> iterator = itemCache.values().iterator(); - List<Object> checkedElements = new LinkedList<Object>(); + List<Object> checkedElements = new LinkedList<>(); while (iterator.hasNext()) { getCheckedElementsRecurse(iterator.next(), checkedElements); } @@ -359,7 +359,7 @@ public class FilteredCheckboxTree extends FilteredTree { */ @Override public void setCheckedElements(Object[] elements) { - Set<Object> s = new HashSet<Object>(itemCache.keySet()); + Set<Object> s = new HashSet<>(itemCache.keySet()); s.removeAll(new HashSet<Object>(Arrays.asList(elements))); for (int i = 0; i < elements.length; i++) { FilteredCheckboxTreeItem item = itemCache.get(elements[i]); @@ -504,7 +504,7 @@ public class FilteredCheckboxTree extends FilteredTree { * A helper method to get all the items in the tree */ private ArrayList<TreeItem> getAllTreeItems(TreeItem[] roots) { - ArrayList<TreeItem> list = new ArrayList<TreeItem>(); + ArrayList<TreeItem> list = new ArrayList<>(); for (int i = 0; i < roots.length; i++) { TreeItem item = roots[i]; list.add(item); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java index 83b273d5704..c3ef93eee64 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeArtifactDialog.java @@ -51,7 +51,7 @@ public class FilteredCheckboxTreeArtifactDialog extends FilteredCheckboxTreeDial if (super.getTreeViewer() == null) { return Collections.emptyList(); } - Set<Artifact> checked = new HashSet<Artifact>(); + Set<Artifact> checked = new HashSet<>(); for (Object obj : getResult()) { checked.add((Artifact) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java index 359d7fcea69..9f2935210ba 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredCheckboxTreeDialog.java @@ -255,7 +255,7 @@ public class FilteredCheckboxTreeDialog extends MessageDialog { @SuppressWarnings("unchecked") public <T> Collection<T> getChecked() { - List<T> checked = new ArrayList<T>(); + List<T> checked = new ArrayList<>(); for (Object obj : getResult()) { checked.add((T) obj); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java index 8f4eb959b41..de4c7cf057f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/FilteredTreeDialog.java @@ -51,7 +51,7 @@ public class FilteredTreeDialog extends MessageDialog { private ViewerSorter viewerSorter; private boolean multiSelect = true; private PatternFilter patternFilter; - List<Object> selected = new ArrayList<Object>(); + List<Object> selected = new ArrayList<>(); public FilteredTreeDialog(String dialogTitle, String dialogMessage, IContentProvider contentProvider, IBaseLabelProvider labelProvider) { this(dialogTitle, dialogMessage, contentProvider, labelProvider, null); @@ -179,7 +179,7 @@ public class FilteredTreeDialog extends MessageDialog { } public List<TreeItem> getVisibleItems() { - List<TreeItem> toReturn = new ArrayList<TreeItem>(); + List<TreeItem> toReturn = new ArrayList<>(); getVisibleItems(toReturn, treeViewer.getViewer().getTree().getItems()); return toReturn; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserCheckTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserCheckTreeDialog.java index 2ba3529f6db..f5d8a384365 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserCheckTreeDialog.java @@ -52,7 +52,7 @@ public class UserCheckTreeDialog extends FilteredCheckboxTreeArtifactDialog { } public Collection<User> getUsersSelected() { - Set<User> selected = new HashSet<User>(); + Set<User> selected = new HashSet<>(); for (FullyNamed art : getChecked()) { selected.add((User) art); } @@ -119,7 +119,7 @@ public class UserCheckTreeDialog extends FilteredCheckboxTreeArtifactDialog { */ public void setTeamMembers(Collection<? extends User> teamMembers) { if (this.teamMembers == null) { - this.teamMembers = new HashSet<User>(); + this.teamMembers = new HashSet<>(); } this.teamMembers.addAll(teamMembers); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserListDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserListDialog.java index ea9935de81c..4d394e6fdd1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserListDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/UserListDialog.java @@ -44,7 +44,7 @@ public class UserListDialog extends FilteredTreeArtifactDialog { } else if (active == Active.Active) { users = UserManager.getUsersSortedByName(); } else { - users = new ArrayList<User>(); + users = new ArrayList<>(); for (User user : UserManager.getUsersAllSortedByName()) { if (!user.isActive()) { users.add(user); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/CalendarWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/CalendarWidget.java index 39877a5dbc5..117417c29e8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/CalendarWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/CalendarWidget.java @@ -50,7 +50,7 @@ public class CalendarWidget extends Composite { void dateChanged(Calendar calendar); } - private final List<CalendarListener> listeners = new CopyOnWriteArrayList<CalendarListener>(); + private final List<CalendarListener> listeners = new CopyOnWriteArrayList<>(); private Text text; private Calendar calendar; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/DefaultAttributeXWidgetProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/DefaultAttributeXWidgetProvider.java index dfb57a294e9..09c44a00571 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/DefaultAttributeXWidgetProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/DefaultAttributeXWidgetProvider.java @@ -50,7 +50,7 @@ public class DefaultAttributeXWidgetProvider implements IAttributeXWidgetProvide @Override public List<XWidgetRendererItem> getDynamicXWidgetLayoutData(IAttributeType attributeType) throws OseeCoreException { - List<XWidgetRendererItem> xWidgetLayoutData = new ArrayList<XWidgetRendererItem>(); + List<XWidgetRendererItem> xWidgetLayoutData = new ArrayList<>(); XWidgetRendererItem defaultData = createDynamicXWidgetLayout(attributeType, AttributeTypeManager.getMinOccurrences(attributeType)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java index 47ecc46ca30..4e1a0673e76 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/FrameworkXWidgetProvider.java @@ -409,7 +409,7 @@ public final class FrameworkXWidgetProvider { XArtifactTypeMultiChoiceSelect widget = new XArtifactTypeMultiChoiceSelect(); String defaultType = xWidgetLayoutData.getDefaultValue(); if (Strings.isValid(defaultType)) { - List<ArtifactType> types = new LinkedList<ArtifactType>(); + List<ArtifactType> types = new LinkedList<>(); for (String type : defaultType.split(",")) { try { types.add(ArtifactTypeManager.getType(type)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java index 142e4ac86ae..fd919199ddf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java @@ -57,15 +57,15 @@ import org.w3c.dom.Element; public class SwtXWidgetRenderer { public static final String XWIDGET = "XWidget"; - private final Set<XWidgetRendererItem> datas = new LinkedHashSet<XWidgetRendererItem>(); - private final Map<String, XWidgetRendererItem> nameToLayoutData = new HashMap<String, XWidgetRendererItem>(); + private final Set<XWidgetRendererItem> datas = new LinkedHashSet<>(); + private final Map<String, XWidgetRendererItem> nameToLayoutData = new HashMap<>(); - private final Collection<ArrayList<String>> orRequired = new ArrayList<ArrayList<String>>(); - private final Collection<ArrayList<String>> xorRequired = new ArrayList<ArrayList<String>>(); + private final Collection<ArrayList<String>> orRequired = new ArrayList<>(); + private final Collection<ArrayList<String>> xorRequired = new ArrayList<>(); private final IDynamicWidgetLayoutListener dynamicWidgetLayoutListener; private final IXWidgetOptionResolver optionResolver; - private final Collection<XWidget> xWidgets = new ArrayList<XWidget>(); + private final Collection<XWidget> xWidgets = new ArrayList<>(); public SwtXWidgetRenderer() { this(null, new DefaultXWidgetOptionResolver()); @@ -435,7 +435,7 @@ public class SwtXWidgetRenderer { } protected void processOrRequired(String instr) { - ArrayList<String> names = new ArrayList<String>(); + ArrayList<String> names = new ArrayList<>(); for (String attr : instr.split(";")) { if (!attr.contains("[ \\s]*")) { names.add(attr); @@ -445,7 +445,7 @@ public class SwtXWidgetRenderer { } protected void processXOrRequired(String instr) { - ArrayList<String> names = new ArrayList<String>(); + ArrayList<String> names = new ArrayList<>(); for (String attr : instr.split(";")) { if (!attr.contains("[ \\s]*")) { names.add(attr); 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 ea3ff5bd155..6cc188bd52c 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 @@ -78,7 +78,7 @@ public class XBranchContentProvider implements ITreeContentProvider { public Object[] getBranchChildren(Branch branch) { try { if (showChildBranchesUnderParents) { - List<Object> items = new LinkedList<Object>(); + List<Object> items = new LinkedList<>(); Collection<Branch> childBrances = showArchivedBranches ? branch.getChildBranches(true) : branch.getChildBranches(); @@ -97,7 +97,7 @@ public class XBranchContentProvider implements ITreeContentProvider { protected Object[] getBranchManagerChildren() { BranchArchivedState branchState = BranchArchivedState.UNARCHIVED; - List<BranchType> branchTypes = new ArrayList<BranchType>(4); + List<BranchType> branchTypes = new ArrayList<>(4); try { boolean isAdmin = AccessControlManager.isOseeAdmin(); @@ -116,7 +116,7 @@ public class XBranchContentProvider implements ITreeContentProvider { branchTypes.add(BranchType.WORKING); } - Set<Branch> branchesToReturn = new HashSet<Branch>(); + Set<Branch> branchesToReturn = new HashSet<>(); if (showOnlyWorkingBranches) { branchesToReturn.addAll(BranchManager.getBranches(BranchArchivedState.UNARCHIVED, BranchType.WORKING)); } @@ -200,7 +200,7 @@ public class XBranchContentProvider implements ITreeContentProvider { } public Object[] getAllElements(Object inputElement) { - ArrayList<Object> objects = new ArrayList<Object>(); + ArrayList<Object> objects = new ArrayList<>(); objects.addAll(recurseAllElements(inputElement)); @@ -212,7 +212,7 @@ public class XBranchContentProvider implements ITreeContentProvider { } private ArrayList<Object> recurseAllElements(Object inputElement) { - ArrayList<Object> objects = new ArrayList<Object>(); + ArrayList<Object> objects = new ArrayList<>(); for (Object object : getChildren(inputElement)) { objects.add(object); 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 f212161d721..ecb9065639e 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 @@ -84,7 +84,7 @@ public class XBranchWidget extends GenericXWidget { this.searchRealTime = searchRealTime; this.selectedBranch = selectedBranch; this.menuListener = menuListener; - branchSelectedListeners = new CopyOnWriteArrayList<BranchSelectedListener>(); + branchSelectedListeners = new CopyOnWriteArrayList<>(); branchXViewerFactory = new BranchXViewerFactory(); } @@ -220,7 +220,7 @@ public class XBranchWidget extends GenericXWidget { } public ArrayList<Branch> getSelectedBranches() { - ArrayList<Branch> items = new ArrayList<Branch>(); + ArrayList<Branch> items = new ArrayList<>(); if (branchXViewer == null || branchXViewer.getSelection().isEmpty()) { return items; } @@ -237,7 +237,7 @@ public class XBranchWidget extends GenericXWidget { @SuppressWarnings("rawtypes") public ArrayList<TransactionRecord> getSelectedTransactionRecords() { - ArrayList<TransactionRecord> items = new ArrayList<TransactionRecord>(); + ArrayList<TransactionRecord> items = new ArrayList<>(); if (branchXViewer == null || branchXViewer.getSelection().isEmpty()) { return items; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java index 30246fe7c82..5ee6deda259 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java @@ -200,7 +200,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener } private class OpenOnShowListener implements MenuListener { - private final List<MenuItem> items = new LinkedList<MenuItem>(); + private final List<MenuItem> items = new LinkedList<>(); public void add(MenuItem item) { items.add(item); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java index d6f0bad1fb7..c3d8935254f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryXViewer.java @@ -48,7 +48,7 @@ public class HistoryXViewer extends XViewer { } public ArrayList<Artifact> getSelectedChanges() { - ArrayList<Artifact> arts = new ArrayList<Artifact>(); + ArrayList<Artifact> arts = new ArrayList<>(); TreeItem items[] = getTree().getSelection(); if (items.length > 0) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java index 61f607b753a..f6874b54845 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java @@ -194,7 +194,7 @@ public class XHistoryWidget extends GenericXWidget { } public ArrayList<Branch> getSelectedBranches() { - ArrayList<Branch> items = new ArrayList<Branch>(); + ArrayList<Branch> items = new ArrayList<>(); if (xHistoryViewer == null) { return items; } @@ -258,7 +258,7 @@ public class XHistoryWidget extends GenericXWidget { @Override protected IStatus run(IProgressMonitor monitor) { - final Collection<Change> changes = new ArrayList<Change>(); + final Collection<Change> changes = new ArrayList<>(); try { if (loadHistory) { @@ -315,7 +315,7 @@ public class XHistoryWidget extends GenericXWidget { @Override public Artifact[] getArtifacts() { IStructuredSelection selection = (IStructuredSelection) xHistoryViewer.getSelection(); - ArrayList<Artifact> artifacts = new ArrayList<Artifact>(); + ArrayList<Artifact> artifacts = new ArrayList<>(); if (selection != null && !selection.isEmpty()) { for (Object object : selection.toArray()) { @@ -335,7 +335,7 @@ public class XHistoryWidget extends GenericXWidget { @SuppressWarnings("rawtypes") public ArrayList<TransactionRecord> getSelectedTransactionRecords() { - ArrayList<TransactionRecord> items = new ArrayList<TransactionRecord>(); + ArrayList<TransactionRecord> items = new ArrayList<>(); if (xHistoryViewer == null) { return items; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphLine.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphLine.java index 0588b56f496..7e2155d0658 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphLine.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphLine.java @@ -47,7 +47,7 @@ public class XBarGraphLine { public XBarGraphLine(String name, int foreground, int background, long value, String valueStr) { this.name = name; - segments = new ArrayList<XBarGraphLineSegment>(); + segments = new ArrayList<>(); segments.add(new XBarGraphLineSegment(valueStr, foreground, background, value)); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java index 5679d3db947..8271d6e0d63 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xbargraph/XBarGraphTable.java @@ -137,12 +137,12 @@ public class XBarGraphTable extends XButtonCommon { shell.setLayout(new GridLayout(1, false)); shell.setText("Show results as a bar chart in Table"); - List<XBarGraphLine> lines = new ArrayList<XBarGraphLine>(); + List<XBarGraphLine> lines = new ArrayList<>(); lines.add(XBarGraphLine.getPercentLine("Fix", 34)); lines.add(XBarGraphLine.getPercentLine("Improvement", 100)); lines.add(new XBarGraphLine("Support", SWT.COLOR_GREEN, SWT.COLOR_YELLOW, SWT.COLOR_RED, SWT.COLOR_YELLOW, 33, "33%", "67%")); - List<XBarGraphLineSegment> segments = new ArrayList<XBarGraphLineSegment>(); + List<XBarGraphLineSegment> segments = new ArrayList<>(); segments.add(XBarGraphLineSegment.getPercentSegment("23%", SWT.COLOR_GREEN, 23)); segments.add(XBarGraphLineSegment.getPercentSegment("45%", SWT.COLOR_BLUE, 45)); segments.add(XBarGraphLineSegment.getPercentSegment("20%", SWT.COLOR_YELLOW, 20)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java index 3cdf505c5e5..635b530ca09 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java @@ -71,7 +71,7 @@ public class ChangeXViewer extends XViewer { } private ArrayList<Change> getSelectedChanges() { - ArrayList<Change> arts = new ArrayList<Change>(); + ArrayList<Change> arts = new ArrayList<>(); TreeItem items[] = getTree().getSelection(); if (items.length > 0) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java index 30235387e4d..ca7bbd78b72 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java @@ -34,8 +34,8 @@ public class DefaultHierarchySorter implements Comparator<Artifact> { @Override public int compare(Artifact firstArtifact, Artifact secondArtifact) { - List<Artifact> firstArtifactsParentList = new ArrayList<Artifact>(); - List<Artifact> secondArtifactParentList = new ArrayList<Artifact>(); + List<Artifact> firstArtifactsParentList = new ArrayList<>(); + List<Artifact> secondArtifactParentList = new ArrayList<>(); try { firstArtifactsParentList = populateParent(firstArtifact, firstArtifactsParentList); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java index f64ee80e3b0..4ca80f8f9a5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java @@ -88,7 +88,7 @@ class DiffHandler extends AbstractSelectionEnabledHandler { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - artifacts = new LinkedList<Artifact>(); + artifacts = new LinkedList<>(); List<Conflict> conflicts = Handlers.getConflictsFromStructuredSelection(structuredSelection); if (conflicts.size() != 1) { return false; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeCustomMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeCustomMenu.java index d12e48e97d5..8cea92df213 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeCustomMenu.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeCustomMenu.java @@ -488,7 +488,7 @@ public class MergeCustomMenu extends XViewerCustomMenu { @Override public boolean isEnabledWithException(IStructuredSelection structuredSelection) throws OseeCoreException { - artifacts = new LinkedList<Artifact>(); + artifacts = new LinkedList<>(); List<Conflict> conflicts = Handlers.getConflictsFromStructuredSelection(structuredSelection); for (Conflict conflict : conflicts) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java index b7c2b918b44..907fa59982e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java @@ -691,8 +691,8 @@ public class MergeXWidget extends GenericXWidget { Conflict[] conflicts = getConflicts(); if (conflicts.length != 0) { if (conflicts[0].getSourceBranch() != null) { - ArrayList<String> selections = new ArrayList<String>(); - ArrayList<Long> branchUuids = new ArrayList<Long>(); + ArrayList<String> selections = new ArrayList<>(); + ArrayList<Long> branchUuids = new ArrayList<>(); try { Collection<Long> destBranches = ConflictManagerInternal.getDestinationBranchesMerged(sourceBranch.getUuid()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java index 23d6786d9aa..54d1b30a93f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java @@ -78,7 +78,7 @@ public class ThreeWayWordMergeOperation extends AbstractOperation { Artifact startArtifact = MergeUtility.getStartArtifact(attributeConflict); monitor.worked(5); - List<IFile> outputFiles = new ArrayList<IFile>(); + List<IFile> outputFiles = new ArrayList<>(); createMergeDiffFile(outputFiles, startArtifact, attributeConflict.getSourceArtifact()); monitor.worked(15); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java index 47637bb9c07..89912a9779e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java @@ -71,7 +71,7 @@ public class SkynetCustomizations implements IXViewerCustomizations, IArtifactEv @Override public List<CustomizeData> getSavedCustDatas() throws OseeCoreException { ensurePopulated(false); - List<CustomizeData> thisCustDatas = new ArrayList<CustomizeData>(); + List<CustomizeData> thisCustDatas = new ArrayList<>(); for (CustomizeData custData : custDatas) { if (custData.getNameSpace().equals(this.skynetXViewerFactory.getNamespace())) { thisCustDatas.add(custData); @@ -215,7 +215,7 @@ public class SkynetCustomizations implements IXViewerCustomizations, IArtifactEv private static List<CustomizeData> getArtifactCustomizations(Artifact customizationArtifact) throws OseeCoreException { // ElapsedTime time = new ElapsedTime("getArtifactCustomizations"); - List<CustomizeData> custDatas = new ArrayList<CustomizeData>(); + List<CustomizeData> custDatas = new ArrayList<>(); if (customizationArtifact != null) { Collection<Attribute<String>> attributes = diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java index f572a0fbc68..e84cc1df4fd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java @@ -31,7 +31,7 @@ import org.eclipse.osee.framework.ui.skynet.internal.Activator; * @author Donald G. Dunne */ public class SkynetUserArtifactCustomizeDefaults { - Set<String> defaultGuids = new HashSet<String>(); + Set<String> defaultGuids = new HashSet<>(); private static String DEFAULT_CUST_GUID_TAG = "defaultCustGuid"; private final User user; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java index 4407c280857..c42345b0d4a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java @@ -88,7 +88,7 @@ public class SkynetXViewerFactory extends XViewerFactory { } public static List<XViewerColumn> getAllAttributeColumns() throws OseeCoreException { - List<XViewerColumn> columns = new ArrayList<XViewerColumn>(); + List<XViewerColumn> columns = new ArrayList<>(); for (AttributeType attributeType : AttributeTypeManager.getAllTypes()) { columns.add(getAttributeColumn(attributeType)); } @@ -104,9 +104,9 @@ public class SkynetXViewerFactory extends XViewerFactory { * @return columns for attributes valid for at least on of the given artifacts; those with content first */ public static List<XViewerColumn> getAllAttributeColumnsForArtifacts(Collection<? extends Artifact> artifacts) throws OseeCoreException { - List<XViewerColumn> columns = new ArrayList<XViewerColumn>(); - Set<IAttributeType> attrTypesUsed = new HashSet<IAttributeType>(); - Set<IAttributeType> attributeTypes = new HashSet<IAttributeType>(); + List<XViewerColumn> columns = new ArrayList<>(); + Set<IAttributeType> attrTypesUsed = new HashSet<>(); + Set<IAttributeType> attributeTypes = new HashSet<>(); try { for (Artifact art : artifacts) { attributeTypes.addAll(art.getAttributeTypes()); @@ -119,7 +119,7 @@ public class SkynetXViewerFactory extends XViewerFactory { } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } - Set<String> attrNames = new HashSet<String>(); + Set<String> attrNames = new HashSet<>(); // Add Name first columns.add(new ArtifactNameColumn(true)); attrNames.add("Name"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java index 75ddfe3a471..2ad1ea2af70 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/column/HierarchyIndexColumn.java @@ -33,7 +33,7 @@ import com.google.common.cache.CacheBuilder; * @author Ryan D. Brooks */ public class HierarchyIndexColumn extends XViewerValueColumn { - private final Set<Artifact> strongArtifactRefs = new HashSet<Artifact>(); + private final Set<Artifact> strongArtifactRefs = new HashSet<>(); public static HierarchyIndexColumn instance = new HierarchyIndexColumn(); |