diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.ui.skynet')
40 files changed, 1059 insertions, 834 deletions
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 cf10b1b043b..5282d881ae3 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 @@ -1,213 +1,213 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.access;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.logging.Level;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.osee.framework.access.AccessControlData;
-import org.eclipse.osee.framework.access.AccessControlManager;
-import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.UserManager;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
-import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * GUI that is used to maintain an <Code>Artifact</Code> access control list.
- *
- * @author Jeff C. Phillips
- */
-public class PolicyDialog extends Dialog {
- private PolicyTableViewer policyTableViewer;
- private Button btnAdd;
- private Button chkChildrenPermission;
- private Combo cmbUsers;
- private Combo cmbPermissionLevel;
- private final Object accessControlledObject;
- private Label accessLabel;
-
- public PolicyDialog(Shell parentShell, Object accessControlledObject) {
- super(parentShell);
-
- this.accessControlledObject = accessControlledObject;
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | getDefaultOrientation() | SWT.RESIZE);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- getShell().setText("Access Control List: " + getHeaderName(accessControlledObject));
- Composite mainComposite = new Composite(parent, SWT.NONE);
- mainComposite.setFont(parent.getFont());
- mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- mainComposite.setLayout(new GridLayout(1, false));
-
- addDialogContols(mainComposite);
- try {
- setInputs();
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- addListeners();
- checkEnabled();
-
- return mainComposite;
- }
-
- private void setInputs() throws OseeCoreException {
- cmbUsers.setText("-Select Person-");
- cmbPermissionLevel.setText("-Select Permission-");
-
- ArrayList<Artifact> subjectList = new ArrayList<Artifact>();
- subjectList.addAll(UserManager.getUsersSortedByName());
- subjectList.addAll(ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.UserGroup,
- BranchManager.getCommonBranch()));
- Collections.sort(subjectList, new UserComparator<Artifact>());
- for (Artifact subject : subjectList) {
- String name = subject.getName();
- cmbUsers.add(name);
- cmbUsers.setData(name, subject);
- }
-
- PermissionEnum[] permissions = PermissionEnum.values();
- Arrays.sort(permissions, new Comparator<PermissionEnum>() {
-
- @Override
- public int compare(PermissionEnum o1, PermissionEnum o2) {
- return o1.getName().compareToIgnoreCase(o2.getName());
- }
- });
-
- for (PermissionEnum permission : permissions) {
- if (!permission.equals(PermissionEnum.LOCK)) {
- cmbPermissionLevel.add(permission.getName() + " - Rank = " + permission.getRank() + "");
- cmbPermissionLevel.setData(permission.getName(), permission);
- }
- }
- }
-
- private void addListeners() {
- btnAdd.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- Artifact subject = (Artifact) cmbUsers.getData(cmbUsers.getText().replaceAll(" - Rank.*", ""));
- PermissionEnum permission =
- (PermissionEnum) cmbPermissionLevel.getData(cmbPermissionLevel.getText().replaceAll(" - Rank.*", ""));
-
- if (subject != null && permission != null) {
- policyTableViewer.addItem(subject, accessControlledObject, permission);
- }
- }
- });
- }
-
- private void addDialogContols(Composite mainComposite) {
-
- accessLabel = new Label(mainComposite, SWT.NONE);
-
- Group group = new Group(mainComposite, SWT.NULL);
- group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- group.setLayout(new GridLayout(1, false));
-
- policyTableViewer = new PolicyTableViewer(group, accessControlledObject);
-
- Composite composite = new Composite(group, SWT.NONE);
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- composite.setLayout(new GridLayout(4, false));
-
- cmbUsers = new Combo(composite, SWT.NONE);
- cmbPermissionLevel = new Combo(composite, SWT.NONE);
- btnAdd = new Button(composite, SWT.PUSH);
- btnAdd.setText("Add");
- new Label(composite, SWT.NONE).setText(" NOTE: Higher permission rank overrides lower rank.");
-
- chkChildrenPermission = new Button(mainComposite, SWT.CHECK);
- chkChildrenPermission.setText("Set permission for artifact's default hierarchy descendents.");
- }
-
- private void checkEnabled() {
- boolean accessEnabled = getAccessEnabled();
-
- accessLabel.setText(accessEnabled ? "" : "You do not have permissions to modify access.");
-
- boolean isArtifact = accessControlledObject instanceof Artifact;
-
- cmbUsers.setEnabled(accessEnabled);
- cmbPermissionLevel.setEnabled(accessEnabled);
- btnAdd.setEnabled(accessEnabled);
- policyTableViewer.allowTableModification(accessEnabled);
- chkChildrenPermission.setEnabled(isArtifact);
- }
-
- private boolean getAccessEnabled() {
- boolean returnValue;
-
- try {
- returnValue = AccessControlManager.hasPermission(accessControlledObject, PermissionEnum.WRITE);
- } catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- returnValue = false;
- }
-
- return returnValue;
- }
-
- @Override
- protected void okPressed() {
- for (AccessControlData data : policyTableViewer.getAccessControlList().values()) {
- if (data.isDirty()) {
- boolean isRecursionAllowed = chkChildrenPermission.getSelection();
- AccessControlManager.persistPermission(data, isRecursionAllowed);
- }
- }
- super.okPressed();
- }
-
- private String getHeaderName(Object object) {
- String name = "";
- if (object instanceof Artifact) {
- name = ((Artifact) object).getName();
- } else if (object instanceof Branch) {
- name = ((Branch) object).getName();
- }
- return name;
- }
-
- private static final class UserComparator<T> implements Comparator<T> {
- @Override
- public int compare(T o1, T o2) {
- if (o1 instanceof Artifact && o2 instanceof Artifact) {
- return ((Artifact) o1).getName().compareToIgnoreCase(((Artifact) o2).getName());
- }
- return 0;
- }
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.access; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.logging.Level; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.osee.framework.access.AccessControlData; +import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.Branch; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.UserManager; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; +import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; + +/** + * GUI that is used to maintain an <Code>Artifact</Code> access control list. + * + * @author Jeff C. Phillips + */ +public class PolicyDialog extends Dialog { + private PolicyTableViewer policyTableViewer; + private Button btnAdd; + private Button chkChildrenPermission; + private Combo cmbUsers; + private Combo cmbPermissionLevel; + private final Object accessControlledObject; + private Label accessLabel; + + public PolicyDialog(Shell parentShell, Object accessControlledObject) { + super(parentShell); + + this.accessControlledObject = accessControlledObject; + setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | getDefaultOrientation() | SWT.RESIZE); + } + + @Override + protected Control createDialogArea(Composite parent) { + getShell().setText("Access Control List: " + getHeaderName(accessControlledObject)); + Composite mainComposite = new Composite(parent, SWT.NONE); + mainComposite.setFont(parent.getFont()); + mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + mainComposite.setLayout(new GridLayout(1, false)); + + addDialogContols(mainComposite); + try { + setInputs(); + } catch (Exception ex) { + OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + } + addListeners(); + checkEnabled(); + + return mainComposite; + } + + private void setInputs() throws OseeCoreException { + cmbUsers.setText("-Select Person-"); + cmbPermissionLevel.setText("-Select Permission-"); + + ArrayList<Artifact> subjectList = new ArrayList<Artifact>(); + subjectList.addAll(UserManager.getUsersSortedByName()); + subjectList.addAll(ArtifactQuery.getArtifactListFromType(CoreArtifactTypes.UserGroup, + BranchManager.getCommonBranch())); + Collections.sort(subjectList, new UserComparator<Artifact>()); + for (Artifact subject : subjectList) { + String name = subject.getName(); + cmbUsers.add(name); + cmbUsers.setData(name, subject); + } + + PermissionEnum[] permissions = PermissionEnum.values(); + Arrays.sort(permissions, new Comparator<PermissionEnum>() { + + @Override + public int compare(PermissionEnum o1, PermissionEnum o2) { + return o1.getName().compareToIgnoreCase(o2.getName()); + } + }); + + for (PermissionEnum permission : permissions) { + if (!permission.equals(PermissionEnum.LOCK)) { + cmbPermissionLevel.add(permission.getName() + " - Rank = " + permission.getRank() + ""); + cmbPermissionLevel.setData(permission.getName(), permission); + } + } + } + + private void addListeners() { + btnAdd.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Artifact subject = (Artifact) cmbUsers.getData(cmbUsers.getText().replaceAll(" - Rank.*", "")); + PermissionEnum permission = + (PermissionEnum) cmbPermissionLevel.getData(cmbPermissionLevel.getText().replaceAll(" - Rank.*", "")); + + if (subject != null && permission != null) { + policyTableViewer.addItem(subject, accessControlledObject, permission); + } + } + }); + } + + private void addDialogContols(Composite mainComposite) { + + accessLabel = new Label(mainComposite, SWT.NONE); + + Group group = new Group(mainComposite, SWT.NULL); + group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + group.setLayout(new GridLayout(1, false)); + + policyTableViewer = new PolicyTableViewer(group, accessControlledObject); + + Composite composite = new Composite(group, SWT.NONE); + composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); + composite.setLayout(new GridLayout(4, false)); + + cmbUsers = new Combo(composite, SWT.NONE); + cmbPermissionLevel = new Combo(composite, SWT.NONE); + btnAdd = new Button(composite, SWT.PUSH); + btnAdd.setText("Add"); + new Label(composite, SWT.NONE).setText(" NOTE: Higher permission rank overrides lower rank."); + + chkChildrenPermission = new Button(mainComposite, SWT.CHECK); + chkChildrenPermission.setText("Set permission for artifact's default hierarchy descendents."); + } + + private void checkEnabled() { + boolean accessEnabled = getAccessEnabled(); + + accessLabel.setText(accessEnabled ? "" : "You do not have permissions to modify access."); + + boolean isArtifact = accessControlledObject instanceof Artifact; + + cmbUsers.setEnabled(accessEnabled); + cmbPermissionLevel.setEnabled(accessEnabled); + btnAdd.setEnabled(accessEnabled); + policyTableViewer.allowTableModification(accessEnabled); + chkChildrenPermission.setEnabled(isArtifact); + } + + private boolean getAccessEnabled() { + boolean returnValue; + + try { + returnValue = AccessControlManager.hasPermission(accessControlledObject, PermissionEnum.WRITE); + } catch (OseeCoreException ex) { + OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + returnValue = false; + } + + return returnValue; + } + + @Override + protected void okPressed() { + for (AccessControlData data : policyTableViewer.getAccessControlList().values()) { + if (data.isDirty()) { + boolean isRecursionAllowed = chkChildrenPermission.getSelection(); + AccessControlManager.persistPermission(data, isRecursionAllowed); + } + } + super.okPressed(); + } + + private String getHeaderName(Object object) { + String name = ""; + if (object instanceof Artifact) { + name = ((Artifact) object).getName(); + } else if (object instanceof Branch) { + name = ((Branch) object).getName(); + } + return name; + } + + private static final class UserComparator<T> implements Comparator<T> { + @Override + public int compare(T o1, T o2) { + if (o1 instanceof Artifact && o2 instanceof Artifact) { + return ((Artifact) o1).getName().compareToIgnoreCase(((Artifact) o2).getName()); + } + return 0; + } + } +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java index 09fca9e5139..0bb3ec7c30d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyLabelProvider.java @@ -1,95 +1,95 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.access;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
-import org.eclipse.osee.framework.access.AccessControlData;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-import org.eclipse.swt.graphics.Image;
-
-public class PolicyLabelProvider extends XViewerLabelProvider {
-
- public PolicyLabelProvider(XViewer viewer) {
- super(viewer);
- }
-
- @Override
- public String getColumnText(Object element, XViewerColumn col, int columnIndex) throws Exception {
- String ret;
- try {
- ret = getColumnText(col, (AccessControlData) element);
- } catch (Exception ex) {
- ret = "Error: " + ex.getLocalizedMessage();
- }
-
- return ret;
- }
-
- private String getColumnText(XViewerColumn col, AccessControlData data) {
- String colId = col.getId();
- if (colId.equals(PolicyTableColumns.userName.toString())) {
- return data.getSubject().getName();
- } else {
- PermissionEnum permissionEnum = null;
- if (colId.equals(PolicyTableColumns.totalAccess.toString())) {
- permissionEnum = data.getPermission();
- } else if (colId.equals(PolicyTableColumns.branchAccess.toString())) {
- permissionEnum = data.getBranchPermission();
- } else if (colId.equals(PolicyTableColumns.artifactType.toString())) {
- permissionEnum = data.getArtifactTypePermission();
- } else if (colId.equals(PolicyTableColumns.artifact.toString())) {
- permissionEnum = data.getArtifactPermission();
- }
-
- if (permissionEnum != null) {
- return permissionEnum.getName();
- }
- }
-
- return "";
- }
-
- @Override
- public Image getColumnImage(Object element, XViewerColumn col, int columnIndex) throws Exception {
- String colId = col.getId();
- if (colId.equals(PolicyTableColumns.delete.toString())) {
- return ImageManager.getImage(FrameworkImage.REMOVE);
- } else {
- return null;
- }
- }
-
- @Override
- public void dispose() {
- // do nothing
- }
-
- @Override
- public void removeListener(ILabelProviderListener listener) {
- // do nothing
- }
-
- @Override
- public void addListener(ILabelProviderListener listener) {
- // do nothing
- }
-
- @Override
- public boolean isLabelProperty(Object element, String property) {
- return true;
- }
-
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.access; + +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.nebula.widgets.xviewer.XViewer; +import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; +import org.eclipse.osee.framework.access.AccessControlData; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.swt.ImageManager; +import org.eclipse.swt.graphics.Image; + +public class PolicyLabelProvider extends XViewerLabelProvider { + + public PolicyLabelProvider(XViewer viewer) { + super(viewer); + } + + @Override + public String getColumnText(Object element, XViewerColumn col, int columnIndex) throws Exception { + String ret; + try { + ret = getColumnText(col, (AccessControlData) element); + } catch (Exception ex) { + ret = "Error: " + ex.getLocalizedMessage(); + } + + return ret; + } + + private String getColumnText(XViewerColumn col, AccessControlData data) { + String colId = col.getId(); + if (colId.equals(PolicyTableColumns.userName.toString())) { + return data.getSubject().getName(); + } else { + PermissionEnum permissionEnum = null; + if (colId.equals(PolicyTableColumns.totalAccess.toString())) { + permissionEnum = data.getPermission(); + } else if (colId.equals(PolicyTableColumns.branchAccess.toString())) { + permissionEnum = data.getBranchPermission(); + } else if (colId.equals(PolicyTableColumns.artifactType.toString())) { + permissionEnum = data.getArtifactTypePermission(); + } else if (colId.equals(PolicyTableColumns.artifact.toString())) { + permissionEnum = data.getArtifactPermission(); + } + + if (permissionEnum != null) { + return permissionEnum.getName(); + } + } + + return ""; + } + + @Override + public Image getColumnImage(Object element, XViewerColumn col, int columnIndex) throws Exception { + String colId = col.getId(); + if (colId.equals(PolicyTableColumns.delete.toString())) { + return ImageManager.getImage(FrameworkImage.REMOVE); + } else { + return null; + } + } + + @Override + public void dispose() { + // do nothing + } + + @Override + public void removeListener(ILabelProviderListener listener) { + // do nothing + } + + @Override + public void addListener(ILabelProviderListener listener) { + // do nothing + } + + @Override + public boolean isLabelProperty(Object element, String property) { + return true; + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java index 13fc638ff4b..502d508921d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableCellModifier.java @@ -1,72 +1,72 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.access;
-
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.osee.framework.access.AccessControlData;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * @author Jeff C. Phillips
- */
-public class PolicyTableCellModifier implements ICellModifier {
-
- private final PolicyTableViewer policyTableViewer;
- private boolean enabled = true;
-
- public PolicyTableCellModifier(PolicyTableViewer policyTableViewer) {
- super();
- this.policyTableViewer = policyTableViewer;
- }
-
- @Override
- public boolean canModify(Object element, String property) {
- if (property.equals(PolicyTableColumns.delete.toString())) {
- return true;
- }
- return false;
- }
-
- @Override
- public Object getValue(Object element, String property) {
- if (property.equals(PolicyTableColumns.delete.toString())) {
- return new Boolean(false);
- } else if (property.equals(PolicyTableColumns.artifact.toString())) {
- return ((AccessControlData) element).getPermission().ordinal();
- }
- return "";
- }
-
- @Override
- public void modify(Object element, String property, Object value) {
- TreeItem item = (TreeItem) element;
- AccessControlData data = (AccessControlData) item.getData();
-
- if (property.equals(PolicyTableColumns.delete.toString())) {
- policyTableViewer.removeData(data);
- }
-
- policyTableViewer.refresh();
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- /**
- * Don't disable entire viewer, just delete button
- *
- * @param enabled the enabled to set
- */
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.access; + +import org.eclipse.jface.viewers.ICellModifier; +import org.eclipse.osee.framework.access.AccessControlData; +import org.eclipse.swt.widgets.TreeItem; + +/** + * @author Jeff C. Phillips + */ +public class PolicyTableCellModifier implements ICellModifier { + + private final PolicyTableViewer policyTableViewer; + private boolean enabled = true; + + public PolicyTableCellModifier(PolicyTableViewer policyTableViewer) { + super(); + this.policyTableViewer = policyTableViewer; + } + + @Override + public boolean canModify(Object element, String property) { + if (property.equals(PolicyTableColumns.delete.toString())) { + return true; + } + return false; + } + + @Override + public Object getValue(Object element, String property) { + if (property.equals(PolicyTableColumns.delete.toString())) { + return new Boolean(false); + } else if (property.equals(PolicyTableColumns.artifact.toString())) { + return ((AccessControlData) element).getPermission().ordinal(); + } + return ""; + } + + @Override + public void modify(Object element, String property, Object value) { + TreeItem item = (TreeItem) element; + AccessControlData data = (AccessControlData) item.getData(); + + if (property.equals(PolicyTableColumns.delete.toString())) { + policyTableViewer.removeData(data); + } + + policyTableViewer.refresh(); + } + + public boolean isEnabled() { + return enabled; + } + + /** + * Don't disable entire viewer, just delete button + * + * @param enabled the enabled to set + */ + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableColumns.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableColumns.java index ea3027db085..6ce53cfabd5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableColumns.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableColumns.java @@ -1,56 +1,56 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.access;
-
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
-import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-
-public enum PolicyTableColumns {
- dummyColumn("---", 0, 1 << 14, true, SortDataType.String, false, ""),
- delete("", 25, 1 << 24, true, SortDataType.String, false, ""),
- userName("User Name", 160, 1 << 14, true, SortDataType.String, false, ""),
- totalAccess("Total", 75, 1 << 14, true, SortDataType.String, false, ""),
- branchAccess("Branch", 75, 1 << 14, true, SortDataType.String, false, ""),
- artifactType("Artifact Type", 75, 1 << 14, true, SortDataType.String, false, ""),
- artifact("Artifact", 75, 1 << 14, true, SortDataType.String, false, "");
-
- private final String label;
- private final int width;
- private final int SWT;
- private final boolean show;
- private final SortDataType sortType;
- private final boolean multiColumnEditable;
- private final String description;
-
- private PolicyTableColumns(String label, int width, int SWT, boolean show, SortDataType sortType, boolean multiColumnEditable, String description) {
- this.label = label;
- this.width = width;
- this.SWT = SWT;
- this.show = show;
- this.sortType = sortType;
- this.multiColumnEditable = multiColumnEditable;
- this.description = description;
- }
-
- public final XViewerColumn getXViewerColumn() {
- return new XViewerColumn(this.toString(), label, width, SWT, show, sortType, multiColumnEditable, description);
- }
-
- public static String[] getNames() {
- String[] ret = new String[PolicyTableColumns.values().length];
- PolicyTableColumns[] columns = PolicyTableColumns.values();
- for (int i = 0; i < PolicyTableColumns.values().length; i++) {
- ret[i] = columns[i].toString();
- }
-
- return ret;
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.access; + +import org.eclipse.nebula.widgets.xviewer.XViewerColumn; +import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType; + +public enum PolicyTableColumns { + dummyColumn("---", 0, 1 << 14, true, SortDataType.String, false, ""), + delete("", 25, 1 << 24, true, SortDataType.String, false, ""), + userName("User Name", 160, 1 << 14, true, SortDataType.String, false, ""), + totalAccess("Total", 75, 1 << 14, true, SortDataType.String, false, ""), + branchAccess("Branch", 75, 1 << 14, true, SortDataType.String, false, ""), + artifactType("Artifact Type", 75, 1 << 14, true, SortDataType.String, false, ""), + artifact("Artifact", 75, 1 << 14, true, SortDataType.String, false, ""); + + private final String label; + private final int width; + private final int SWT; + private final boolean show; + private final SortDataType sortType; + private final boolean multiColumnEditable; + private final String description; + + private PolicyTableColumns(String label, int width, int SWT, boolean show, SortDataType sortType, boolean multiColumnEditable, String description) { + this.label = label; + this.width = width; + this.SWT = SWT; + this.show = show; + this.sortType = sortType; + this.multiColumnEditable = multiColumnEditable; + this.description = description; + } + + public final XViewerColumn getXViewerColumn() { + return new XViewerColumn(this.toString(), label, width, SWT, show, sortType, multiColumnEditable, description); + } + + public static String[] getNames() { + String[] ret = new String[PolicyTableColumns.values().length]; + PolicyTableColumns[] columns = PolicyTableColumns.values(); + for (int i = 0; i < PolicyTableColumns.values().length; i++) { + ret[i] = columns[i].toString(); + } + + return ret; + } +} 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 e5d1f6528ac..b80252c1bb9 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 @@ -1,108 +1,108 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.access;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.nebula.widgets.xviewer.XViewer;
-import org.eclipse.osee.framework.access.AccessControlData;
-import org.eclipse.osee.framework.access.AccessControlManager;
-import org.eclipse.osee.framework.access.AccessObject;
-import org.eclipse.osee.framework.core.enums.PermissionEnum;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.PolicyTableXViewerFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Displays an <Code>Artifact</Code> access control list, used by the <Code>PolicyDialog</Code>.
- *
- * @author Jeff C. Phillips
- */
-public class PolicyTableViewer {
-
- private final Map<String, AccessControlData> accessControlList = new HashMap<String, AccessControlData>();
- private final Object object;
- private final Composite parent;
-
- private XViewer tableXViewer;
-
- public PolicyTableViewer(Composite parent, Object object) {
- this.parent = parent;
- this.object = object;
-
- createControl();
- }
-
- public void allowTableModification(boolean allow) {
- ((PolicyTableCellModifier) tableXViewer.getCellModifier()).setEnabled(allow);
- }
-
- public void addItem(Artifact subject, Object object, PermissionEnum permission) {
- AccessObject accessObject = AccessControlManager.getAccessObject(object);
- AccessControlData data = new AccessControlData(subject, accessObject, permission, true);
- accessControlList.put(data.getSubject().getGuid(), data);
- tableXViewer.refresh();
- }
-
- private void createControl() {
- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
- gd.heightHint = 150;
- gd.widthHint = 500;
-
- tableXViewer = new XViewer(parent, SWT.BORDER | SWT.FULL_SELECTION, new PolicyTableXViewerFactory(), true, true);
- tableXViewer.setUseHashlookup(true);
- tableXViewer.setColumnProperties(PolicyTableColumns.getNames());
- tableXViewer.getTree().setLayoutData(gd);
-
- CellEditor[] validEditors = new CellEditor[PolicyTableColumns.values().length];
- validEditors[1] = new CheckboxCellEditor(parent, SWT.NONE);
- // validEditors[Columns.Artifact.ordinal()] =
- // new ComboBoxCellEditor(table, PermissionEnum.getPermissionNames(), SWT.READ_ONLY);
- tableXViewer.setCellEditors(validEditors);
- tableXViewer.setCellModifier(new PolicyTableCellModifier(this));
- tableXViewer.setContentProvider(new PolicyContentProvider(accessControlList, object));
- tableXViewer.setLabelProvider(new PolicyLabelProvider(tableXViewer));
- tableXViewer.setInput(accessControlList.values());
- }
-
- public Map<String, AccessControlData> getAccessControlList() {
- return accessControlList;
- }
-
- public void refresh() {
- tableXViewer.refresh();
- }
-
- public void removeData(AccessControlData data) {
- try {
- AccessControlManager.removeAccessControlDataIf(true, data);
- } catch (OseeDataStoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
- accessControlList.remove(data.getSubject().getGuid());
- }
-
- public void modifyPermissionLevel(AccessControlData data, PermissionEnum permission) {
- data.setPermission(permission);
- }
-
- public int getCount() {
- return accessControlList.size();
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.access; + +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.CheckboxCellEditor; +import org.eclipse.nebula.widgets.xviewer.XViewer; +import org.eclipse.osee.framework.access.AccessControlData; +import org.eclipse.osee.framework.access.AccessControlManager; +import org.eclipse.osee.framework.access.AccessObject; +import org.eclipse.osee.framework.core.enums.PermissionEnum; +import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.PolicyTableXViewerFactory; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; + +/** + * Displays an <Code>Artifact</Code> access control list, used by the <Code>PolicyDialog</Code>. + * + * @author Jeff C. Phillips + */ +public class PolicyTableViewer { + + private final Map<String, AccessControlData> accessControlList = new HashMap<String, AccessControlData>(); + private final Object object; + private final Composite parent; + + private XViewer tableXViewer; + + public PolicyTableViewer(Composite parent, Object object) { + this.parent = parent; + this.object = object; + + createControl(); + } + + public void allowTableModification(boolean allow) { + ((PolicyTableCellModifier) tableXViewer.getCellModifier()).setEnabled(allow); + } + + public void addItem(Artifact subject, Object object, PermissionEnum permission) { + AccessObject accessObject = AccessControlManager.getAccessObject(object); + AccessControlData data = new AccessControlData(subject, accessObject, permission, true); + accessControlList.put(data.getSubject().getGuid(), data); + tableXViewer.refresh(); + } + + private void createControl() { + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); + gd.heightHint = 150; + gd.widthHint = 500; + + tableXViewer = new XViewer(parent, SWT.BORDER | SWT.FULL_SELECTION, new PolicyTableXViewerFactory(), true, true); + tableXViewer.setUseHashlookup(true); + tableXViewer.setColumnProperties(PolicyTableColumns.getNames()); + tableXViewer.getTree().setLayoutData(gd); + + CellEditor[] validEditors = new CellEditor[PolicyTableColumns.values().length]; + validEditors[1] = new CheckboxCellEditor(parent, SWT.NONE); + // validEditors[Columns.Artifact.ordinal()] = + // new ComboBoxCellEditor(table, PermissionEnum.getPermissionNames(), SWT.READ_ONLY); + tableXViewer.setCellEditors(validEditors); + tableXViewer.setCellModifier(new PolicyTableCellModifier(this)); + tableXViewer.setContentProvider(new PolicyContentProvider(accessControlList, object)); + tableXViewer.setLabelProvider(new PolicyLabelProvider(tableXViewer)); + tableXViewer.setInput(accessControlList.values()); + } + + public Map<String, AccessControlData> getAccessControlList() { + return accessControlList; + } + + public void refresh() { + tableXViewer.refresh(); + } + + public void removeData(AccessControlData data) { + try { + AccessControlManager.removeAccessControlDataIf(true, data); + } catch (OseeDataStoreException ex) { + OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + } + accessControlList.remove(data.getSubject().getGuid()); + } + + public void modifyPermissionLevel(AccessControlData data, PermissionEnum permission) { + data.setPermission(permission); + } + + public int getCount() { + return accessControlList.size(); + } +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java index fcf8ea5f256..ef0db852b02 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java @@ -1,56 +1,56 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.action;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-
-/**
- * @author Donald G. Dunne
- */
-public class CollapseAllAction extends Action {
-
- private final ICollapseAllHandler iCollapseAllHandler;
- private TreeViewer treeViewer;
-
- public static interface ICollapseAllHandler {
- public void expandAllActionHandler();
- }
-
- public CollapseAllAction(TreeViewer treeViewer) {
- this((ICollapseAllHandler) null);
- this.treeViewer = treeViewer;
- }
-
- public CollapseAllAction(ICollapseAllHandler iCollapseActionHandler) {
- this.iCollapseAllHandler = iCollapseActionHandler;
- setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.COLLAPSE_ALL));
- setToolTipText("Collapse All");
- }
-
- @Override
- public void run() {
- try {
- if (treeViewer != null) {
- treeViewer.collapseAll();
- } else {
- iCollapseAllHandler.expandAllActionHandler();
- }
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.action; + +import org.eclipse.jface.action.Action; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.swt.ImageManager; + +/** + * @author Donald G. Dunne + */ +public class CollapseAllAction extends Action { + + private final ICollapseAllHandler iCollapseAllHandler; + private TreeViewer treeViewer; + + public static interface ICollapseAllHandler { + public void expandAllActionHandler(); + } + + public CollapseAllAction(TreeViewer treeViewer) { + this((ICollapseAllHandler) null); + this.treeViewer = treeViewer; + } + + public CollapseAllAction(ICollapseAllHandler iCollapseActionHandler) { + this.iCollapseAllHandler = iCollapseActionHandler; + setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.COLLAPSE_ALL)); + setToolTipText("Collapse All"); + } + + @Override + public void run() { + try { + if (treeViewer != null) { + treeViewer.collapseAll(); + } else { + iCollapseAllHandler.expandAllActionHandler(); + } + } catch (Exception ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java index 14f00847b78..2e2e286ea80 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java @@ -1,66 +1,66 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.action;
-
-import java.util.ArrayList;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.core.model.TransactionRecord;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
-import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-
-/**
- * @author Donald G. Dunne
- */
-public class EditTransactionComment extends Action {
-
- private final ITransactionRecordSelectionProvider provider;
-
- public EditTransactionComment(ITransactionRecordSelectionProvider provider) {
- super("Edit Transaction Comment");
- this.provider = provider;
- }
-
- @Override
- public ImageDescriptor getImageDescriptor() {
- return ImageManager.getImageDescriptor(FrameworkImage.EDIT);
- }
-
- @Override
- public void run() {
- if (provider.getSelectedTransactionRecords().isEmpty()) {
- AWorkbench.popup("Transaction Record must be selected.");
- return;
- }
- ArrayList<TransactionRecord> records = provider.getSelectedTransactionRecords();
- EntryDialog ed = new EntryDialog("Edit Transaction Record Comment", "Enter Transaction Record comment");
- if (ed.open() == 0) {
- for (TransactionRecord record : records) {
- try {
- TransactionManager.setTransactionComment(record, ed.getEntry());
- record.setComment(ed.getEntry());
- } catch (OseeDataStoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
- provider.refreshUI(records);
- AWorkbench.popup("Transaction Record comment(s) updated.");
- }
-
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.action; + +import java.util.ArrayList; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.model.TransactionRecord; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; +import org.eclipse.osee.framework.ui.swt.ImageManager; + +/** + * @author Donald G. Dunne + */ +public class EditTransactionComment extends Action { + + private final ITransactionRecordSelectionProvider provider; + + public EditTransactionComment(ITransactionRecordSelectionProvider provider) { + super("Edit Transaction Comment"); + this.provider = provider; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return ImageManager.getImageDescriptor(FrameworkImage.EDIT); + } + + @Override + public void run() { + if (provider.getSelectedTransactionRecords().isEmpty()) { + AWorkbench.popup("Transaction Record must be selected."); + return; + } + ArrayList<TransactionRecord> records = provider.getSelectedTransactionRecords(); + EntryDialog ed = new EntryDialog("Edit Transaction Record Comment", "Enter Transaction Record comment"); + if (ed.open() == 0) { + for (TransactionRecord record : records) { + try { + TransactionManager.setTransactionComment(record, ed.getEntry()); + record.setComment(ed.getEntry()); + } catch (OseeDataStoreException ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } + provider.refreshUI(records); + AWorkbench.popup("Transaction Record comment(s) updated."); + } + + } +} diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java index 05f2396c47d..ccf92b751eb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java @@ -1,41 +1,41 @@ -/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.ui.skynet.action.browser;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.swt.ImageManager;
-
-/**
- * @author Donald G. Dunne
- */
-public class BrowserPrintAction extends Action {
-
- private final IBrowserActionHandler iBrowserActionHandler;
-
- public BrowserPrintAction(IBrowserActionHandler iBrowserActionHandler) {
- this.iBrowserActionHandler = iBrowserActionHandler;
- setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.PRINT));
- setToolTipText("Print");
- }
-
- @Override
- public void run() {
- try {
- iBrowserActionHandler.getBrowser().setUrl("javascript:print()");
- } catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- }
- }
-}
+/******************************************************************************* + * Copyright (c) 2004, 2007 Boeing. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Boeing - initial API and implementation + *******************************************************************************/ +package org.eclipse.osee.framework.ui.skynet.action.browser; + +import org.eclipse.jface.action.Action; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.FrameworkImage; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.swt.ImageManager; + +/** + * @author Donald G. Dunne + */ +public class BrowserPrintAction extends Action { + + private final IBrowserActionHandler iBrowserActionHandler; + + public BrowserPrintAction(IBrowserActionHandler iBrowserActionHandler) { + this.iBrowserActionHandler = iBrowserActionHandler; + setImageDescriptor(ImageManager.getImageDescriptor(FrameworkImage.PRINT)); + setToolTipText("Print"); + } + + @Override + public void run() { + try { + iBrowserActionHandler.getBrowser().setUrl("javascript:print()"); + } catch (Exception ex) { + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + } + } +} 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 e288bb0762d..bc1ff3ea909 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 @@ -176,7 +176,9 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler, IFr // Do not allow drop if default branch is not same as artifacts that reside in this table DropTarget target = new DropTarget(getTree(), DND.DROP_COPY); - target.setTransfer(new Transfer[] {FileTransfer.getInstance(), TextTransfer.getInstance(), + target.setTransfer(new Transfer[] { + FileTransfer.getInstance(), + TextTransfer.getInstance(), ArtifactTransfer.getInstance()}); target.addDropListener(new DropTargetAdapter() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java index 86f647d8bfe..f3dee653574 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ConsolidateRelationsTxOperation.java @@ -175,8 +175,12 @@ public class ConsolidateRelationsTxOperation extends AbstractDbTxOperation { if (isNextAddressing(netGammaId, transactionId)) { if (updateAddressing) { - updateAddressingData.add(new Object[] {previousNetGammaId, netModType.getValue(), - netTxCurrent.getValue(), previousTransactionId, previousObsoleteGammaId}); + updateAddressingData.add(new Object[] { + previousNetGammaId, + netModType.getValue(), + netTxCurrent.getValue(), + previousTransactionId, + previousObsoleteGammaId}); } updateAddressing = obsoleteGammaId != netGammaId; previousNetGammaId = netGammaId; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java index 8d2badc6581..0f8e66b58c5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PurgeArchivedBranch.java @@ -138,8 +138,11 @@ public class PurgeArchivedBranch extends AbstractBlam { rd.addRaw(AHTML.beginMultiColumnTable(100, 1)); rd.addRaw(AHTML.addHeaderRowMultiColumnTable(columnHeaders)); for (BranchInfo purgedBranch : branches) { - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {purgedBranch.getName(), purgedBranch.getId(), - purgedBranch.getArchived(), purgedBranch.getState()})); + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { + purgedBranch.getName(), + purgedBranch.getId(), + purgedBranch.getArchived(), + purgedBranch.getState()})); } rd.addRaw(AHTML.endMultiColumnTable()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java index bd5fb86d75b..ad93586bf95 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ResourceManipulation.java @@ -167,11 +167,22 @@ public class ResourceManipulation extends AbstractBlam { if (countlast + 1 != count) { System.out.println(""); } - System.out.println(count + " " + byt + " " + new String(new byte[] {originalData[count - 8], - originalData[count - 7], originalData[count - 6], originalData[count - 5], originalData[count - 4], - originalData[count - 3], originalData[count - 2], originalData[count - 1], originalData[count], - originalData[count + 1], originalData[count + 2], originalData[count + 3], originalData[count + 4], - originalData[count + 5], originalData[count + 6]}, "UTF-8")); + System.out.println(count + " " + byt + " " + new String(new byte[] { + originalData[count - 8], + originalData[count - 7], + originalData[count - 6], + originalData[count - 5], + originalData[count - 4], + originalData[count - 3], + originalData[count - 2], + originalData[count - 1], + originalData[count], + originalData[count + 1], + originalData[count + 2], + originalData[count + 3], + originalData[count + 4], + originalData[count + 5], + originalData[count + 6]}, "UTF-8")); countlast = count; } } @@ -185,11 +196,23 @@ public class ResourceManipulation extends AbstractBlam { if (countlast + 1 != count) { System.out.println(""); } - System.out.println(count + " " + byt + " " + new String(new byte[] {finalVersion[count - 9], - finalVersion[count - 8], finalVersion[count - 7], finalVersion[count - 6], finalVersion[count - 5], - finalVersion[count - 4], finalVersion[count - 3], finalVersion[count - 2], finalVersion[count - 1], - finalVersion[count], finalVersion[count + 1], finalVersion[count + 2], finalVersion[count + 3], - finalVersion[count + 4], finalVersion[count + 5], finalVersion[count + 6]}, "UTF-8")); + System.out.println(count + " " + byt + " " + new String(new byte[] { + finalVersion[count - 9], + finalVersion[count - 8], + finalVersion[count - 7], + finalVersion[count - 6], + finalVersion[count - 5], + finalVersion[count - 4], + finalVersion[count - 3], + finalVersion[count - 2], + finalVersion[count - 1], + finalVersion[count], + finalVersion[count + 1], + finalVersion[count + 2], + finalVersion[count + 3], + finalVersion[count + 4], + finalVersion[count + 5], + finalVersion[count + 6]}, "UTF-8")); countlast = count; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java index 1e42fa830e8..1688655743d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ShowRevertTransactions.java @@ -43,8 +43,10 @@ public class ShowRevertTransactions extends AbstractBlam { try { chStmt.runPreparedQuery(GET_REVERT_TRANSACTIONS); while (chStmt.next()) { - sbFull.append(AHTML.addRowMultiColumnTable(new String[] {String.valueOf(chStmt.getInt("branch_id")), - chStmt.getString("value"), String.valueOf(chStmt.getInt("transaction_id")), + sbFull.append(AHTML.addRowMultiColumnTable(new String[] { + String.valueOf(chStmt.getInt("branch_id")), + chStmt.getString("value"), + String.valueOf(chStmt.getInt("transaction_id")), chStmt.getDate("time").toString()})); } sbFull.append(AHTML.endMultiColumnTable()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UnicodeConverter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UnicodeConverter.java index e4f483a811b..96014d5b032 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UnicodeConverter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UnicodeConverter.java @@ -20,8 +20,14 @@ import java.util.Map; */
public class UnicodeConverter {
- private static final byte[] tickyQuoteBack = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -126,
- (byte) -84, (byte) -59, (byte) -109};
+ private static final byte[] tickyQuoteBack = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -59,
+ (byte) -109};
private static final String tickyQuoteBackString = "�";
private static final byte[] tickyQuoteBackGood = new byte[] {(byte) -30, (byte) -128, (byte) -100};
@@ -30,29 +36,60 @@ public class UnicodeConverter { private static final String degreeString = "�";
private static final byte[] degreeGood = new byte[] {(byte) -62, (byte) -80};
- private static final byte[] tickyQuoteForward = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -126,
- (byte) -84, (byte) -17, (byte) -65, (byte) -67};
+ private static final byte[] tickyQuoteForward = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -17,
+ (byte) -65,
+ (byte) -67};
private static final String tickyQuoteForwardString = "�";
private static final byte[] tickyQuoteForwardGood = new byte[] {(byte) -30, (byte) -128, (byte) -99};
- private static final byte[] notEquals = new byte[] {(byte) -61, (byte) -81, (byte) -30, (byte) -128, (byte) -102,
- (byte) -62, (byte) -71};
+ private static final byte[] notEquals = new byte[] {
+ (byte) -61,
+ (byte) -81,
+ (byte) -30,
+ (byte) -128,
+ (byte) -102,
+ (byte) -62,
+ (byte) -71};
private static final byte[] notEqualsGood = new byte[] {(byte) -17, (byte) -126, (byte) -71};
private static final String notEqualsString = " ";
//Renders as a ? in Java however appears as equal slash in Word
- private static final byte[] notEqualsForward = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -128,
- (byte) -80, (byte) -62, (byte) -96};
+ private static final byte[] notEqualsForward = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -128,
+ (byte) -80,
+ (byte) -62,
+ (byte) -96};
private static final String notEqualsForwardString = "Not Equals Forward";
private static final byte[] notEqualsForwardGood = new byte[] {(byte) -30, (byte) -119, (byte) -96};
- private static final byte[] greaterThanEquals = new byte[] {(byte) -61, (byte) -81, (byte) -30, (byte) -128,
- (byte) -102, (byte) -62, (byte) -77};
+ private static final byte[] greaterThanEquals = new byte[] {
+ (byte) -61,
+ (byte) -81,
+ (byte) -30,
+ (byte) -128,
+ (byte) -102,
+ (byte) -62,
+ (byte) -77};
private static final String greaterThanEqualsString = " ";
private static final byte[] greaterThanEqualsGood = new byte[] {(byte) -17, (byte) -126, (byte) -77};
- private static final byte[] lessThanEquals = new byte[] {(byte) -61, (byte) -81, (byte) -30, (byte) -128,
- (byte) -102, (byte) -62, (byte) -93};
+ private static final byte[] lessThanEquals = new byte[] {
+ (byte) -61,
+ (byte) -81,
+ (byte) -30,
+ (byte) -128,
+ (byte) -102,
+ (byte) -62,
+ (byte) -93};
private static final String lessThanEqualsString = " Less Than Equals";
private static final byte[] lessThanEqualsGood = new byte[] {(byte) -17, (byte) -126, (byte) -93};
@@ -67,21 +104,41 @@ public class UnicodeConverter { // new byte[] {(byte) -61, (byte) -81, (byte) -30, (byte) -128, (byte) -102, (byte) -62, (byte) -93};
private static final byte[] microCharacterGood = new byte[] {(byte) -62, (byte) -75};
- private static final byte[] forwardTick = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -126, (byte) -84,
- (byte) -30, (byte) -124, (byte) -94};
+ private static final byte[] forwardTick = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -30,
+ (byte) -124,
+ (byte) -94};
private static final String forwardTickString = "�";
private static final byte[] forwardTickGood = new byte[] {(byte) -30, (byte) -128, (byte) -103};
- private static final byte[] dash = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -126, (byte) -84,
- (byte) -30, (byte) -128, (byte) -100};
+ private static final byte[] dash = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -30,
+ (byte) -128,
+ (byte) -100};
private static final byte[] dashGood = new byte[] {(byte) -30, (byte) -128, (byte) -109};
private static final byte[] dotGood = new byte[] {(byte) -62, (byte) -73};
private static final byte[] plusMinusGood = new byte[] {(byte) -62, (byte) -79};
private static final byte[] miniOneGood = new byte[] {(byte) -62, (byte) -71};
- private static final byte[] whatisit = new byte[] {(byte) -61, (byte) -81, (byte) -30, (byte) -126, (byte) -84,
- (byte) -62, (byte) -67};
+ private static final byte[] whatisit = new byte[] {
+ (byte) -61,
+ (byte) -81,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -62,
+ (byte) -67};
private static final byte[] whatisitGood = new byte[] {(byte) -17, (byte) -128, (byte) -67};
private static final byte[] WHATISIT2 = new byte[] {(byte) -17, (byte) -126, (byte) -80};
@@ -89,12 +146,24 @@ public class UnicodeConverter { private static final byte[] WHATISIT4 = new byte[] {(byte) -49, (byte) -128};
private static final byte[] WHATISIT5 = new byte[] {(byte) -30, (byte) -119, (byte) -92};
- private static final byte[] upsideDownTick = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -126,
- (byte) -84, (byte) -53, (byte) -100};
+ private static final byte[] upsideDownTick = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -53,
+ (byte) -100};
private static final byte[] upsideDownTickGood = new byte[] {(byte) -30, (byte) -128, (byte) -104};
- private static final byte[] dotdotdot = new byte[] {(byte) -61, (byte) -94, (byte) -30, (byte) -126, (byte) -84,
- (byte) -62, (byte) -90};
+ private static final byte[] dotdotdot = new byte[] {
+ (byte) -61,
+ (byte) -94,
+ (byte) -30,
+ (byte) -126,
+ (byte) -84,
+ (byte) -62,
+ (byte) -90};
private static final byte[] dotdotdotGood = new byte[] {(byte) -30, (byte) -128, (byte) -90};
private static final byte[] lambdaGood = new byte[] {(byte) -62, (byte) -93};
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 c3f73009820..444e782e5e1 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 @@ -40,7 +40,8 @@ import org.eclipse.ui.menus.CommandContributionItemParameter; * @author Jeff C. Phillips */ public class CommitIntoParentCompoundContributionItem extends CompoundContributionItem { - private static final IParameter[] BRANCH_COMMIT_PARAMETER_DEF = new IParameter[] {new BranchIdParameter(), + private static final IParameter[] BRANCH_COMMIT_PARAMETER_DEF = new IParameter[] { + new BranchIdParameter(), new CommitBranchParameter()}; private ICommandService commandService; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java index 6c5cd6e8965..0a5d08fb7a6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java @@ -88,7 +88,9 @@ public class ArtifactIdWithoutVersionsCheck extends DatabaseHealthOperation { appendToDetails(AHTML.beginMultiColumnTable(100, 1)); appendToDetails(AHTML.addHeaderRowMultiColumnTable(new String[] {"TABLE", "REFERENCED_BY", "TOTAL INVALIDS"})); for (ItemEntry entry : itemsToDelete) { - appendToDetails(AHTML.addRowMultiColumnTable(new String[] {entry.table, entry.invalidField, + appendToDetails(AHTML.addRowMultiColumnTable(new String[] { + entry.table, + entry.invalidField, String.valueOf(entry.invalids.size())})); } appendToDetails(AHTML.endMultiColumnTable()); 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 311d2ae2cb2..80af9b4c5f4 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 @@ -56,8 +56,16 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { checkForCancelledStatus(monitor); appendToDetails(AHTML.beginMultiColumnTable(100, 1)); - appendToDetails(AHTML.addHeaderRowMultiColumnTable(new String[] {"Reason", "Was State", "Fixed State", - "BranchType", "Archived", "Txs", "Commit Tx", "BranchId", "Branch Name"})); + appendToDetails(AHTML.addHeaderRowMultiColumnTable(new String[] { + "Reason", + "Was State", + "Fixed State", + "BranchType", + "Archived", + "Txs", + "Commit Tx", + "BranchId", + "Branch Name"})); Collections.sort(itemsToFix, new Comparator<BranchData>() { @Override @@ -77,11 +85,16 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { }); for (BranchData data : itemsToFix) { - appendToDetails(AHTML.addRowMultiColumnTable(new String[] {data.getReason(), - String.valueOf(data.getOriginalBranchState()), String.valueOf(data.getBranchState()), - String.valueOf(data.getBranchType()), String.valueOf(data.isArchived()), - String.valueOf(data.getNumberOfTxs()), String.valueOf(data.hasCommitTransactionId()), - String.valueOf(data.getId()), data.getBranchName()})); + appendToDetails(AHTML.addRowMultiColumnTable(new String[] { + data.getReason(), + String.valueOf(data.getOriginalBranchState()), + String.valueOf(data.getBranchState()), + String.valueOf(data.getBranchType()), + String.valueOf(data.isArchived()), + String.valueOf(data.getNumberOfTxs()), + String.valueOf(data.hasCommitTransactionId()), + String.valueOf(data.getId()), + data.getBranchName()})); } appendToDetails(AHTML.endMultiColumnTable()); monitor.worked(calculateWork(0.25)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java index 5a44b5e9fe9..bd6a4b8869f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java @@ -104,8 +104,18 @@ public class DuplicateAttributes extends DatabaseHealthOperation { StringBuffer sbFull = new StringBuffer(AHTML.beginMultiColumnTable(100, 1)); try { String[] columnHeaders = - new String[] {"Art Id", "Attr id 1", "Attr id 2", "Name", "Value 1", "Value 2", "URI 1", "URI 2", - "Gamma ID 1", "Gamma Id 2", "ID to Delete"}; + new String[] { + "Art Id", + "Attr id 1", + "Attr id 2", + "Name", + "Value 1", + "Value 2", + "URI 1", + "URI 2", + "Gamma ID 1", + "Gamma Id 2", + "ID to Delete"}; sbFull.append(AHTML.beginMultiColumnTable(100, 1)); sbFull.append(AHTML.addHeaderRowMultiColumnTable(columnHeaders)); sbFull.append(AHTML.addRowSpanMultiColumnTable("Attributes with the same values", columnHeaders.length)); @@ -158,11 +168,18 @@ public class DuplicateAttributes extends DatabaseHealthOperation { AttributeData attributeData1 = duplicate.getAttributeData1(); AttributeData attributeData2 = duplicate.getAttributeData2(); - builder.append(AHTML.addRowMultiColumnTable(new String[] {String.valueOf(duplicate.getArtId()), - String.valueOf(attributeData1.getAttrId()), String.valueOf(attributeData2.getAttrId()), - duplicate.getName(), attributeData1.getValue(), attributeData2.getValue(), attributeData1.getUri(), - attributeData2.getUri(), String.valueOf(attributeData1.getGamma()), - String.valueOf(attributeData2.getGamma()), fixMessage})); + builder.append(AHTML.addRowMultiColumnTable(new String[] { + String.valueOf(duplicate.getArtId()), + String.valueOf(attributeData1.getAttrId()), + String.valueOf(attributeData2.getAttrId()), + duplicate.getName(), + attributeData1.getValue(), + attributeData2.getValue(), + attributeData1.getUri(), + attributeData2.getUri(), + String.valueOf(attributeData1.getGamma()), + String.valueOf(attributeData2.getGamma()), + fixMessage})); count++; } return count; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java index a2c0d6f1680..0a9b780317b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java @@ -114,13 +114,19 @@ public class DuplicateHRID extends DatabaseHealthOperation { if (results == null) { results = - new String[] {String.valueOf(getAdditionalCounts(COUNT_ATTRIBUTE_VALUES_CONTAINING, dup.hrid)), + new String[] { + String.valueOf(getAdditionalCounts(COUNT_ATTRIBUTE_VALUES_CONTAINING, dup.hrid)), String.valueOf(getAdditionalCounts(COUNT_COMMENTS_CONTAINING, dup.hrid)), String.valueOf(getAdditionalCounts(COUNT_BRANCH_NAMES_CONTAINING, dup.hrid))}; knownValues.put(dup.hrid, results); } - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {dup.guid, dup.hrid, dup.artTypeName, results[0], - results[1], results[2]})); + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { + dup.guid, + dup.hrid, + dup.artTypeName, + results[0], + results[1], + results[2]})); monitor.worked(stepAmount); } } else { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java index 31343d14646..d5b4ea881e6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/HealthHelper.java @@ -31,9 +31,12 @@ public class HealthHelper { public static final String ALL_BACKING_GAMMAS = "(SELECT gamma_id FROM osee_artifact UNION SELECT gamma_id FROM osee_attribute UNION SELECT gamma_id FROM osee_relation_link)"; - private static final String[] NO_TX_CURRENT_SET = {"SELECT distinct t1.", ", txs1.branch_id FROM osee_txs txs1, ", + private static final String[] NO_TX_CURRENT_SET = { + "SELECT distinct t1.", + ", txs1.branch_id FROM osee_txs txs1, ", " t1 WHERE txs1.gamma_id = t1.gamma_id AND txs1.tx_current = 0 %s SELECT distinct t2.", - ", txs2.branch_id FROM osee_txs txs2, ", " t2 WHERE txs2.gamma_id = t2.gamma_id AND txs2.tx_current != 0"}; + ", txs2.branch_id FROM osee_txs txs2, ", + " t2 WHERE txs2.gamma_id = t2.gamma_id AND txs2.tx_current != 0"}; private static final String[] MULTIPLE_TX_CURRENT_SET = { @@ -48,7 +51,8 @@ public class HealthHelper { "UPDATE osee_txs SET tx_current = CASE WHEN mod_type = 3 THEN 2 WHEN mod_type = 5 THEN 3 ELSE 1 END WHERE (gamma_id, transaction_id) = (SELECT txs1.gamma_id, txs1.transaction_id FROM osee_txs txs1, ", " t1 WHERE t1.", " = ? AND t1.gamma_id = txs1.gamma_id AND txs1.transaction_id = (SELECT max(txs.transaction_id) FROM osee_txs txs, ", - " t2 WHERE txs.branch_id = ? AND txs.gamma_id = t2.gamma_id AND t2.", " = ?))"}; + " t2 WHERE txs.branch_id = ? AND txs.gamma_id = t2.gamma_id AND t2.", + " = ?))"}; private static final String[] DUPLICATE_TX_CURRENT_CLEANUP = { @@ -103,8 +107,10 @@ public class HealthHelper { while (chStmt.next()) { noneSet.add(new Pair<Integer, Integer>(chStmt.getInt(dataColumnName), chStmt.getInt("branch_id"))); - resultsTab.addRow(new ResultsXViewerRow(new String[] {String.valueOf(counter++), - String.valueOf(chStmt.getInt(dataColumnName)), String.valueOf(chStmt.getInt("branch_id"))})); + resultsTab.addRow(new ResultsXViewerRow(new String[] { + String.valueOf(counter++), + String.valueOf(chStmt.getInt(dataColumnName)), + String.valueOf(chStmt.getInt("branch_id"))})); } } finally { chStmt.close(); @@ -174,8 +180,11 @@ public class HealthHelper { public static void dumpDataMultiple(Appendable sbFull, HashSet<LocalTxData> multipleSet) throws IOException { int counter = 0; for (LocalTxData link : multipleSet) { - sbFull.append(AHTML.addRowMultiColumnTable(new String[] {String.valueOf(counter++), - String.valueOf(link.dataId), String.valueOf(link.branchId), String.valueOf(link.number)})); + sbFull.append(AHTML.addRowMultiColumnTable(new String[] { + String.valueOf(counter++), + String.valueOf(link.dataId), + String.valueOf(link.branchId), + String.valueOf(link.number)})); } } } 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 65591a11bb1..9b0a92cbfc2 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 @@ -58,7 +58,12 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation private static final String REMOVE_NOT_ADDRESSED_GAMMAS = "DELETE FROM osee_txs WHERE gamma_id = ? AND transaction_id = ?"; - private static final String[] COLUMN_HEADER = {"Gamma Id", "Transaction Id", "Branch Id", "Art id", "Attribute Id", + private static final String[] COLUMN_HEADER = { + "Gamma Id", + "Transaction Id", + "Branch Id", + "Art id", + "Attribute Id", "Rel Link Id"}; private Set<LocalValues> addressing = null; @@ -152,9 +157,13 @@ public class ItemsDeletedWithNoOtherModification extends DatabaseHealthOperation if (value.relLinkId != 0) { relLinkCount++; } - sbFull.append(AHTML.addRowMultiColumnTable(new String[] {String.valueOf(value.gammaId), - String.valueOf(value.transactionId), String.valueOf(value.branchId), String.valueOf(value.artId), - String.valueOf(value.attributeId), String.valueOf(value.relLinkId)})); + sbFull.append(AHTML.addRowMultiColumnTable(new String[] { + String.valueOf(value.gammaId), + String.valueOf(value.transactionId), + String.valueOf(value.branchId), + String.valueOf(value.artId), + String.valueOf(value.attributeId), + String.valueOf(value.relLinkId)})); } builder.append(verify ? "Found " : "Fixed "); builder.append(String.valueOf(artifactCount)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java index f3bc8ae23b1..8ba99259cf3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java @@ -85,9 +85,20 @@ public class MultipleParentRelations extends DatabaseHealthOperation { private static final String GET_BRANCH_NAME = "Select branch_name from osee_branch where branch_id = ?"; - private static final String[] columnHeaders = new String[] {"Rel Link ID 1", "Rel Link ID 2", "Parent Art ID 1", - "P1 Art Name", "Parent Art ID 2", "P2 Art Name", "Child Art ID", "Child Art Name", "Branch Ids", "Branch Name", - "Archived", "Author 1", "Author 2"}; + private static final String[] columnHeaders = new String[] { + "Rel Link ID 1", + "Rel Link ID 2", + "Parent Art ID 1", + "P1 Art Name", + "Parent Art ID 2", + "P2 Art Name", + "Child Art ID", + "Child Art Name", + "Branch Ids", + "Branch Name", + "Archived", + "Author 1", + "Author 2"}; private static final String HEADER = "Artifacts that have multiple Parents"; @@ -183,12 +194,20 @@ public class MultipleParentRelations extends DatabaseHealthOperation { for (LocalRelationLink relLink : relations) { if (!relLink.author1.equals("")) { count++; - sbFull.append(AHTML.addRowMultiColumnTable(new String[] {Integer.toString(relLink.relLinkId1), - Integer.toString(relLink.relLinkId2), Integer.toString(relLink.parentArtId1), relLink.parentArt1, - Integer.toString(relLink.parentArtId2), relLink.parentArt2, Integer.toString(relLink.childArtId), + sbFull.append(AHTML.addRowMultiColumnTable(new String[] { + Integer.toString(relLink.relLinkId1), + Integer.toString(relLink.relLinkId2), + Integer.toString(relLink.parentArtId1), + relLink.parentArt1, + Integer.toString(relLink.parentArtId2), + relLink.parentArt2, + Integer.toString(relLink.childArtId), relLink.childArt, displayAll ? branches.get(relLink.relLinkId1).toString() : Integer.toString(relLink.branchId), - relLink.branch, Integer.toString(relLink.archived), relLink.author1, relLink.author2})); + relLink.branch, + Integer.toString(relLink.archived), + relLink.author1, + relLink.author2})); } } } 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 b6f38765168..cba6709b49a 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 @@ -74,13 +74,21 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { private static final String INSERT_TXS = "INSERT INTO osee_txs (gamma_id, transaction_id, tx_current, mod_type, branch_id) VALUES (?, ?, " + TxChange.ARTIFACT_DELETED.getValue() + ", " + ModificationType.ARTIFACT_DELETED.getValue() + ", ?)"; - private static final String[] columnHeaders = new String[] {"Rel Link ID", "Gamma Id", "Transaction Id", - "Branch_id", "A Art Id", "B Art Id", "Transaction ID of Deleted Artifact"}; - - private static final String[] DESCRIPTION = {"Relation Links with non existent Artifacts on the Branch\n", + private static final String[] columnHeaders = new String[] { + "Rel Link ID", + "Gamma Id", + "Transaction Id", + "Branch_id", + "A Art Id", + "B Art Id", + "Transaction ID of Deleted Artifact"}; + + private static final String[] DESCRIPTION = { + "Relation Links with non existent Artifacts on the Branch\n", "Relation Links with deleted Artifacts on the Branch\n"}; - private static final String[] HEADER = {"%S Relation Links that have artifacts that don't exist on the branch", + private static final String[] HEADER = { + "%S Relation Links that have artifacts that don't exist on the branch", "%s Relation Links that have artifacts that are deleted on the branch"}; private DoubleKeyHashMap<Integer, Integer, LocalRelationLink> deleteMap = null; @@ -178,7 +186,9 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { updateCurrentAddressing.add(new Object[] {relLink.gammaId, relLink.relTransId}); } else { updatePreviousAddressing.add(new Object[] {relLink.gammaId, relLink.relTransId}); - insertArtifactDeleted.add(new Object[] {relLink.gammaId, relLink.transIdForArtifactDeletion, + insertArtifactDeleted.add(new Object[] { + relLink.gammaId, + relLink.transIdForArtifactDeletion, relLink.branchId}); } } @@ -212,9 +222,13 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { sbFull.append(AHTML.addRowSpanMultiColumnTable(header, columnHeaders.length)); for (LocalRelationLink relLink : map.allValues()) { count++; - sbFull.append(AHTML.addRowMultiColumnTable(new String[] {Integer.toString(relLink.relLinkId), - Integer.toString(relLink.gammaId), Integer.toString(relLink.relTransId), - Integer.toString(relLink.branchId), Integer.toString(relLink.aArtId), Integer.toString(relLink.bArtId), + sbFull.append(AHTML.addRowMultiColumnTable(new String[] { + Integer.toString(relLink.relLinkId), + Integer.toString(relLink.gammaId), + Integer.toString(relLink.relTransId), + Integer.toString(relLink.branchId), + Integer.toString(relLink.aArtId), + Integer.toString(relLink.bArtId), Integer.toString(relLink.transIdForArtifactDeletion)})); } 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 39dd9c24298..aa0d2c6f312 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 @@ -70,8 +70,10 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { for (Branch branch : attributesWithErrors.keySet()) { appendToDetails(AHTML.addRowSpanMultiColumnTable(branch.getName(), 3)); for (AttrData attrData : attributesWithErrors.getValues(branch)) { - appendToDetails(AHTML.addRowMultiColumnTable(new String[] {attrData.getArtifactGuid(), - AttributeTypeManager.getType(attrData.getAttributeTypeId()).getName(), attrData.getValue()})); + appendToDetails(AHTML.addRowMultiColumnTable(new String[] { + attrData.getArtifactGuid(), + AttributeTypeManager.getType(attrData.getAttributeTypeId()).getName(), + attrData.getValue()})); } } appendToDetails(AHTML.endMultiColumnTable()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java index 6292f00de03..930dee4660b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java @@ -86,8 +86,11 @@ public class OseeNotifyUsersJob extends Job { sb.append(AHTML.beginMultiColumnTable(100, 1)); sb.append(AHTML.addHeaderRowMultiColumnTable(new String[] {"Reason", "Description", "Id", "URL"})); for (OseeNotificationEvent notificationEvent : notificationEvents) { - sb.append(AHTML.addRowMultiColumnTable(new String[] {notificationEvent.getType(), - notificationEvent.getDescription(), notificationEvent.getId(), getHyperlink(notificationEvent)})); + sb.append(AHTML.addRowMultiColumnTable(new String[] { + notificationEvent.getType(), + notificationEvent.getDescription(), + notificationEvent.getId(), + getHyperlink(notificationEvent)})); } sb.append(AHTML.endMultiColumnTable()); return sb.toString().replaceAll("\n", ""); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ITemplateRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ITemplateRenderer.java index ce983b478c2..64f8015cdd6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ITemplateRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ITemplateRenderer.java @@ -20,6 +20,7 @@ public interface ITemplateRenderer extends IRenderer { public static final String PREVIEW_WITH_RECURSE_NO_ATTRIBUTES_VALUE = "PREVIEW_WITH_RECURSE_NO_ATTRIBUTES"; public static final String DIFF_VALUE = "DIFF"; public static final String DIFF_NO_ATTRIBUTES_VALUE = "DIFF_NO_ATTRIBUTES"; - public static final Object[] PREVIEW_WITH_RECURSE_OPTION_PAIR = new String[] {TEMPLATE_OPTION, + public static final Object[] PREVIEW_WITH_RECURSE_OPTION_PAIR = new String[] { + TEMPLATE_OPTION, PREVIEW_WITH_RECURSE_VALUE}; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java index 63875daba6f..954f87241b6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultData.java @@ -46,7 +46,9 @@ public final class XResultData { public static final Pattern WarningPattern = Pattern.compile("Warning: "); private static enum Type { - Severe, Warning, Info; + Severe, + Warning, + Info; } private final StringBuffer sb = new StringBuffer(); @@ -147,7 +149,7 @@ public final class XResultData { public XResultPage getReport(final String title, Manipulations... manipulations) { return new XResultPage(title + " - " + XDate.getDateNow(XDate.MMDDYYHHMM), - (sb.toString().equals("") ? "Nothing Logged" : sb.toString()), manipulations); + (sb.toString().equals("") ? "Nothing Logged" : sb.toString()), manipulations); } /* @@ -172,23 +174,24 @@ public final class XResultData { * Creates hyperlink using name. Default editor will open hrid for branchId given */ public static String getHyperlink(String name, String hrid, int branchId) { - return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactBranch, - hrid + "(" + branchId + ")"), name); + return AHTML.getHyperlink( + XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactBranch, hrid + "(" + branchId + ")"), + name); } public static String getHyperlinkUrlExternal(String name, String url) { return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.browserExternal, url), - name); + name); } public static String getHyperlinkUrlInternal(String name, String url) { return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.browserInternal, url), - name); + name); } public static String getHyperlinkForArtifactEditor(String name, String hrid) { return AHTML.getHyperlink(XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openArtifactEditor, hrid), - name); + name); } public static String getHyperlinkForAction(String name, String hrid) { @@ -201,7 +204,7 @@ public final class XResultData { public static String getHyperlinkForAction(String name, Artifact art) { return AHTML.getHyperlink( - XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, art.getGuid()), name); + XResultBrowserHyperCmd.getHyperCmdStr(XResultBrowserHyperCmd.openAction, art.getGuid()), name); } private int getCount(Type type) { @@ -254,16 +257,16 @@ public final class XResultData { rd.log("\n\nExample of hyperlinked hrid: " + XResultData.getHyperlink(UserManager.getUser())); rd.log("Example of hyperlinked artifact different hyperlink string: " + XResultData.getHyperlink( - "Different string", UserManager.getUser())); + "Different string", UserManager.getUser())); rd.log("Example of hyperlinked hrid on another branch: " + getHyperlink( - UserManager.getUser().getHumanReadableId(), UserManager.getUser().getHumanReadableId(), - BranchManager.getCommonBranch().getId())); + UserManager.getUser().getHumanReadableId(), UserManager.getUser().getHumanReadableId(), + BranchManager.getCommonBranch().getId())); rd.addRaw(AHTML.newline()); rd.addRaw("Example of hyperlink that opens external browser " + getHyperlinkUrlExternal("Google", - "http://www.google.com") + AHTML.newline()); + "http://www.google.com") + AHTML.newline()); rd.addRaw("Example of hyperlink that opens internal browser " + getHyperlinkUrlInternal("Google", - "http://www.google.com") + AHTML.newline()); + "http://www.google.com") + AHTML.newline()); rd.log("\n\nHere is a nice table"); rd.addRaw(AHTML.beginMultiColumnTable(95, 1)); @@ -271,8 +274,10 @@ public final class XResultData { for (int x = 0; x < 3; x++) { rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {"Type " + x, "Title " + x, x + ""})); } - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {"Error / Warning in table ", "Error: this is error", - "Warning: this is warning"})); + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { + "Error / Warning in table ", + "Error: this is error", + "Warning: this is warning"})); rd.addRaw(AHTML.endMultiColumnTable()); rd.report("This is my report title"); } catch (OseeCoreException ex) { 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 814e30510e4..219d508319f 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 @@ -87,8 +87,10 @@ public class ResultsEditorExample extends XNavigateItemAction { StringBuilder sb = new StringBuilder(); sb.append(AHTML.heading(3, TITLE)); sb.append(AHTML.beginMultiColumnTable(100, 1)); - sb.append(AHTML.addHeaderRowMultiColumnTable(new String[] {Columns.Date.name(), - Columns.Priority_123_Open_Bugs.name(), Columns.Goal.name()})); + sb.append(AHTML.addHeaderRowMultiColumnTable(new String[] { + Columns.Date.name(), + Columns.Priority_123_Open_Bugs.name(), + Columns.Goal.name()})); for (int x = 0; x < chartDateStrs.size(); x++) { sb.append(AHTML.addRowMultiColumnTable(chartDateStrs.get(x), "" + chartValueStrs.get(x), "" + chartValueStrsGoal.get(x))); @@ -198,8 +200,10 @@ public class ResultsEditorExample extends XNavigateItemAction { public List<IResultsEditorTab> getResultsEditorTabs() { List<IResultsXViewerRow> rows = new ArrayList<IResultsXViewerRow>(); for (int x = 0; x < chartDateStrs.size(); x++) { - rows.add(new ResultsXViewerRow(new String[] {chartDateStrs.get(x), - String.valueOf(chartValueStrs.get(x)), String.valueOf(chartValueStrsGoal.get(x))})); + rows.add(new ResultsXViewerRow(new String[] { + chartDateStrs.get(x), + String.valueOf(chartValueStrs.get(x)), + String.valueOf(chartValueStrsGoal.get(x))})); } List<XViewerColumn> columns = Arrays.asList(new XViewerColumn(Columns.Date.name(), Columns.Date.name(), 80, SWT.LEFT, true, diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java index ef91aa52b19..510fd45b5e8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/RelTypeContentProvider.java @@ -35,7 +35,8 @@ public class RelTypeContentProvider implements ITreeContentProvider { } if (parentElement instanceof RelationType) { - return new Object[] {new RelationTypeSide((RelationType) parentElement, RelationSide.SIDE_A), + return new Object[] { + new RelationTypeSide((RelationType) parentElement, RelationSide.SIDE_A), new RelationTypeSide((RelationType) parentElement, RelationSide.SIDE_B)}; } return new Object[] {}; 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 b50f0e12d55..de393ab1b2b 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 @@ -47,9 +47,13 @@ public class ArtifactClipboard { Artifact[] artifacts = artifactTransferData.toArray(new Artifact[artifactTransferData.size()]); clipboard.setContents( - new Object[] {new ArtifactData(artifacts, STATUS, viewId), HTMLTransferFormatter.getHtml(artifacts), - Collections.toString(textTransferData, null, ", ", null)}, new Transfer[] {ArtifactTransfer.getInstance(), - HTMLTransfer.getInstance(), TextTransfer.getInstance()}); + new Object[] { + new ArtifactData(artifacts, STATUS, viewId), + HTMLTransferFormatter.getHtml(artifacts), + Collections.toString(textTransferData, null, ", ", null)}, new Transfer[] { + ArtifactTransfer.getInstance(), + HTMLTransfer.getInstance(), + TextTransfer.getInstance()}); } public void setTextToClipboard(Collection<String> textTransferData) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeEmail.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeEmail.java index c245696162f..a8bb766bb53 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeEmail.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeEmail.java @@ -336,8 +336,7 @@ public class OseeEmail extends MimeMessage { */ private static Session getSession() throws OseeCoreException { Properties props = System.getProperties(); - props.put( - emailType, + props.put(emailType, OseeSystemArtifacts.getGlobalPreferenceArtifact().getSoleAttributeValue(CoreAttributeTypes.DefaultMailServer)); return Session.getDefaultInstance(props, null); 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 e1336b75d18..e606ce7e3a8 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 @@ -62,7 +62,9 @@ public abstract class SkynetDragAndDrop { } private void setupDragSupport() { - source.setTransfer(new Transfer[] {HTMLTransfer.getInstance(), ArtifactTransfer.getInstance(), + source.setTransfer(new Transfer[] { + HTMLTransfer.getInstance(), + ArtifactTransfer.getInstance(), TextTransfer.getInstance()}); source.addDragListener(new DragSourceListener() { @@ -94,7 +96,9 @@ public abstract class SkynetDragAndDrop { } private void setupDropSupport() { - target.setTransfer(new Transfer[] {FileTransfer.getInstance(), TextTransfer.getInstance(), + target.setTransfer(new Transfer[] { + FileTransfer.getInstance(), + TextTransfer.getInstance(), ArtifactTransfer.getInstance()}); target.addDropListener(new DropTargetAdapter() { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java index 6e10caca5a5..06f6c039b7c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java @@ -51,7 +51,8 @@ public final class WordUiUtil { rd.addRaw(AHTML.beginMultiColumnTable(60, 1)); rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] {"Artifact Name", "HRID"})); for (Artifact artifact : artifacts) { - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {artifact.toString(), + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { + artifact.toString(), XResultData.getHyperlink(artifact)})); } rd.addRaw(AHTML.endMultiColumnTable()); @@ -72,7 +73,8 @@ public final class WordUiUtil { rd.addRaw(AHTML.beginMultiColumnTable(60, 1)); rd.addRaw(AHTML.addHeaderRowMultiColumnTable(new String[] {"Artifact Name", "HRID"})); for (Artifact artifact : artifacts) { - rd.addRaw(AHTML.addRowMultiColumnTable(new String[] {artifact.toString(), + rd.addRaw(AHTML.addRowMultiColumnTable(new String[] { + artifact.toString(), XResultData.getHyperlink(artifact)})); } rd.addRaw(AHTML.endMultiColumnTable()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java index d84e8dba3af..df2f9ec462e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/filteredTree/OSEEFilteredTreeDialog.java @@ -45,7 +45,8 @@ public abstract class OSEEFilteredTreeDialog<T> extends MessageDialog { private final IBaseLabelProvider labelProvider; public OSEEFilteredTreeDialog(String dialogTitle, String dialogMessage, IBaseLabelProvider labelProvider, IContentProvider contentProvider, PatternFilter patternFilter) { - super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] {"OK", + super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] { + "OK", "Cancel"}, 0); this.contentProvider = contentProvider; this.labelProvider = labelProvider; 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 7fa051244df..799581a0ad8 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 @@ -48,8 +48,11 @@ public class XTextResourceDropDam extends XTextDam { // Do not allow drop if default branch is not same as artifacts that reside in this table DropTarget target = new DropTarget(getStyledText(), DND.DROP_COPY); - target.setTransfer(new Transfer[] {ResourceTransfer.getInstance(), FileTransfer.getInstance(), - TextTransfer.getInstance(), ArtifactTransfer.getInstance()}); + target.setTransfer(new Transfer[] { + ResourceTransfer.getInstance(), + FileTransfer.getInstance(), + TextTransfer.getInstance(), + ArtifactTransfer.getInstance()}); target.addDropListener(new DropTargetAdapter() { @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java index 135b77fb3a9..58d295d2a93 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/DateSelectionDialog.java @@ -40,7 +40,8 @@ public class DateSelectionDialog extends MessageDialog { } public DateSelectionDialog(String dialogTitle, String dialogMessage, Date selectedDate) { - this(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] {"Ok", + this(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.NONE, new String[] { + "Ok", "Cancel"}, 0, selectedDate); } 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 4746a5d8ef8..b7b804ca894 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 @@ -60,7 +60,8 @@ public class EntryDialog extends MessageDialog { private final String dialogTitle; public EntryDialog(String dialogTitle, String dialogMessage) { - super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[] {"OK", + super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[] { + "OK", "Cancel"}, 0); this.dialogTitle = dialogTitle; } 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 b070ab485a7..354e9cf3e38 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,8 @@ public class EntryDialogWithBranchSelect extends MessageDialog { private final List<IShellCloseEvent> closeEventListeners = new ArrayList<IShellCloseEvent>(); public EntryDialogWithBranchSelect(String dialogTitle, String dialogMessage) { - super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[] {"OK", + super(Displays.getActiveShell(), dialogTitle, null, dialogMessage, MessageDialog.QUESTION, new String[] { + "OK", "Cancel"}, 0); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java index 8c0056edc7e..6e804f130f3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java @@ -169,8 +169,7 @@ public class DynamicXWidgetLayout { if (artifact != null) { if (xWidget instanceof IAttributeWidget) { try { - IAttributeType attributeType = - AttributeTypeManager.getType(xWidgetLayoutData.getStoreName()); + IAttributeType attributeType = AttributeTypeManager.getType(xWidgetLayoutData.getStoreName()); ((IAttributeWidget) xWidget).setAttributeType(artifact, attributeType); } catch (Exception ex) { OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); 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 6e3ef551bdf..be38790274c 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 @@ -701,7 +701,8 @@ public class MergeXWidget extends XWidget implements IAdaptable { new ListSelectionDialogNoSave(selections.toArray(), Displays.getActiveShell().getShell(), "Apply Prior Merge Resolution", null, "Select the destination branch that the previous commit was appplied to", 2, new String[] { - "Apply", "Cancel"}, 1); + "Apply", + "Cancel"}, 1); if (dialog.open() == 0) { System.out.print("Applying the merge found for Branch " + branchIds.toArray()[dialog.getSelection()]); applyPreviousMerge(branchIds.get(dialog.getSelection())); |