diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java index 73f4a5c1a..bb3baea90 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java @@ -3,8 +3,7 @@ package de.uka.ilkd.key.ocl.gf; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; - -import org.apache.log4j.Logger; +import java.util.logging.*; /** * A class that offers a basic readGfEdit method with a lot of @@ -38,8 +37,8 @@ abstract class AbstractProber { skipChild(""); try { String next = fromProc.readLine(); - if (logger.isDebugEnabled()) { - logger.debug("2 " + next); + if (logger.isLoggable(Level.FINER)) { + logger.finer("2 " + next); } return next; } catch (IOException e) { @@ -84,13 +83,13 @@ abstract class AbstractProber { String next = ""; //read String readresult = fromProc.readLine(); - if (logger.isDebugEnabled()) { - logger.debug("1 " + next); + if (logger.isLoggable(Level.FINER)) { + logger.finer("1 " + next); } //read either or readresult = fromProc.readLine(); - if (logger.isDebugEnabled()) { - logger.debug("1 " + next); + if (logger.isLoggable(Level.FINER)) { + logger.finer("1 " + next); } next = readHmsg(readresult); @@ -101,8 +100,8 @@ abstract class AbstractProber { while ((next!=null)&&((next.length()==0)||(!next.trim().equals("")))) { next = fromProc.readLine(); if (next!=null){ - if (logger.isDebugEnabled()) { - logger.debug("1 " + next); + if (logger.isLoggable(Level.FINER)) { + logger.finer("1 " + next); } } else { System.exit(0); @@ -115,8 +114,8 @@ abstract class AbstractProber { for (int i=0; i<3 && !next.equals(""); i++){ next = fromProc.readLine(); - if (logger.isDebugEnabled()) { - logger.debug("1 " + next); + if (logger.isLoggable(Level.FINER)) { + logger.finer("1 " + next); } } @@ -135,13 +134,13 @@ abstract class AbstractProber { String closing = (new StringBuffer(opening)).insert(1, '/').toString(); try { String nextRead = fromProc.readLine(); - if (logger.isDebugEnabled()) { - logger.debug("3 " + nextRead); + if (logger.isLoggable(Level.FINER)) { + logger.finer("3 " + nextRead); } while (!nextRead.trim().equals(closing)) { nextRead = fromProc.readLine(); - if (logger.isDebugEnabled()) { - logger.debug("3 " + nextRead); + if (logger.isLoggable(Level.FINER)) { + logger.finer("3 " + nextRead); } } } catch (IOException e) { @@ -156,8 +155,8 @@ abstract class AbstractProber { * @param text the command, exactly the string that is going to be sent */ protected void send(String text) { - if (logger.isDebugEnabled()) { - logger.debug("## send: '" + text + "'"); + if (logger.isLoggable(Level.FINER)) { + logger.finer("## send: '" + text + "'"); } try { toProc.write(text, 0, text.length()); diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java index f617fa719..bab5b2fa9 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java @@ -1,6 +1,6 @@ package de.uka.ilkd.key.ocl.gf; -import org.apache.log4j.Logger; +import java.util.logging.*; /** * @author daniels diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java index 548395260..18233f5b6 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java @@ -9,7 +9,7 @@ import javax.swing.*; import javax.swing.tree.*; import javax.swing.event.*; -import org.apache.log4j.Logger; +import java.util.logging.*; //import de.uka.ilkd.key.util.KeYResourceManager; @@ -61,21 +61,21 @@ ActionListener{ public void valueChanged(TreeSelectionEvent e) { if (tree.getSelectionRows() != null) { if (gfeditor.nodeTable == null) { - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("null node table"); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("null node table"); } } else { - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("node table: " + gfeditor.nodeTable.contains(new Integer(0)) + " " + gfeditor.nodeTable.keys().nextElement()); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("node table: " + gfeditor.nodeTable.contains(new Integer(0)) + " " + gfeditor.nodeTable.keys().nextElement()); } } if (tree.getSelectionPath() == null) { - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("null root path"); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("null root path"); } } else { - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("selected path" + tree.getSelectionPath()); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("selected path" + tree.getSelectionPath()); } } int i = ((Integer) gfeditor.nodeTable.get(tree.getSelectionPath())).intValue(); @@ -166,8 +166,8 @@ ActionListener{ * as the parent */ public DefaultMutableTreeNode addObject(DefaultMutableTreeNode parent, Object child, boolean shouldBeVisible) { - if (logger.isDebugEnabled()) { - logger.debug("node added: '" + child + "', parent: '" + parent + "'"); + if (logger.isLoggable(Level.FINER)) { + logger.finer("node added: '" + child + "', parent: '" + parent + "'"); } DefaultMutableTreeNode childNode = new DefaultMutableTreeNode(child); @@ -205,9 +205,9 @@ ActionListener{ exc.printStackTrace(); } - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("The user has finished editing the node."); - GFEditor2.treeLogger.debug("New value: " + node.getUserObject()); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("The user has finished editing the node."); + GFEditor2.treeLogger.finer("New value: " + node.getUserObject()); } } public void treeNodesInserted(TreeModelEvent e) { @@ -298,8 +298,8 @@ ActionListener{ public void mousePressed(MouseEvent e) { int selRow = tree.getRowForLocation(e.getX(), e.getY()); tree.setSelectionRow(selRow); - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("selection changed!"); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("selection changed!"); } maybeShowPopup(e); } @@ -308,12 +308,12 @@ ActionListener{ //nothing to be done here } void maybeShowPopup(MouseEvent e) { - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("may be show Popup!"); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("may be show Popup!"); } if (e.isPopupTrigger()) { - if (GFEditor2.treeLogger.isDebugEnabled()) { - GFEditor2.treeLogger.debug("changing menu!"); + if (GFEditor2.treeLogger.isLoggable(Level.FINER)) { + GFEditor2.treeLogger.finer("changing menu!"); } popup = gfeditor.producePopup(); popup.show(e.getComponent(), e.getX(), e.getY()); diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java index bbbf41618..3bf757ea0 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java @@ -1,11 +1,4 @@ -/* - * Created on 20.04.2005 - */ package de.uka.ilkd.key.ocl.gf; - - -import org.apache.log4j.Logger; - /** * @author daniels * A class that represents a GF command together with its printname. @@ -21,8 +14,6 @@ import org.apache.log4j.Logger; */ abstract class GFCommand implements Comparable{ - protected static Logger subcatLogger = Logger.getLogger(GFEditor2.class.getName() + "_subcat"); - /** the subcategory of this command */ public abstract String getSubcat(); /** the type of the command, r,w,ch,d,ac,... */ diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java index a82560a19..bc393cf2e 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java @@ -11,7 +11,7 @@ import java.util.*; import java.net.URL; import javax.swing.text.html.HTMLDocument; import java.net.MalformedURLException; -import org.apache.log4j.Logger; +import java.util.logging.*; import jargs.gnu.CmdLineParser; public class GFEditor2 extends JFrame implements ActionListener, CaretListener, @@ -482,7 +482,7 @@ KeyListener, FocusListener { readAndDisplay(); Utils.tickProgress(pm, 9700, "Loading finished"); pm.close(); - logger.debug("GFEditor2 constructor finished"); + logger.finer("GFEditor2 constructor finished"); } /** @@ -497,14 +497,14 @@ KeyListener, FocusListener { private void initializeGF(String gfcmd, ProgressMonitor pm){ try { Utils.tickProgress(pm, 5250, "Starting GF"); - logger.debug("Trying: "+gfcmd); + logger.fine("Trying: "+gfcmd); Process extProc = Runtime.getRuntime().exec(gfcmd); InputStreamReader isr = new InputStreamReader( extProc.getInputStream(),"UTF8"); this.fromProc = new BufferedReader (isr); String defaultEncoding = isr.getEncoding(); - if (logger.isDebugEnabled()) { - logger.debug("encoding "+defaultEncoding); + if (logger.isLoggable(Level.FINER)) { + logger.finer("encoding "+defaultEncoding); } this.toProc = new BufferedWriter(new OutputStreamWriter(extProc.getOutputStream(),"UTF8")); @@ -583,7 +583,7 @@ KeyListener, FocusListener { final ActionListener showTreeListener = new ActionListener() { public void actionPerformed(ActionEvent e) { if (!((JCheckBoxMenuItem)e.getSource()).isSelected()){ - if (logger.isDebugEnabled()) logger.debug("showTree was selected"); + if (logger.isLoggable(Level.FINER)) logger.finer("showTree was selected"); treeCbMenuItem.setSelected(false); if (((JRadioButtonMenuItem)viewMenu.getItem(2)).isSelected()) { centerPanel.remove(treePanel); @@ -595,7 +595,7 @@ KeyListener, FocusListener { } } else { - if (logger.isDebugEnabled()) logger.debug("showTree was not selected"); + if (logger.isLoggable(Level.FINER)) logger.finer("showTree was not selected"); treeCbMenuItem.setSelected(true); if (((JRadioButtonMenuItem)viewMenu.getItem(2)).isSelected()) { centerPanel.remove(outputPanelUp); @@ -694,7 +694,7 @@ KeyListener, FocusListener { font = new Font(source.getText(), Font.PLAIN, font.getSize()); fontEveryWhere(font); } catch (ClassCastException e) { - logger.warn("Font change started on strange object\n" + e.getLocalizedMessage()); + logger.warning("Font change started on strange object\n" + e.getLocalizedMessage()); } } }; @@ -714,9 +714,9 @@ KeyListener, FocusListener { font = new Font(font.getFontName(), Font.PLAIN, Integer.parseInt(source.getText())); fontEveryWhere(font); } catch (ClassCastException e) { - logger.warn("Font change started on strange object\n" + e.getLocalizedMessage()); + logger.warning("Font change started on strange object\n" + e.getLocalizedMessage()); } catch (NumberFormatException e) { - logger.warn("strange size entry\n" + e.getLocalizedMessage()); + logger.warning("strange size entry\n" + e.getLocalizedMessage()); } } }; @@ -730,7 +730,6 @@ KeyListener, FocusListener { } //font stuff over - //TODO filter menu filterMenu.setToolTipText("Choosing the linearization representation format"); { ActionListener filterActionListener = new ActionListener() { @@ -764,7 +763,7 @@ KeyListener, FocusListener { send("ms " + action); return; } else { - logger.error("RadioListener on wrong object: " + action + "should either be 'typed' or 'untyped'"); + logger.warning("RadioListener on wrong object: " + action + "should either be 'typed' or 'untyped'"); } } }; @@ -801,7 +800,7 @@ KeyListener, FocusListener { resetPrintnames(true); return; } else { - logger.error("RadioListener on wrong object: " + action + "should either be 'typed' or 'untyped'"); + logger.warning("RadioListener on wrong object: " + action + "should either be 'typed' or 'untyped'"); } } }; @@ -872,15 +871,15 @@ KeyListener, FocusListener { } else { base = baseURL; } - if (logger.isDebugEnabled()) { - logger.debug("base for HTML: " + base); + if (logger.isLoggable(Level.FINER)) { + logger.finer("base for HTML: " + base); } ((HTMLDocument)this.htmlLinPane.getDocument()).setBase(base); } catch (MalformedURLException me) { - logger.error(me.getLocalizedMessage()); + logger.severe(me.getLocalizedMessage()); } } else { - logger.error("No HTMLDocument: " + this.htmlLinPane.getDocument().getClass().getName()); + logger.warning("No HTMLDocument: " + this.htmlLinPane.getDocument().getClass().getName()); } this.htmlLinPane.addCaretListener(new CaretListener() { /** @@ -895,25 +894,25 @@ KeyListener, FocusListener { int i = htmlOutputVector.size()-1; int start = htmlLinPane.getSelectionStart(); int end = htmlLinPane.getSelectionEnd(); - if (popUpLogger.isDebugEnabled()) { - popUpLogger.debug("CARET POSITION: " + htmlLinPane.getCaretPosition() + if (popUpLogger.isLoggable(Level.FINER)) { + popUpLogger.finer("CARET POSITION: " + htmlLinPane.getCaretPosition() + "\n-> SELECTION START POSITION: "+start + "\n-> SELECTION END POSITION: "+end); } - if (linMarkingLogger.isDebugEnabled()) { + if (linMarkingLogger.isLoggable(Level.FINER)) { if (end > 0 && (end < htmlLinPane.getDocument().getLength())) { try { - linMarkingLogger.debug("CHAR: " + htmlLinPane.getDocument().getText(end, 1)); + linMarkingLogger.finer("CHAR: " + htmlLinPane.getDocument().getText(end, 1)); } catch (BadLocationException ble) { - linMarkingLogger.warn(ble.getLocalizedMessage()); + linMarkingLogger.warning(ble.getLocalizedMessage()); } } } // not null selection: if ((i > -1) && (start < htmlLinPane.getDocument().getLength())) { - if (linMarkingLogger.isDebugEnabled()) + if (linMarkingLogger.isLoggable(Level.FINER)) for (int k=0; k < htmlOutputVector.size(); k++) { - linMarkingLogger.debug("element: "+k+" begin "+((HtmlMarkedArea)htmlOutputVector.elementAt(k)).htmlBegin+" " + linMarkingLogger.finer("element: "+k+" begin "+((HtmlMarkedArea)htmlOutputVector.elementAt(k)).htmlBegin+" " + "\n-> end: "+((HtmlMarkedArea)htmlOutputVector.elementAt(k)).htmlEnd+" " + "\n-> position: "+(((HtmlMarkedArea)htmlOutputVector.elementAt(k)).position).position+" " + "\n-> words: "+((HtmlMarkedArea)htmlOutputVector.elementAt(k)).words); @@ -926,8 +925,8 @@ KeyListener, FocusListener { while ((i >= 0) && (((HtmlMarkedArea)htmlOutputVector.elementAt(i)).htmlBegin > start)) { i--; } - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("i: "+i+" j: "+j); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("i: "+i+" j: "+j); } if ((j < htmlOutputVector.size())) { jElement = (HtmlMarkedArea)htmlOutputVector.elementAt(j); @@ -937,29 +936,29 @@ KeyListener, FocusListener { if (end>=jElement.htmlBegin) { iElement = (HtmlMarkedArea)htmlOutputVector.elementAt(0); iPosition = iElement.position.position; - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("Less: "+jPosition+" and "+iPosition); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("Less: "+jPosition+" and "+iPosition); } position = findMaxHtml(0,j); - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("SELECTEDTEXT: "+position+"\n"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("SELECTEDTEXT: "+position+"\n"); } treeChanged = true; send("mp "+position); } else { // before: - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("BEFORE vector of size: "+htmlOutputVector.size()); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("BEFORE vector of size: "+htmlOutputVector.size()); } } } else { // just: iElement = (HtmlMarkedArea)htmlOutputVector.elementAt(i); iPosition = iElement.position.position; - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("SELECTED TEXT Just: "+iPosition +" and "+jPosition+"\n"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("SELECTED TEXT Just: "+iPosition +" and "+jPosition+"\n"); } position = findMax(i,j); - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("SELECTEDTEXT: "+position+"\n"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("SELECTEDTEXT: "+position+"\n"); } treeChanged = true; send("mp "+position); @@ -971,26 +970,26 @@ KeyListener, FocusListener { if (start<=iElement.htmlEnd) { jElement = (HtmlMarkedArea)htmlOutputVector.elementAt(htmlOutputVector.size()-1); jPosition = jElement.position.position; - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("MORE: "+iPosition+ " and "+jPosition); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("MORE: "+iPosition+ " and "+jPosition); } position = findMax(i,htmlOutputVector.size()-1); - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("SELECTEDTEXT: "+position+"\n"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("SELECTEDTEXT: "+position+"\n"); } treeChanged = true; send("mp "+position); // after: - } else if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("AFTER vector of size: "+htmlOutputVector.size()); + } else if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("AFTER vector of size: "+htmlOutputVector.size()); } } else { // bigger: iElement = (HtmlMarkedArea)htmlOutputVector.elementAt(0); iPosition = iElement.position.position; jElement = (HtmlMarkedArea)htmlOutputVector.elementAt(htmlOutputVector.size()-1); jPosition = jElement.position.position; - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("BIGGER: "+iPosition +" and "+jPosition+"\n" + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("BIGGER: "+iPosition +" and "+jPosition+"\n" + "\n-> SELECTEDTEXT: []\n"); } treeChanged = true; @@ -1267,14 +1266,14 @@ KeyListener, FocusListener { * @param andRead if true, the returned XML will be read an displayed accordingly */ protected void send(String text, boolean andRead) { - if (sendLogger.isDebugEnabled()) { - sendLogger.debug("## send: '" + text + "'"); + if (sendLogger.isLoggable(Level.FINER)) { + sendLogger.finer("## send: '" + text + "'"); } try { this.display = new Display(displayType); display(true, false); - if (xmlLogger.isDebugEnabled()) { - xmlLogger.debug("output cleared\n\n\n"); + if (xmlLogger.isLoggable(Level.FINER)) { + xmlLogger.finer("output cleared\n\n\n"); } this.htmlOutputVector = new Vector(); this.textOutputVector = new Vector(); @@ -1313,7 +1312,7 @@ KeyListener, FocusListener { } else { try { next = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("1 " + next); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("1 " + next); } catch (IOException e) { System.err.println("Could not read from external process:\n" + e); } @@ -1335,11 +1334,11 @@ KeyListener, FocusListener { String readresult = ""; StringBuffer outputStringBuffer = new StringBuffer(); readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("1 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("1 "+readresult); while ((readresult.indexOf("gf")==-1) && (readresult.trim().indexOf("<") < 0)){ outputStringBuffer.append(readresult).append("\n"); readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("1 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("1 "+readresult); } this.display.addToStages(outputStringBuffer.toString(), outputStringBuffer.toString().replaceAll("\\n", "
")); display(true, false); @@ -1364,7 +1363,7 @@ KeyListener, FocusListener { int progress = 5300; while (!(readresult.indexOf("") > -1 || (readresult.indexOf("") > -1))){ readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("1 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("1 "+readresult); textPure.append(readresult).append("\n"); textHtml.append(readresult).append("
\n"); progress += 12; @@ -1398,12 +1397,12 @@ KeyListener, FocusListener { try { //read or or (in case of no grammar loaded) String readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("12 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("12 "+readresult); //when old grammars are loaded, the first line looks like //"reading grammar of old format letter.Abs.gfreading old file letter.Abs.gf" if (readresult.indexOf("") > -1) { readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("12 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("12 "+readresult); } String next = readHmsg(readresult); @@ -1427,10 +1426,10 @@ KeyListener, FocusListener { String next = ""; //read String readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("11 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("11 "+readresult); //read either or readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("11 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("11 "+readresult); //hmsg stuff next = readHmsg(readresult); @@ -1440,7 +1439,7 @@ KeyListener, FocusListener { while ((next!=null)&&((next.length()==0)||(next.indexOf("8) @@ -1764,20 +1763,20 @@ KeyListener, FocusListener { //read /show //read send result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("8 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("8 "+result); result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("8 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("8 "+result); String myCommand = result; commandVector.add(this.result); //read /send (discarded) result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("8 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("8 "+result); // read /item result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("8 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("8 "+result); result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("8 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("8 "+result); final boolean isAbstract = "Abstract".equals(this.selectedMenuLanguage); RealCommand gfc = new RealCommand(myCommand, processedSubcats, this.printnameManager, showText, isAbstract); @@ -1878,11 +1877,11 @@ KeyListener, FocusListener { StringBuffer s =new StringBuffer(""); try { String readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("7 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("7 "+readresult); while (readresult.indexOf("/hmsg")==-1){ s.append(readresult).append('\n'); readresult = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("7 "+readresult); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("7 "+readresult); } if (s.indexOf("c") > -1) { //clear output before linearization @@ -1900,7 +1899,7 @@ KeyListener, FocusListener { this.newObject = true; } result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("7 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("7 "+result); return result; } catch(IOException e){ System.err.println(e.getMessage()); @@ -1924,15 +1923,15 @@ KeyListener, FocusListener { linearization=""; linearization += result+"\n"; result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("6 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("6 "+result); while ((result!=null)&&(result.indexOf("/linearization")==-1)){ linearization += result+"\n"; result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("6 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("6 "+result); } if (newObject) formLin(); result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("6 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("6 "+result); } catch(IOException e){ System.err.println(e.getMessage()); e.printStackTrace(); @@ -1947,11 +1946,11 @@ KeyListener, FocusListener { String treeString = ""; try { result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("6 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("6 "+result); while (result.indexOf("/tree")==-1){ treeString += result+"\n"; result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("6 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("6 "+result); } if (treeChanged && (newObject)) { formTree(tree, treeString); @@ -1959,7 +1958,7 @@ KeyListener, FocusListener { } treeString=""; result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("6 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("6 "+result); } catch(IOException e){ System.err.println(e.getMessage()); e.printStackTrace(); @@ -1975,11 +1974,11 @@ KeyListener, FocusListener { String s =""; try { result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("7 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("7 "+result); while (result.indexOf("/message")==-1){ s += result+"\n"; result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("7 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("7 "+result); } if (s.length()>1) { this.display.addToStages("-------------\n" + s, "
" + s); @@ -1987,7 +1986,7 @@ KeyListener, FocusListener { display(false, false); } result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("7 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("7 "+result); } catch(IOException e){ System.err.println(e.getMessage()); e.printStackTrace(); @@ -2005,8 +2004,8 @@ KeyListener, FocusListener { try { //read first cat result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) { - xmlLogger.debug("2 "+result); + if (xmlLogger.isLoggable(Level.FINER)) { + xmlLogger.finer("2 "+result); } if (result.indexOf("(none)") > -1) { //no topics present @@ -2022,29 +2021,29 @@ KeyListener, FocusListener { more = false; //read result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("2 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("2 "+result); //read result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("3 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("3 "+result); //read actual language result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("4 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("4 "+result); //read the languages and select the last non-abstract more = true; @@ -2071,10 +2070,10 @@ KeyListener, FocusListener { } // read result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("2 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("2 "+result); // read or result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("3 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("3 "+result); if ((result.indexOf("/gfinit")!=-1)||(result.indexOf("lin")!=-1)) more = false; if (result.indexOf("/gfinit")!=-1) @@ -2084,7 +2083,7 @@ KeyListener, FocusListener { String path = result.substring(result.indexOf('=')+1, result.indexOf('>')); path =path.substring(path.lastIndexOf('/')+1); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("name: "+path); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("name: "+path); fileString +="--" + path +"\n"; if (path.lastIndexOf('.')!=path.indexOf('.')) grammar.setText(path.substring(0, @@ -2092,10 +2091,10 @@ KeyListener, FocusListener { } //TODO in case of finished, read "", otherwise ... result = fromProc.readLine(); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("4 "+result); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("4 "+result); } } catch(IOException e){ - logger.warn(e.getMessage()); + logger.warning(e.getMessage()); } } @@ -2113,8 +2112,8 @@ KeyListener, FocusListener { protected StringBuffer outputAppend(boolean clickable, boolean doDisplay){ final StringBuffer linCollector = new StringBuffer(); //result=result.replace('\n',' '); - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("INPUT:"+result); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("INPUT:"+result); } int focusTagBegin = this.result.indexOf(" POSITION END: "+positionEnd); } - if (xmlLogger.isDebugEnabled()) { - xmlLogger.debug("form Lin1: "+this.result); + if (xmlLogger.isLoggable(Level.FINER)) { + xmlLogger.finer("form Lin1: "+this.result); } this.focusPosition = new LinPosition(result.substring(positionBegin+9,positionEnd+1), this.result.substring(positionBegin,focusTagEnd).indexOf("incorrect")==-1); @@ -2155,8 +2154,8 @@ KeyListener, FocusListener { // beware the side-effects! They are, what counts linCollector.append(appendMarked(this.result + '\n', clickable, doDisplay)); } -// if (logger.isDebugEnabled()) { -// logger.debug("collected appended linearizations:\n" + linCollector.toString()); +// if (logger.isLoggable(Level.FINER)) { +// logger.finer("collected appended linearizations:\n" + linCollector.toString()); // } return linCollector; } @@ -2216,8 +2215,8 @@ KeyListener, FocusListener { // appending sth. linearizationArea this.display.addToStages("\n************\n", "

"); } - if (xmlLogger.isDebugEnabled()) { - xmlLogger.debug("linearization for the language: "+result); + if (xmlLogger.isLoggable(Level.FINER)) { + xmlLogger.finer("linearization for the language: "+result); } // we want the side-effects of outputAppend final boolean isAbstract = "Abstract".equals(language); @@ -2255,8 +2254,8 @@ KeyListener, FocusListener { //check, if and how ma should be highlighted boolean incorrect = false; boolean focused = false; - if (redLogger.isDebugEnabled()) { - redLogger.debug("Highlighting: " + ma); + if (redLogger.isLoggable(Level.FINER)) { + redLogger.finer("Highlighting: " + ma); } if (!ma.position.correctPosition) { incorrectMA.add(ma); @@ -2290,8 +2289,8 @@ KeyListener, FocusListener { } } -// if (logger.isDebugEnabled()) { -// logger.debug("completeLin: \n" + completeLin); +// if (logger.isLoggable(Level.FINER)) { +// logger.finer("completeLin: \n" + completeLin); // } } @@ -2340,11 +2339,11 @@ KeyListener, FocusListener { end = this.htmlLinPane.getDocument().getLength(); } this.htmlLinPane.getHighlighter().addHighlight(begin, end, new DefaultHighlighter.DefaultHighlightPainter(color)); - if (redLogger.isDebugEnabled()) { - redLogger.debug("HTML HIGHLIGHT: " + this.htmlLinPane.getDocument().getText(begin, end - begin) + "; Color:" + color); + if (redLogger.isLoggable(Level.FINER)) { + redLogger.finer("HTML HIGHLIGHT: " + this.htmlLinPane.getDocument().getText(begin, end - begin) + "; Color:" + color); } } catch (BadLocationException e) { - redLogger.warn("HTML highlighting problem!\n" + e.getLocalizedMessage() + " : " + e.offsetRequested() + "\nHtmlMarkedArea: " + ma + "\nhtmlLinPane length: " + this.htmlLinPane.getDocument().getLength()); + redLogger.warning("HTML highlighting problem!\n" + e.getLocalizedMessage() + " : " + e.offsetRequested() + "\nHtmlMarkedArea: " + ma + "\nhtmlLinPane length: " + this.htmlLinPane.getDocument().getLength()); } } @@ -2363,11 +2362,11 @@ KeyListener, FocusListener { end = this.linearizationArea.getText().length() + 1; } this.linearizationArea.getHighlighter().addHighlight(begin, end, new DefaultHighlighter.DefaultHighlightPainter(color)); - if (redLogger.isDebugEnabled()) { - redLogger.debug("HIGHLIGHT: " + this.linearizationArea.getText(begin, end - begin) + "; Color:" + color); + if (redLogger.isLoggable(Level.FINER)) { + redLogger.finer("HIGHLIGHT: " + this.linearizationArea.getText(begin, end - begin) + "; Color:" + color); } } catch (BadLocationException e) { - redLogger.warn("highlighting problem!\n" + e.getLocalizedMessage() + " : " + e.offsetRequested() + "\nMarkedArea: " + ma + "\nlinearizationArea length: " + this.linearizationArea.getText().length()); + redLogger.warning("highlighting problem!\n" + e.getLocalizedMessage() + " : " + e.offsetRequested() + "\nMarkedArea: " + ma + "\nlinearizationArea length: " + this.linearizationArea.getText().length()); } } @@ -2471,7 +2470,7 @@ KeyListener, FocusListener { item.setFont(font); } //String name = item.getClass().getName(); - //if (logger.isDebugEnabled()) logger.debug(name); + //if (logger.isLoggable(Level.FINER)) logger.finer(name); } } } @@ -2523,8 +2522,8 @@ KeyListener, FocusListener { * @param treeString the string representation for the XML tree */ protected void formTree(DynamicTree2 myTreePanel, String treeString) { - if (treeLogger.isDebugEnabled()) { - treeLogger.debug("treeString: "+ treeString); + if (treeLogger.isLoggable(Level.FINER)) { + treeLogger.finer("treeString: "+ treeString); } /** @@ -2623,8 +2622,8 @@ KeyListener, FocusListener { } //if tooltip turns out to be null that's OK String paramTooltip = parentPrintname.htmlifySingleParam(paramPosition); -// if (logger.isDebugEnabled()) { -// logger.debug("new node-parsing: '" + name + "', fun: '" + fun + "', type: '" + paramType + "'"); +// if (logger.isLoggable(Level.FINER)) { +// logger.finer("new node-parsing: '" + name + "', fun: '" + fun + "', type: '" + paramType + "'"); // } and = new UnrefinedAstNodeData(paramTooltip, node); @@ -2649,8 +2648,8 @@ KeyListener, FocusListener { //show the selected as the 'selected' one in the JTree myTreePanel.tree.setSelectionPath(path); myTreePanel.oldSelection = index; - if (treeLogger.isDebugEnabled()) { - treeLogger.debug("new selected index "+ index); + if (treeLogger.isLoggable(Level.FINER)) { + treeLogger.finer("new selected index "+ index); } } } @@ -2667,8 +2666,8 @@ KeyListener, FocusListener { public void keyPressed(KeyEvent e) { int keyCode = e.getKeyCode(); Object obj = e.getSource(); - if (keyLogger.isDebugEnabled()) { - keyLogger.debug("Key pressed: " + e.toString()); + if (keyLogger.isLoggable(Level.FINER)) { + keyLogger.finer("Key pressed: " + e.toString()); } if (obj==refinementSubcatList) { @@ -2701,7 +2700,7 @@ KeyListener, FocusListener { getLayeredPane().remove(parseField); treeChanged = true; send("p "+parseField.getText()); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("sending parse string: "+parseField.getText()); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("sending parse string: "+parseField.getText()); repaint(); } else if (keyCode == KeyEvent.VK_ESCAPE) { getLayeredPane().remove(parseField); @@ -2789,22 +2788,22 @@ KeyListener, FocusListener { int i = this.htmlOutputVector.size()-1; int start = linearizationArea.getSelectionStart(); int end = linearizationArea.getSelectionEnd(); - if (popUpLogger.isDebugEnabled()) { - popUpLogger.debug("CARET POSITION: "+linearizationArea.getCaretPosition() + if (popUpLogger.isLoggable(Level.FINER)) { + popUpLogger.finer("CARET POSITION: "+linearizationArea.getCaretPosition() + "\n-> SELECTION START POSITION: "+start + "\n-> SELECTION END POSITION: "+end); } - if (linMarkingLogger.isDebugEnabled()) { + if (linMarkingLogger.isLoggable(Level.FINER)) { if (end>0&&(end-1)&&(start end: "+((MarkedArea)this.htmlOutputVector.elementAt(k)).end+" " + "\n-> position: "+(((MarkedArea)this.htmlOutputVector.elementAt(k)).position).position+" " + "\n-> words: "+((MarkedArea)this.htmlOutputVector.elementAt(k)).words); @@ -2815,8 +2814,8 @@ KeyListener, FocusListener { // localising start: while ((i>=0)&&(((MarkedArea)this.htmlOutputVector.elementAt(i)).begin > start)) i--; - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("i: "+i+" j: "+j); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("i: "+i+" j: "+j); } if ((j SELECTEDTEXT: []\n"); } treeChanged = true; @@ -2955,8 +2954,8 @@ KeyListener, FocusListener { // is something before the tag? // is the case in the first run if (subtreeBegin-currentLength>1) { - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("SOMETHING BEFORE THE TAG"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("SOMETHING BEFORE THE TAG"); } if (this.currentPosition.size()>0) newLength = register(currentLength, subtreeBegin, (LinPosition)this.currentPosition.elementAt(this.currentPosition.size()-1), restString); @@ -2965,8 +2964,8 @@ KeyListener, FocusListener { restString.substring(subtreeBegin,subtreeTagEnd).indexOf("incorrect")==-1), restString); } else { // nothing before the tag: //the case in the beginning - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("NOTHING BEFORE THE TAG"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("NOTHING BEFORE THE TAG"); } if (nextOpeningTagBegin>0) { newLength = register(subtreeTagEnd+2, nextOpeningTagBegin, position, restString); @@ -2979,8 +2978,8 @@ KeyListener, FocusListener { } else {// l tag: if (subtreeEnd-currentLength>1) { - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("SOMETHING BEFORE THE TAG"); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("SOMETHING BEFORE THE TAG"); } if (this.currentPosition.size()>0) newLength = register(currentLength, subtreeEnd, (LinPosition)this.currentPosition.elementAt(this.currentPosition.size()-1), restString); @@ -2994,8 +2993,8 @@ KeyListener, FocusListener { // punctuation after the tag: if (restString.substring(subtreeEnd+10,subtreeEnd+11).trim().length()>0) { - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("PUNCTUATION AFTER THE TAG" + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("PUNCTUATION AFTER THE TAG" + "/n" + "STRING: " + restString); } //cutting the tag first!: @@ -3004,8 +3003,8 @@ KeyListener, FocusListener { } else { restString = removeSubTreeTag(restString,subtreeEnd, subtreeEnd+9); } - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("STRING after cutting the tag: "+restString); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("STRING after cutting the tag: "+restString); } // cutting the space in the last registered component: if (this.htmlOutputVector.size()>0) { @@ -3014,8 +3013,8 @@ KeyListener, FocusListener { currentLength -=1; } } - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("currentLength: " + currentLength); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("currentLength: " + currentLength); } // register the punctuation: if (this.currentPosition.size()>0) { @@ -3034,15 +3033,15 @@ KeyListener, FocusListener { subtreeBegin = Utils.indexOfNotEscaped(restString, ""); @@ -3066,8 +3065,8 @@ KeyListener, FocusListener { } // appending: restString = unescapeTextFromGF(restString); - if (redLogger.isDebugEnabled()) { - redLogger.debug(restString); + if (redLogger.isLoggable(Level.FINER)) { + redLogger.finer(restString); } appendedPureText = restString.replaceAll("&-","\n "); //display the text if not already done in case of clickable @@ -3155,10 +3154,10 @@ KeyListener, FocusListener { String toAdd = unescapeTextFromGF(stringToAppend); final HtmlMarkedArea hma = this.display.addAsMarked(toAdd, position); this.htmlOutputVector.add(hma); - if (htmlLogger.isDebugEnabled()) { - htmlLogger.debug("HTML added : " + hma); - } //} else if (linMarkingLogger.isDebugEnabled()) { - // linMarkingLogger.debug("whiteSpaces: " + newLength); + if (htmlLogger.isLoggable(Level.FINER)) { + htmlLogger.finer("HTML added : " + hma); + } //} else if (linMarkingLogger.isLoggable(Level.FINER)) { + // linMarkingLogger.finer("whiteSpaces: " + newLength); //} } //some words to register return newLength; @@ -3176,8 +3175,8 @@ KeyListener, FocusListener { */ private String removeSubTreeTag (final String s, final int start, final int end) { String restString = s; - if (linMarkingLogger.isDebugEnabled()) { - linMarkingLogger.debug("removing: "+ start +" to "+ end); + if (linMarkingLogger.isLoggable(Level.FINER)) { + linMarkingLogger.finer("removing: "+ start +" to "+ end); } int difference =end-start+1; int positionStart, positionEnd; @@ -3209,7 +3208,7 @@ KeyListener, FocusListener { */ protected void listAction(JList list, int index, boolean doubleClick) { if (index == -1) { - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("no selection"); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("no selection"); } else { GFCommand command; if (list == refinementList) { @@ -3259,8 +3258,8 @@ KeyListener, FocusListener { if (value != null) { treeChanged = true; send("g "+value); - if (logger.isDebugEnabled()) { - logger.debug("sending string " + value); + if (logger.isLoggable(Level.FINER)) { + logger.finer("sending string " + value); } } else { this.display.addToStages("\n" + reason.toString(), "

" + reason.toString() + "

"); @@ -3375,8 +3374,8 @@ KeyListener, FocusListener { public void mousePressed(MouseEvent e) { // int selStart = tree.getRowForLocation(e.getX(), e.getY()); // output.setSelectionRow(selStart); - if (popUpLogger.isDebugEnabled()) { - popUpLogger.debug("mouse pressed2: "+linearizationArea.getSelectionStart()+" "+linearizationArea.getSelectionEnd()); + if (popUpLogger.isLoggable(Level.FINER)) { + popUpLogger.finer("mouse pressed2: "+linearizationArea.getSelectionStart()+" "+linearizationArea.getSelectionEnd()); } maybeShowPopup(e); } @@ -3388,8 +3387,8 @@ KeyListener, FocusListener { //int i=outputVector.size()-1; // right click: if (e.isPopupTrigger()) { - if (popUpLogger.isDebugEnabled()) { - popUpLogger.debug("changing pop-up menu2!"); + if (popUpLogger.isLoggable(Level.FINER)) { + popUpLogger.finer("changing pop-up menu2!"); } popup2 = producePopup(); popup2.show(e.getComponent(), e.getX(), e.getY()); @@ -3401,8 +3400,8 @@ KeyListener, FocusListener { // selection Exists: if (!selectedText.equals("")) { - if (popUpLogger.isDebugEnabled()) { - popUpLogger.debug(e.getX() + " " + e.getY()); + if (popUpLogger.isLoggable(Level.FINER)) { + popUpLogger.finer(e.getX() + " " + e.getY()); } if (selectedText.length()<5) if (treeCbMenuItem.isSelected()) @@ -3460,13 +3459,13 @@ KeyListener, FocusListener { File file = saveFc.getSelectedFile(); // opening the file for editing : - if (logger.isDebugEnabled()) logger.debug("opening: "+ file.getPath().replace('\\', File.separatorChar)); + if (logger.isLoggable(Level.FINER)) logger.finer("opening: "+ file.getPath().replace('\\', File.separatorChar)); if (saveTypeGroup.getSelection().getActionCommand().equals("term")) { - if (logger.isDebugEnabled()) logger.debug(" opening as a term "); + if (logger.isLoggable(Level.FINER)) logger.finer(" opening as a term "); send("open "+ file.getPath().replace('\\', File.separatorChar)); } else { - if (logger.isDebugEnabled()) logger.debug(" opening as a linearization "); + if (logger.isLoggable(Level.FINER)) logger.finer(" opening as a linearization "); send("openstring "+ file.getPath().replace('\\', File.separatorChar)); } @@ -3495,7 +3494,7 @@ KeyListener, FocusListener { int returnVal = saveFc.showSaveDialog(GFEditor2.this); if (returnVal == JFileChooser.APPROVE_OPTION) { File file = saveFc.getSelectedFile(); - if (logger.isDebugEnabled()) logger.debug("saving as " + file); + if (logger.isLoggable(Level.FINER)) logger.finer("saving as " + file); final String abstractLin = linearizations.get("Abstract").toString(); if (saveTypeGroup.getSelection().getActionCommand().equals("term")) { @@ -3519,11 +3518,11 @@ KeyListener, FocusListener { } if (sthAtAll) { writeOutput(text.toString(), file.getPath()); - if (logger.isDebugEnabled()) logger.debug(file + " saved."); + if (logger.isLoggable(Level.FINER)) logger.finer(file + " saved."); } else { - if (logger.isDebugEnabled()) logger.warn("no concrete language shown, saving abstract"); + if (logger.isLoggable(Level.FINER)) logger.warning("no concrete language shown, saving abstract"); writeOutput(abstractLin, file.getPath()); - if (logger.isDebugEnabled()) logger.debug(file + " saved."); + if (logger.isLoggable(Level.FINER)) logger.finer(file + " saved."); } } } @@ -3555,7 +3554,7 @@ KeyListener, FocusListener { resetNewCategoryMenu(); langMenuModel.resetLanguages(); // importing a new language : - if (logger.isDebugEnabled()) logger.debug("importing: "+ file.getPath().replace('\\','/')); + if (logger.isLoggable(Level.FINER)) logger.finer("importing: "+ file.getPath().replace('\\','/')); fileString =""; send("i "+ file.getPath().replace('\\',File.separatorChar), false); readGfinit(); @@ -3749,7 +3748,7 @@ KeyListener, FocusListener { commandInput = s; //s = "gf "+s; This is for debugging, otherwise shift the comment to the next line. treeChanged = true; - if (logger.isDebugEnabled()) logger.debug("sending: "+ s); + if (logger.isLoggable(Level.FINER)) logger.finer("sending: "+ s); send(s); } } @@ -3879,7 +3878,7 @@ KeyListener, FocusListener { if (!alreadyPresent) { //add item to the language list: JCheckBoxMenuItem cbMenuItem = new JCheckBoxMenuItem(lat.lang); - if (menuLogger.isDebugEnabled()) menuLogger.debug("menu item: " + lat.lang); + if (menuLogger.isLoggable(Level.FINER)) menuLogger.finer("menu item: " + lat.lang); cbMenuItem.setSelected(lat.active); cbMenuItem.setActionCommand("lang"); cbMenuItem.addActionListener(this.langDisplayListener); @@ -3890,8 +3889,8 @@ KeyListener, FocusListener { rbMenuItem.addActionListener(this.menuLanguageListener); languageGroup.add(rbMenuItem); if (lat.lang.equals(selectedMenuLanguage)) { - if (menuLogger.isDebugEnabled()) { - menuLogger.debug("Selecting " + selectedMenuLanguage); + if (menuLogger.isLoggable(Level.FINER)) { + menuLogger.finer("Selecting " + selectedMenuLanguage); } rbMenuItem.setSelected(true); } @@ -3920,7 +3919,7 @@ KeyListener, FocusListener { } } if (!alreadyThere) { - menuLogger.warn(myLang + " not yet known"); + menuLogger.warning(myLang + " not yet known"); } } @@ -3939,8 +3938,8 @@ KeyListener, FocusListener { } } if (!alreadyThere) { - if (menuLogger.isDebugEnabled()) { - menuLogger.debug(myLang + " added"); + if (menuLogger.isLoggable(Level.FINER)) { + menuLogger.finer(myLang + " added"); } LangActiveTuple lat = new LangActiveTuple(myLang, myActive); this.languages.add(lat); @@ -4006,8 +4005,8 @@ KeyListener, FocusListener { } else { sendLang = action; } - if (xmlLogger.isDebugEnabled()){ - xmlLogger.debug("sending "+sendLang); + if (xmlLogger.isLoggable(Level.FINER)){ + xmlLogger.finer("sending "+sendLang); } send("ml " + sendLang); resetPrintnames(true); @@ -4031,15 +4030,15 @@ KeyListener, FocusListener { } final String lang = ((JCheckBoxMenuItem)e.getSource()).getText(); if (((JCheckBoxMenuItem)e.getSource()).isSelected()){ - if (menuLogger.isDebugEnabled()) { - menuLogger.debug("turning on language '" + lang + "'"); + if (menuLogger.isLoggable(Level.FINER)) { + menuLogger.finer("turning on language '" + lang + "'"); } setActive(lang, true); send("on " + lang); } else{ - if (menuLogger.isDebugEnabled()) { - menuLogger.debug("turning off language '" + lang + "'"); + if (menuLogger.isLoggable(Level.FINER)) { + menuLogger.finer("turning off language '" + lang + "'"); } setActive(lang, false); send("off " + lang); diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java index 21f2f6aac..433df9394 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java @@ -1,7 +1,3 @@ -/* - * Created on 06.05.2005 - * - */ package de.uka.ilkd.key.ocl.gf; /** diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java index 93a965b2d..f8b933bef 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java @@ -1,7 +1,5 @@ package de.uka.ilkd.key.ocl.gf; -import org.apache.log4j.Logger; - /** * @author daniels * @@ -11,7 +9,6 @@ import org.apache.log4j.Logger; * Reason: No GUI stuff in the command. */ class InputCommand extends GFCommand { - protected final static Logger logger = Logger.getLogger(Printname.class.getName()); public static InputCommand intInputCommand = new InputCommand("read in Integer", "opens a dialog window in which an Integer can be entered", int.class, diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java index 83cbfe652..9f6021535 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java @@ -2,8 +2,7 @@ package de.uka.ilkd.key.ocl.gf; import java.util.Hashtable; import java.util.Vector; - -import org.apache.log4j.Logger; +import java.util.logging.*; /** * @author daniels @@ -114,7 +113,7 @@ class Printname { try { name = (String)this.paramNames.get(n); } catch (ArrayIndexOutOfBoundsException e) { - subcatLogger.warn(e.getLocalizedMessage()); + subcatLogger.warning(e.getLocalizedMessage()); } return name; } @@ -204,8 +203,8 @@ class Printname { String fullName = subcatPart.substring(indFull + 1, indFullEnd); this.subcat = subcatPart.substring(0, indFull).trim(); this.subcatNameHashtable.put(this.subcat, fullName); - if (subcatLogger.isDebugEnabled()) { - subcatLogger.debug("new fullname '" + fullName + "' for category (shortname) '" + this.subcat + "'"); + if (subcatLogger.isLoggable(Level.FINER)) { + subcatLogger.finer("new fullname '" + fullName + "' for category (shortname) '" + this.subcat + "'"); } } else { subcat = subcatPart.trim(); @@ -394,7 +393,7 @@ class Printname { + "
" + this.paramTexts.get(which) + "
"; return result; } catch (ArrayIndexOutOfBoundsException e) { - subcatLogger.warn(e.getLocalizedMessage()); + subcatLogger.warning(e.getLocalizedMessage()); return ""; } diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java index aeb0a442e..1fde57da7 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java @@ -4,8 +4,7 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.util.Hashtable; -import org.apache.log4j.Logger; - +import java.util.logging.*; /** * @author daniels * asks GF to print all available printnames, parses that list and generates @@ -37,8 +36,8 @@ public class PrintnameLoader extends AbstractProber { protected void readMessage() { try { String result = this.fromProc.readLine(); - if (nogger.isDebugEnabled()) { - nogger.debug("1 " + result); + if (nogger.isLoggable(Level.FINER)) { + nogger.finer("1 " + result); } //first read line is , but this one gets filtered out in the next line while (result.indexOf("/message")==-1){ @@ -50,12 +49,12 @@ public class PrintnameLoader extends AbstractProber { } result = this.fromProc.readLine(); - if (nogger.isDebugEnabled()) { - nogger.debug("1 " + result); + if (nogger.isLoggable(Level.FINER)) { + nogger.finer("1 " + result); } } - if (nogger.isDebugEnabled()) { - nogger.debug("finished loading printnames"); + if (nogger.isLoggable(Level.FINER)) { + nogger.finer("finished loading printnames"); } } catch(IOException e){ System.err.println(e.getMessage()); diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java index c837c0684..8773599d6 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java @@ -1,6 +1,6 @@ package de.uka.ilkd.key.ocl.gf; import java.util.Hashtable; -import org.apache.log4j.Logger; +import java.util.logging.*; /** * @author daniels @@ -73,12 +73,12 @@ class PrintnameManager { * @param myPrintname the printname given by GF */ protected void addNewPrintname(String myFun, String myPrintname, String type) { - if (logger.isDebugEnabled()) { - logger.debug("addNewPrintname, myFun = '" + myFun + "' , myPrintname = '" + myPrintname + "'"); + if (logger.isLoggable(Level.FINER)) { + logger.finer("addNewPrintname, myFun = '" + myFun + "' , myPrintname = '" + myPrintname + "'"); } Printname printname = new Printname(myFun, myPrintname, this.subcatNames, type); - if (logger.isDebugEnabled()) { - logger.debug("printname = '" + printname + "'"); + if (logger.isLoggable(Level.FINER)) { + logger.finer("printname = '" + printname + "'"); } this.printnames.put(myFun, printname); } @@ -110,7 +110,7 @@ class PrintnameManager { // which does not occur in the refinement menu. // if that is not wanted, don't call this method! if (!myFun.startsWith("?")) { - logger.info("no printname for '" + myFun + "', pretend that it is a bound variable"); + logger.fine("no printname for '" + myFun + "', pretend that it is a bound variable"); return new Printname(myFun); } } diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java index 0a76d8df9..75695adcd 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java @@ -1,9 +1,3 @@ -/* - * Created on 13.05.2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ package de.uka.ilkd.key.ocl.gf; import java.awt.BorderLayout; @@ -23,7 +17,7 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTextField; -import org.apache.log4j.Logger; +import java.util.logging.*; /** * Takes care of reading in Strings that are to be parsed and terms. @@ -166,23 +160,23 @@ class ReadDialog implements ActionListener{ termInput = inputField.getText(); if (termInput.indexOf(File.separatorChar)==-1){ owner.send("g "+termInput); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("sending term string"); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("sending term string"); } else { owner.send("tfile "+termInput); - if (xmlLogger.isDebugEnabled()) { - xmlLogger.debug("sending file term: "+termInput); + if (xmlLogger.isLoggable(Level.FINER)) { + xmlLogger.finer("sending file term: "+termInput); } } } else { //String selected parseInput = inputField.getText(); if (parseInput.indexOf(File.separatorChar)==-1){ owner.send("p "+parseInput); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("sending parse string: "+parseInput); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("sending parse string: "+parseInput); } else { owner.send("pfile "+parseInput); - if (xmlLogger.isDebugEnabled()) xmlLogger.debug("sending file parse string: "+parseInput); + if (xmlLogger.isLoggable(Level.FINER)) xmlLogger.finer("sending file parse string: "+parseInput); } } readDialog.setVisible(false); diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java index 64a56fb42..ee6778f60 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java @@ -1,12 +1,8 @@ -/* - * Created on 21.04.2005 - * - */ package de.uka.ilkd.key.ocl.gf; import java.util.HashSet; import java.util.HashMap; -import org.apache.log4j.Logger; +import java.util.logging.*; /** * @author daniels @@ -36,8 +32,8 @@ class RealCommand extends GFCommand { fullnames.put("ch", "change head"); fullnames.put("rc", "refine from history:"); } - if (logger.isDebugEnabled()) { - logger.debug("new RealCommand: " + myCommand); + if (logger.isLoggable(Level.FINEST)) { + logger.finest("new RealCommand: " + myCommand); } this.command = myCommand.trim(); this.showText = myShowText; diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java index 616ad87ec..31bdbaa17 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java @@ -1,6 +1,3 @@ -/* - * Created on 27.04.2005 - */ package de.uka.ilkd.key.ocl.gf; /** diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java index 55da51b02..370e1d7d1 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java @@ -1,13 +1,6 @@ -/* - * Created on 13.04.2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ package de.uka.ilkd.key.ocl.gf; import java.awt.Component; -import org.apache.log4j.Logger; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; @@ -19,8 +12,6 @@ import javax.swing.ListCellRenderer; */ public class ToolTipCellRenderer extends JLabel implements ListCellRenderer { - protected static Logger logger = Logger.getLogger(ToolTipCellRenderer.class.getName()); - /** * Returns a JLabel with a tooltip, which is given by the GFCommand * @param list Well, the list this cell belongs to diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java index 3310368c0..f5c47d7b1 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java @@ -4,8 +4,7 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.util.Hashtable; - -import org.apache.log4j.Logger; +import java.util.logging.*; /** * @author daniels @@ -14,7 +13,7 @@ import org.apache.log4j.Logger; */ public class TypesLoader extends AbstractProber { protected final Hashtable hashtable; - protected static Logger nogger = Logger.getLogger(Printname.class.getName()); + protected static Logger nogger = Logger.getLogger(TypesLoader.class.getName()); /** * @param fromGf The GF process * @param toGf The GF process @@ -33,8 +32,8 @@ public class TypesLoader extends AbstractProber { protected void readMessage() { try { String result = this.fromProc.readLine(); - if (nogger.isDebugEnabled()) { - nogger.debug("7 " + result); + if (nogger.isLoggable(Level.FINER)) { + nogger.finer("7 " + result); } //first read line is , but this one gets filtered out in the next line while (result.indexOf("/message")==-1){ @@ -45,12 +44,12 @@ public class TypesLoader extends AbstractProber { } result = this.fromProc.readLine(); - if (nogger.isDebugEnabled()) { - nogger.debug("7 " + result); + if (nogger.isLoggable(Level.FINER)) { + nogger.finer("7 " + result); } } - if (nogger.isDebugEnabled()) { - nogger.debug("finished loading printnames"); + if (nogger.isLoggable(Level.FINER)) { + nogger.finer("finished loading printnames"); } } catch(IOException e){ System.err.println(e.getMessage()); @@ -66,7 +65,9 @@ public class TypesLoader extends AbstractProber { public void readTypes() { //prints the last loaded grammar, String sendString = "gf pg"; - nogger.info("collecting types :" + sendString); + if (nogger.isLoggable(Level.FINE)) { + nogger.fine("collecting types :" + sendString); + } send(sendString); readGfedit(); } @@ -82,8 +83,8 @@ public class TypesLoader extends AbstractProber { final int typeStartIndex = line.indexOf(" : ") + 3; final int typeEndIndex = line.lastIndexOf(" = "); try { - final String type = line.substring(typeStartIndex, typeEndIndex); - this.hashtable.put(fun, type); + final String type = line.substring(typeStartIndex, typeEndIndex); + this.hashtable.put(fun, type); } catch (StringIndexOutOfBoundsException e) { System.err.println("line: '" + line + "'"); System.err.println("fun: '" + fun + "'"); diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java index 79ef4a9df..b1d2d6ba9 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java @@ -1,7 +1,3 @@ -/* - * Created on 27.04.2005 - * - */ package de.uka.ilkd.key.ocl.gf; /** diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java index 0ecd5eb43..37084e10c 100644 --- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java +++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java @@ -11,14 +11,13 @@ package de.uka.ilkd.key.ocl.gf; import java.io.File; - +import java.util.logging.*; import javax.swing.ProgressMonitor; - -import org.apache.log4j.Logger; +//import org.apache.log4j.Logger; public class Utils { - protected static Logger timeLogger = Logger.getLogger("de.uka.ilkd.key.ocl.gf.utils.timer"); - protected static Logger deleteLogger = Logger.getLogger("de.uka.ilkd.key.ocl.gf.utils.delete"); + protected static Logger timeLogger = Logger.getLogger(Utils.class.getName() + ".timer"); + protected static Logger deleteLogger = Logger.getLogger(Utils.class.getName() + ".delete"); private Utils() { //non-instantiability enforced @@ -48,8 +47,8 @@ public class Utils { */ public static void tickProgress(ProgressMonitor pm, int progress, String note) { if (note != null) { - if (timeLogger.isDebugEnabled()) { - timeLogger.debug(System.currentTimeMillis() + " : " + note); + if (timeLogger.isLoggable(Level.FINER)) { + timeLogger.finer(System.currentTimeMillis() + " : " + note); } } if (pm == null) { @@ -71,8 +70,8 @@ public class Utils { String filename = grammarsDir + File.separator + GFEditor2.modelModulName + endings[i]; File file = new File(filename); file.deleteOnExit(); - if (deleteLogger.isDebugEnabled()) { - deleteLogger.debug("scheduled for deletion: " + filename); + if (deleteLogger.isLoggable(Level.FINER)) { + deleteLogger.fine("scheduled for deletion: " + filename); } } File file = new File(grammarsDir); @@ -95,13 +94,13 @@ public class Utils { * Only gets called in stand-alone mode, not when run with KeY. */ public static void configureLogger() { - if ((new File(LOGGER_CONFIGURATION)).exists()) - org.apache.log4j.PropertyConfigurator.configureAndWatch( - LOGGER_CONFIGURATION, 1500); - else { - org.apache.log4j.BasicConfigurator.configure(); - Logger.getRootLogger().setLevel(org.apache.log4j.Level.ERROR); - } +// if ((new File(LOGGER_CONFIGURATION)).exists()) +// org.apache.log4j.PropertyConfigurator.configureAndWatch( +// LOGGER_CONFIGURATION, 1500); +// else { +// org.apache.log4j.BasicConfigurator.configure(); +// Logger.getRootLogger().setLevel(org.apache.log4j.Level.ERROR); +// } } /**