Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5542] trunk/framework/fudaa-common/src/main/java/org/ fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
|
From: <de...@us...> - 2009-12-08 00:56:21
|
Revision: 5542
http://fudaa.svn.sourceforge.net/fudaa/?rev=5542&view=rev
Author: deniger
Date: 2009-12-08 00:56:13 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
Modified: trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2009-12-08 00:52:32 UTC (rev 5541)
+++ trunk/framework/fudaa-common/src/main/java/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java 2009-12-08 00:56:13 UTC (rev 5542)
@@ -278,18 +278,19 @@
/**
* Remplace un item menu en provenance de Bu par une action, plus g\xE9n\xE9raliste.
+ *
* @param _command La commande.
* @return L'action de remplacement, ou null si la commande n'existait pas.
*/
protected EbliActionAbstract replaceItemByAction(String _command) {
- JMenuItem it=((JMenuItem)getMainMenuBar().getMenuItem(_command));
- if (it==null) return null;
- BuMenu mn=(BuMenu)getMainMenuBar().getMenuForAction(_command);
- if (mn==null) return null;
- int idx=mn.indexOf(_command);
- if (idx==-1) return null;
+ JMenuItem it = ((JMenuItem) getMainMenuBar().getMenuItem(_command));
+ if (it == null) return null;
+ BuMenu mn = (BuMenu) getMainMenuBar().getMenuForAction(_command);
+ if (mn == null) return null;
+ int idx = mn.indexOf(_command);
+ if (idx == -1) return null;
- EbliActionAbstract act=new EbliActionSimple(it.getText(),it.getIcon(),it.getActionCommand()) {
+ EbliActionAbstract act = new EbliActionSimple(it.getText(), it.getIcon(), it.getActionCommand()) {
public void actionPerformed(ActionEvent _evt) {
FudaaCommonImplementation.this.actionPerformed(_evt);
}
@@ -297,45 +298,48 @@
act.setDefaultToolTip(it.getToolTipText());
act.setKey(it.getAccelerator());
mn.remove(idx);
- mn.insert(act,idx)
+ mn.insert(act, idx)
// Pour rester compatible avec Bu.
- .setName("mi"+_command);
-
+ .setName("mi" + _command);
+
return act;
}
-
+
/**
* Cr\xE9ation des actions sp\xE9cifiques a Fudaa.
*/
private void buildActions() {
EbliActionAbstract act;
- act=replaceItemByAction("TOUTSELECTIONNER");
- if (act!=null) EbliActionMap.getInstance().addAction(act);
- act=replaceItemByAction("RECHERCHER");
- if (act!=null) EbliActionMap.getInstance().addAction(act);
+ act = replaceItemByAction("TOUTSELECTIONNER");
+ if (act != null) EbliActionMap.getInstance().addAction(act);
+ act = replaceItemByAction("RECHERCHER");
+ if (act != null) EbliActionMap.getInstance().addAction(act);
- act=new EbliActionSimple(CtuluLib.getS("Inverser la s\xE9lection"),BuResource.BU.getIcon("aucun"),"INVERSESELECTION") {
+ act = new EbliActionSimple(CtuluLib.getS("Inverser la s\xE9lection"), BuResource.BU.getIcon("aucun"),
+ "INVERSESELECTION") {
public void actionPerformed(ActionEvent _evt) {
FudaaCommonImplementation.this.actionPerformed(_evt);
}
};
- act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I,InputEvent.CTRL_MASK));
+ act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK));
EbliActionMap.getInstance().addAction(act);
- act=new EbliActionSimple(CtuluLib.getS("Effacer la s\xE9lection"),BuResource.BU.getIcon("effacer"),"CLEARSELECTION") {
+ act = new EbliActionSimple(CtuluLib.getS("Effacer la s\xE9lection"), BuResource.BU.getIcon("effacer"),
+ "CLEARSELECTION") {
public void actionPerformed(ActionEvent _evt) {
FudaaCommonImplementation.this.actionPerformed(_evt);
}
};
- act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
+ act.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK
+ | InputEvent.SHIFT_MASK));
EbliActionMap.getInstance().addAction(act);
-
- act=replaceItemByAction("DUPLIQUER");
+
+ act = replaceItemByAction("DUPLIQUER");
act.setEnabled(false);
- if (act!=null) EbliActionMap.getInstance().addAction(act);
+ if (act != null) EbliActionMap.getInstance().addAction(act);
}
-
+
/**
* Methode a surcharger pour ajouter ces propres panneaux de pref.
*/
@@ -463,8 +467,8 @@
((CtuluSelectionInterface) frame).inverseSelection();
}
} else if (action.equals("AIDE")) {
- //displayHelp(null);
- displayHelpPDF(getInformationsSoftware().baseManUrl());
+ // displayHelp(null);
+ displayHelpPDF(getInformationsSoftware().baseManUrl());
} else if (action.equals("AIDE_INDEX")) {
displayHelp(getInformationsSoftware().baseManUrl());
} else if (action.equals("INDEX_ALPHA")) {
@@ -488,26 +492,25 @@
return _dest.addMenuItem(FudaaLib.getS("Console"), "CONSOLE", FudaaResource.FUDAA.getIcon("tail"), FudaaTee
.isCreated());
}
-
-
+
FudaaHelpPDFViewer frameHelpPDF_;
-
+
/**
* Affiche la fenetre de viewer pdf
*/
- public void displayHelpPDF(String url){
- if(frameHelpPDF_==null){
- frameHelpPDF_=new FudaaHelpPDFViewer(url,this,false);
- }
- //-- ajout de la fenetre --//:
- this.addInternalFrame(frameHelpPDF_);
+ public void displayHelpPDF(String url) {
+ if (frameHelpPDF_ == null) {
+ frameHelpPDF_ = new FudaaHelpPDFViewer(url, this, false);
+ }
+ // -- ajout de la fenetre --//:
+ this.addInternalFrame(frameHelpPDF_);
}
-
+
protected void rebuildEditionMenu(final BuMenu _dest) {
- int indSelect=_dest.indexOf("TOUTSELECTIONNER");
- _dest.remove(indSelect+2);
- _dest.insert(EbliActionMap.getInstance().getAction("INVERSESELECTION"),indSelect+1);
- _dest.insert(EbliActionMap.getInstance().getAction("CLEARSELECTION"),indSelect+2);
+ int indSelect = _dest.indexOf("TOUTSELECTIONNER");
+ _dest.remove(indSelect + 2);
+ _dest.insert(EbliActionMap.getInstance().getAction("INVERSESELECTION"), indSelect + 1);
+ _dest.insert(EbliActionMap.getInstance().getAction("CLEARSELECTION"), indSelect + 2);
addConsoleMenu(_dest);
}
@@ -815,10 +818,10 @@
*/
public void init() {
super.init();
-
+
buildActions();
rebuildEditionMenu((BuMenu) getMainMenuBar().getMenu("MENU_EDITION"));
-
+
final BuToolBar tb = getMainToolBar();
// on place la nouvelle action apres le ranger Palettes
final int idx = findRangerPalette(tb);
@@ -996,15 +999,15 @@
_analyze.printResume();
}
if (_analyze.getFatalError() != null) {
- final CtuluAnalyze.Field f = _analyze.getFatalError();
- String deb = f.getMessage();
+ final String f = _analyze.getFatalError();
+ String deb = f;
if (_analyze.containsErrors()) {
- deb += CtuluLibString.LINE_SEP + CtuluAnalyze.getResume(_analyze.getErrorCanal(), 5);
+ deb += CtuluLibString.LINE_SEP + _analyze.getErrorResume();
}
error(_analyze.getDesc(), deb, false);
return true;
} else if (_analyze.containsErrors()) {
- error(_analyze.getDesc(), CtuluAnalyze.getResume(_analyze.getErrorCanal(), 5), false);
+ error(_analyze.getDesc(), _analyze.getErrorResume());
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
