Permalink
Browse files

komischen if anweisungsteil in mouseClicked rausgenommen

  • Loading branch information...
1 parent ebc22a7 commit 476baa4ce060781bc85b04bfa1d51288d209d7cf thmuelle committed Dec 10, 2008
Showing with 4 additions and 2 deletions.
  1. +4 −2 controller/FWAndCW/IdentifyFWandCWController.java
@@ -220,6 +220,7 @@ public void actionPerformed(ActionEvent e) {
} else if (e.getActionCommand().equals("CANCEL")) {
lastSelectedWord = selectedWord;
selectedWord = null;
+ popMenu.setVisible(false);
model.showMenu("fwAndCW");
if (allCharactersSet() && allWordsSet()) {
model.createGraph();
@@ -569,8 +570,8 @@ public void mouseClicked(MouseEvent arg0) {
int position = model.getView().getEditor().viewToModel(p);
Token token = Model.getChapter().getTokenAtPosition(position);
model.getView().getEditor().setCaretPosition(position);
- if (token instanceof Word
- && (selectedWord == null || allCharactersSet())) {
+ if (token instanceof Word) {
+// && (selectedWord == null)){// || allCharactersSet())) {
selectedWord = (Word) token;
model.getIdentifyFWandCWPanel().setWord(selectedWord);
}
@@ -584,6 +585,7 @@ public void mouseClicked(MouseEvent arg0) {
cw.addActionListener(this);
cw.setActionCommand("CW");
popMenu.add(cw);
+ p.y = p.y-model.getPos();
popMenu.setLocation(p);
popMenu.setVisible(true);
}

0 comments on commit 476baa4

Please sign in to comment.