diff options
| -rw-r--r-- | ajbrowser/src/org/aspectj/tools/ajbrowser/TopFrame.java | 19 | ||||
| -rw-r--r-- | ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java | 7 |
2 files changed, 22 insertions, 4 deletions
diff --git a/ajbrowser/src/org/aspectj/tools/ajbrowser/TopFrame.java b/ajbrowser/src/org/aspectj/tools/ajbrowser/TopFrame.java index 2b7b66ebf..d8bf0416b 100644 --- a/ajbrowser/src/org/aspectj/tools/ajbrowser/TopFrame.java +++ b/ajbrowser/src/org/aspectj/tools/ajbrowser/TopFrame.java @@ -43,6 +43,7 @@ import javax.swing.border.Border; import javax.swing.filechooser.FileFilter; import org.aspectj.ajde.Ajde; +import org.aspectj.ajde.ui.EditorManager; import org.aspectj.ajde.ui.swing.AJButtonMenuCombo; import org.aspectj.ajde.ui.swing.AjdeUIManager; import org.aspectj.ajde.ui.swing.BuildConfigPopupMenu; @@ -203,7 +204,11 @@ public class TopFrame extends JFrame { public void keyPressed(KeyEvent e) { if (e.getModifiers() == java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) { if (e.getKeyCode() == KeyEvent.VK_F11) { - Ajde.getDefault().getBuildManager().build(); + if (e.isShiftDown()) { + Ajde.getDefault().getBuildManager().buildFresh(); + } else { + Ajde.getDefault().getBuildManager().build(); + } } else if (e.getKeyCode() == KeyEvent.VK_S) { Ajde.getDefault().getEditorManager().saveContents(); } else if (e.getKeyCode() == KeyEvent.VK_P) { @@ -466,7 +471,11 @@ public class TopFrame extends JFrame { void projectBuild_menuItem_actionPerformed(ActionEvent e) { BrowserManager.getDefault().saveAll(); - Ajde.getDefault().getBuildManager().build(); + if (EditorManager.isShiftDown(e.getModifiers())) { + Ajde.getDefault().getBuildManager().buildFresh(); + } else { + Ajde.getDefault().getBuildManager().build(); + } } void run_button_actionPerformed(ActionEvent e) { @@ -479,7 +488,11 @@ public class TopFrame extends JFrame { void build_button_actionPerformed(ActionEvent e) { BrowserManager.getDefault().saveAll(); - Ajde.getDefault().getBuildManager().build(); + if (EditorManager.isShiftDown(e.getModifiers())) { + Ajde.getDefault().getBuildManager().buildFresh(); + } else { + Ajde.getDefault().getBuildManager().build(); + } } void options_button_actionPerformed(ActionEvent e) { diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java index 67323ea7c..97904a5dc 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java @@ -24,6 +24,7 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import org.aspectj.ajde.Ajde; +import org.aspectj.ajde.ui.EditorManager; import org.aspectj.asm.ProgramElementNode; public class BuildConfigPopupMenu extends JPopupMenu { @@ -38,7 +39,11 @@ public class BuildConfigPopupMenu extends JPopupMenu { new ActionListener() { public void actionPerformed(ActionEvent e) { Ajde.getDefault().getConfigurationManager().setActiveConfigFile(buildConfig); - Ajde.getDefault().getBuildManager().build(); + if (EditorManager.isShiftDown(e.getModifiers())) { + Ajde.getDefault().getBuildManager().buildFresh(); + } else { + Ajde.getDefault().getBuildManager().build(); + } action.actionPerformed(e); } }); |