Skip to content

Commit

Permalink
Minor fixes and cleaning, refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
@akivela
akivela committed Nov 23, 2014
1 parent 8155ca5 commit 8c7d68b
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/org/wandora/application/WandoraMenuManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ public void refreshTopicsMenu() {
// ---- THE STRUCTURE ----
Object[] menuStructure = new Object[] {
"Open topic", UIBox.getIcon("gui/icons/topic_open.png"), KeyStroke.getKeyStroke(VK_O, CTRL_MASK), new OpenTopic(OpenTopic.ASK_USER),
"Close topic panel", UIBox.getIcon("gui/icons/topic_close.png"), KeyStroke.getKeyStroke(VK_W, CTRL_MASK), new CloseCurrentTopicPanel(),
"Close panel", UIBox.getIcon("gui/icons/topic_close.png"), KeyStroke.getKeyStroke(VK_W, CTRL_MASK), new CloseCurrentTopicPanel(),
"---",
"New topic...", UIBox.getIcon("gui/icons/new_topic.png"), KeyStroke.getKeyStroke(VK_N, CTRL_MASK), new NewTopicExtended(),
"Delete topic...", UIBox.getIcon("gui/icons/topic_delete.png"), KeyStroke.getKeyStroke(VK_DELETE, CTRL_MASK), new DeleteTopics(new ApplicationContext()),
Expand Down
37 changes: 19 additions & 18 deletions src/org/wandora/application/gui/WandoraToolTree.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,16 @@
package org.wandora.application.gui;

import java.io.*;
import org.wandora.*;
import org.wandora.application.*;
import org.wandora.application.gui.simple.*;
import org.wandora.application.tools.*;
import org.wandora.application.tools.navigate.OpenTopic;
import org.wandora.topicmap.*;
import org.wandora.utils.*;
import static org.wandora.utils.Tuples.*;
import javax.swing.*;
import javax.swing.tree.*;
import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
import java.util.*;
import javax.swing.border.*;
import java.awt.dnd.*;
import java.awt.datatransfer.*;


Expand All @@ -57,7 +51,7 @@ public class WandoraToolTree extends SimpleTree implements MouseListener, TreeMo
private Wandora wandora;
private MouseEvent mouseEvent;
private WandoraToolSet toolSet = null;
protected TreeModel treeModel = null;
protected TreeModel toolTreeModel = null;

private Object[] toolTreeMenuStruct = new Object[] {
"Add tool...",
Expand Down Expand Up @@ -98,9 +92,9 @@ public void initialize(WandoraToolSet toolSet) {

ToolTreeNode top = new ToolTreeNode(toolSet);
createNodes(top, toolSet);
treeModel = new DefaultTreeModel(top);
treeModel.addTreeModelListener(this);
this.setModel(treeModel);
toolTreeModel = new DefaultTreeModel(top);
toolTreeModel.addTreeModelListener(this);
this.setModel(toolTreeModel);
}


Expand Down Expand Up @@ -166,7 +160,7 @@ private Object addNode(Object n) {
}
if(childNode != null) {
childNode.setParentNode(parentNode);
((DefaultTreeModel) treeModel).insertNodeInto(
((DefaultTreeModel) toolTreeModel).insertNodeInto(
childNode,
parentNode,
parentNode.getChildCount()
Expand Down Expand Up @@ -205,7 +199,7 @@ public Object removeCurrentNode() {
if(selectionPath != null) {
ToolTreeNode currentNode = (ToolTreeNode) (selectionPath.getLastPathComponent());
if(currentNode != null) {
((DefaultTreeModel) treeModel).removeNodeFromParent(currentNode);
((DefaultTreeModel) toolTreeModel).removeNodeFromParent(currentNode);

ToolTreeNode parentNode = currentNode.getParentNode();
WandoraToolSet set = (WandoraToolSet) parentNode.getUserObject();
Expand Down Expand Up @@ -239,10 +233,10 @@ public ToolTreeNode solveNode(int hash, ToolTreeNode node) {


public void refresh() {
this.setModel(treeModel);
this.setModel(toolTreeModel);
this.validate();
this.repaint();
System.out.println("refresh acquired");
// System.out.println("refresh acquired");
}

public WandoraToolSet getToolSet() {
Expand Down Expand Up @@ -635,8 +629,10 @@ else if(userValueContent instanceof WandoraToolSet) {


// -------------------------------------------------------------------------


public static class ToolTreeTransferable extends DnDHelper.WandoraTransferable {
public static final DataFlavor toolTreeNodeFlavor=new DataFlavor(ToolTreeNode.class,"ToolTreeNode");
public static final DataFlavor toolTreeNodeFlavor = new DataFlavor(ToolTreeNode.class,"ToolTreeNode");

protected Object transferable;

Expand Down Expand Up @@ -674,7 +670,6 @@ public boolean canImport(TransferSupport support) {

@Override
protected Transferable createTransferable(JComponent c) {

TreePath path=getSelectionPath();
if(path==null) return new ToolTreeTransferable(null);
else {
Expand Down Expand Up @@ -704,6 +699,7 @@ public boolean importData(TransferSupport support) {
//WandoraOptionPane.showMessageDialog(TopicTree.this.parent,"Invalid drop location, drop cancelled.");
return false;
}

ToolTreeNode targetNode = (ToolTreeNode)dropPath.getLastPathComponent();
ToolTreeNode targetSetNode = targetNode;
while(!targetSetNode.isSet()) {
Expand All @@ -712,12 +708,17 @@ public boolean importData(TransferSupport support) {
int index = targetSetNode.getIndex(targetNode);
index = Math.max(0, Math.min(index, targetSetNode.getChildCount()-1));

if(targetSetNode.isNodeAncestor(movedNode)) {
WandoraOptionPane.showMessageDialog(wandora, "Can't move the item in itself.", "Illegal drop path");
return false;
}

try {
((DefaultTreeModel) treeModel).removeNodeFromParent(movedNode);
((DefaultTreeModel) toolTreeModel).removeNodeFromParent(movedNode);
WandoraToolSet sourceSet = (WandoraToolSet) movedNode.getParentNode().getUserObject();
sourceSet.remove(movedNode.getUserObject());

((DefaultTreeModel) treeModel).insertNodeInto(movedNode, targetSetNode, index);
((DefaultTreeModel) toolTreeModel).insertNodeInto(movedNode, targetSetNode, index);
WandoraToolSet targetSet = (WandoraToolSet) targetSetNode.getUserObject();
Object o = movedNode.getUserObject();
targetSet.add(o, index);
Expand Down
2 changes: 1 addition & 1 deletion src/org/wandora/application/gui/topicpanels/DockingFramePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public JMenu getViewMenu() {

@Override
public Object[] getViewMenuStruct() {
JMenu addMenu = new SimpleMenu("Add topic panel", UIBox.getIcon("gui/icons/topic_panel_add.png"));
JMenu addMenu = new SimpleMenu("Add panel", UIBox.getIcon("gui/icons/topic_panel_add.png"));
ArrayList<ArrayList> availableTopicPanels = wandora.topicPanelManager.getAvailableTopicPanels();
ArrayList addTopicPanelMenuStruct = new ArrayList();
for(ArrayList panelData : availableTopicPanels) {
Expand Down
1 change: 0 additions & 1 deletion src/org/wandora/application/gui/topicpanels/RTopicPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@ public JMenu getViewMenu() {
@Override
public Object[] getViewMenuStruct() {
Object[] menuStructure = new Object[] {
"---",
"New script", this,
"Open script", this,
new Object[] {
Expand Down
8 changes: 5 additions & 3 deletions src/org/wandora/application/gui/topicpanels/SearchTopicPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,19 @@ public int getOrder() {

@Override
public Object[] getViewMenuStruct() {
return null;
return new Object[] {
"[Nothing to configure]"
};
}

@Override
public JMenu getViewMenu() {
return null;
return UIBox.makeMenu(getViewMenuStruct(), this);
}

@Override
public JPopupMenu getViewPopupMenu() {
return null;
return UIBox.makePopupMenu(getViewMenuStruct(), this);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/org/wandora/application/gui/topicpanels/TopicPanelManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public SimpleMenu getTopicPanelMenu() {
public JComponent getTopicPanelMenu(JComponent topicPanelMenu) {
SimpleMenuItem topicPanelMenuItem = null;
if(topicPanelMenu==null) {
topicPanelMenu = new SimpleMenu("Add topic panel");
topicPanelMenu = new SimpleMenu("Add panel");
((SimpleMenu)topicPanelMenu).setIcon(UIBox.getIcon("gui/icons/topic_panels.png"));
}

Expand Down

0 comments on commit 8c7d68b

Please sign in to comment.