Skip to content

Commit

Permalink
Merge pull request #921 from jburel/create-permissions
Browse files Browse the repository at this point in the history 
Create permissions
  • Loading branch information
@joshmoore
joshmoore committed Mar 20, 2013
2 parents 41fbb41 + d6ab05e commit efbaa9f
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 128 deletions.
24 changes: 12 additions & 12 deletions components/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/ManagePopupMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@ class ManagePopupMenu
{

/** Reference to the control. */
private TreeViewerControl controller;
private TreeViewerControl controller;

/** Button to add element to the specified container. */
private JMenuItem newElement;
private JMenuItem newElement;

/** Button to copy the selected elements. */
private JMenuItem copyElement;
private JMenuItem copyElement;

/** Button to paste the selected elements. */
private JMenuItem pasteElement;
private JMenuItem pasteElement;

/** Button to delete the selected elements. */
private JMenuItem deleteElement;
private JMenuItem deleteElement;

/** Button to delete the selected elements. */
private JMenuItem cutElement;
private JMenuItem cutElement;

/** Button to add existing element to the specified container. */
private JMenuItem existingElement;
private JMenuItem existingElement;

/**
* Sets the defaults of the specified menu item.
Expand All @@ -99,13 +99,13 @@ private void initComponents()
initMenuItem(newElement);
copyElement = new JMenuItem(
controller.getAction(TreeViewerControl.COPY_OBJECT));
initMenuItem(newElement);
initMenuItem(copyElement);
pasteElement = new JMenuItem(
controller.getAction(TreeViewerControl.PASTE_OBJECT));
initMenuItem(newElement);
controller.getAction(TreeViewerControl.PASTE_OBJECT));
initMenuItem(pasteElement);
deleteElement = new JMenuItem(
controller.getAction(TreeViewerControl.DELETE_OBJECT));
initMenuItem(newElement);
controller.getAction(TreeViewerControl.DELETE_OBJECT));
initMenuItem(deleteElement);
existingElement = new JMenuItem(
controller.getAction(TreeViewerControl.ADD_OBJECT));
initMenuItem(existingElement);
Expand Down
143 changes: 27 additions & 116 deletions ...nts/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ public void setSelectedNodes(Object nodes)
Boolean.valueOf(true));
return;
}
List result = new ArrayList();
List<Object> result = new ArrayList<Object>();
selection.remove(0);
result.add(selection);
result.add(selected);
Expand Down Expand Up @@ -1541,18 +1541,18 @@ public void setHierarchyRoot(long userGroupID,
}
model.setSelectedGroupId(userGroupID);
view.setPermissions();
Entry entry;
Entry<Integer, Browser> entry;
userGroupID = model.getSelectedGroupId();

//First remove;
Iterator<ExperimenterData> j = users.iterator();
Iterator i;
Iterator<Entry<Integer, Browser>> i;
while (j.hasNext()) {
exp = j.next();
i = browsers.entrySet().iterator();
while (i.hasNext()) {
entry = (Entry) i.next();
browser = (Browser) entry.getValue();
entry = i.next();
browser = entry.getValue();
browser.removeExperimenter(exp, userGroupID);
}
}
Expand All @@ -1562,8 +1562,8 @@ public void setHierarchyRoot(long userGroupID,
exp = j.next();
i = browsers.entrySet().iterator();
while (i.hasNext()) {
entry = (Entry) i.next();
browser = (Browser) entry.getValue();
entry = i.next();
browser = entry.getValue();
browser.addExperimenter(exp, userGroupID);
}
}
Expand Down Expand Up @@ -1617,30 +1617,16 @@ public boolean canLink(Object ho)
throw new IllegalStateException(
"This method cannot be invoked in the DISCARDED state.");
//Check if current user can write in object
long id = model.getUserDetails().getId();
boolean b = false;
switch (model.getDisplayMode()) {
case TreeViewer.GROUP_DISPLAY:
if (ho instanceof TreeImageTimeSet) {
Browser browser = model.getSelectedBrowser();
if (browser == null) return false;
GroupData g = browser.getNodeGroup(
(TreeImageDisplay) ho);
return g.canLink();
} else if (ho instanceof DataObject)
b = ((DataObject) ho).canLink();
return b;
case TreeViewer.EXPERIMENTER_DISPLAY:
default:
if (ho instanceof TreeImageTimeSet) {
Browser browser = model.getSelectedBrowser();
if (browser == null) return false;
ExperimenterData exp = browser.getNodeOwner(
(TreeImageDisplay) ho);
if (exp.getId() == id) b = true;
} else b = EditorUtil.isUserOwner(ho, id);
return b;
}
if (ho instanceof TreeImageTimeSet) {
Browser browser = model.getSelectedBrowser();
if (browser == null) return false;
GroupData g = browser.getNodeGroup(
(TreeImageDisplay) ho);
return g.canLink();
} else if (ho instanceof DataObject)
b = ((DataObject) ho).canLink();
return b;
}

/**
Expand Down Expand Up @@ -2021,13 +2007,14 @@ public void paste(TreeImageDisplay[] parents)
}
IconManager icons = IconManager.getInstance();
TransferableActivityParam param;
Entry entry;
Iterator k = parentMap.entrySet().iterator();
Entry<Long, List<DataObject>> entry;
Iterator<Entry<Long, List<DataObject>>>
k = parentMap.entrySet().iterator();
TransferableObject t;
Long id;
while (k.hasNext()) {
entry = (Entry) k.next();
id = (Long) entry.getKey();
entry = k.next();
id = entry.getKey();
removeNodes(trans);
t = new TransferableObject(new SecurityContext(id),
(List<DataObject>) entry.getValue(), trans);
Expand All @@ -2043,15 +2030,7 @@ public void paste(TreeImageDisplay[] parents)
* Implemented as specified by the {@link TreeViewer} interface.
* @see TreeViewer#getUI()
*/
public JFrame getUI()
{
/*
if (model.getState() == DISCARDED)
throw new IllegalStateException("This method cannot be invoked " +
"in the DISCARDED state.");
*/
return view;
}
public JFrame getUI() { return view; }

/**
* Implemented as specified by the {@link TreeViewer} interface.
Expand Down Expand Up @@ -2240,11 +2219,11 @@ public void removeExperimenterData()
if (uo == null || !(uo instanceof ExperimenterData)) return;
ExperimenterData exp = (ExperimenterData) uo;
Map<Integer, Browser> browsers = model.getBrowsers();
Iterator i = browsers.entrySet().iterator();
Entry entry;
Iterator<Entry<Integer, Browser>> i = browsers.entrySet().iterator();
Entry<Integer, Browser> entry;
while (i.hasNext()) {
entry = (Entry) i.next();
browser = (Browser) entry.getValue();
entry = i.next();
browser = entry.getValue();
browser.removeExperimenter(exp, groupID);
}
}
Expand Down Expand Up @@ -2330,64 +2309,7 @@ public void rndSettingsPasted(Map map)
Collection success = (Collection) map.get(Boolean.valueOf(true));
EventBus bus = TreeViewerAgent.getRegistry().getEventBus();
bus.post(new RndSettingsCopied(success, -1));
/*
UserNotifier un = TreeViewerAgent.getRegistry().getUserNotifier();
String name = model.getRefImageName();
int n = success.size();
String text = "The rendering settings ";
if (name != null && name.length() > 0)
text += "of "+name;
if (failure.size() == 0) {
text += "\nhave been applied to the selected image";
if (n > 1) text += "s.";
else text += ".";
un.notifyInfo("Rendering Settings Applied", text);
} else {
DataBrowser db = model.getDataViewer();
String message = "";
StringBuffer buffer;
if (db != null) {
Set<DataObject> images = db.getBrowser().getImages();
Map<Long, ImageData> m = new HashMap<Long, ImageData>();
if (images != null) {
Iterator<DataObject> k = images.iterator();
ImageData img;
DataObject obj;
while (k.hasNext()) {
obj = k.next();
if (obj instanceof ImageData) {
img = (ImageData) obj;
m.put(img.getId(), img);
}
}
Iterator i = failure.iterator();
long id;
buffer = new StringBuffer();
while (i.hasNext()) {
id = (Long) i.next();
if (m.containsKey(id)) {
buffer.append(EditorUtil.getPartialName(
m.get(id).getName()));
buffer.append("\n");
}
}
message = text+"\ncould not be applied to the following " +
"images:\n"+buffer.toString();
}
}
if (message.length() == 0) {
String s = " image";
if (n > 1) s+="s";
s += ".";
message = text+"\ncould not be applied to "+n+s;
}
un.notifyInfo("Rendering Settings Applied", message);
//if (db != null)
// db.markUnmodifiedNodes(ImageData.class, failure);
}
*/

MetadataViewer mv = model.getMetadataViewer();
if (mv != null) mv.onSettingsApplied();
model.setState(READY);
Expand Down Expand Up @@ -4082,16 +4004,6 @@ public void indicateToRefresh(List<DataObject> containers,
browser.getUI().repaint();
}
}
/*
if (browser == null) browser = model.getSelectedBrowser();
if (browser != null) {
node = browser.getLoggedExperimenterNode();
if (node != null) {
node.setExpanded(true);
node.setToRefresh(refreshTree);
browser.getUI().repaint();
}
}*/
}

/**
Expand Down Expand Up @@ -4147,7 +4059,6 @@ public void browseContainer(Object data, Object refNode)
browser = model.getBrowser(Browser.SCREENS_EXPLORER);
DataBrowserFactory.discardAll();
setSelectedBrowser(browser, false);
//view.removeAllFromWorkingPane();
browser.refreshTree(refNode, (DataObject) ho);
}

Expand Down

0 comments on commit efbaa9f

Please sign in to comment.