logging-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sde...@apache.org
Subject svn commit: r830433 - /logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
Date Wed, 28 Oct 2009 03:53:22 GMT
Author: sdeboy
Date: Wed Oct 28 03:53:22 2009
New Revision: 830433

URL: http://svn.apache.org/viewvc?rev=830433&view=rev
Log:
Remove propertieslistmodelmap from eventtypeentrycontainer (auto-completion of property keys
still supported, just not property values)

Modified:
    logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java

Modified: logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
URL: http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java?rev=830433&r1=830432&r2=830433&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
(original)
+++ logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/filter/EventTypeEntryContainer.java
Wed Oct 28 03:53:22 2009
@@ -53,7 +53,6 @@
   private DefaultListModel loggerListModel = new DefaultListModel();
   private DefaultListModel threadListModel = new DefaultListModel();
   private DefaultListModel fileNameListModel = new DefaultListModel();
-  private Map propertiesListModelMap = new HashMap();
   private Map modelMap = new HashMap();
   private static final String LOGGER_FIELD = "LOGGER";
   private static final String LEVEL_FIELD = "LEVEL";
@@ -77,7 +76,7 @@
   
   public boolean modelExists(String fieldName) {
       if (fieldName != null) {
-        return (fieldName.toUpperCase().startsWith(PROP_FIELD) || modelMap.keySet().contains(fieldName.toUpperCase()));
+        return modelMap.keySet().contains(fieldName.toUpperCase());
       }
       return false;
   }
@@ -88,14 +87,6 @@
           if (model != null) {
               return model;
           }
-          //drop prop field and optional ticks around field name
-          if (fieldName.startsWith(PROP_FIELD)) {
-              fieldName = fieldName.substring(PROP_FIELD.length());
-              if ((fieldName.startsWith("'")) && (fieldName.endsWith("'"))) {
-                  fieldName = fieldName.substring(1, fieldName.length() - 1);
-              }
-          }
-          return (ListModel)propertiesListModelMap.get(fieldName);
       }
       return null;
   } 
@@ -157,14 +148,6 @@
             if (!(propListModel.contains(entry.getKey()))) {
                 propListModel.addElement(entry.getKey());
             }
-            DefaultListModel model = (DefaultListModel)propertiesListModelMap.get(entry.getKey());
-            if (model == null) {
-                model = new DefaultListModel();
-                propertiesListModelMap.put(entry.getKey(), model);
-            }
-            if (!(model.contains(entry.getValue()))) {
-                model.addElement(entry.getValue());
-            }
         }
     }
 }



Mime
View raw message