Skip to content

Commit

Permalink
Remove xstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@rm5248
rm5248 committed Dec 25, 2022
1 parent 30166c1 commit 75bedf9
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 453 deletions.
5 changes: 0 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,6 @@
<artifactId>jmdns</artifactId>
<version>3.5.7</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.19</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
Expand Down
89 changes: 0 additions & 89 deletions src/main/java/org/apache/log4j/chainsaw/ApplicationPreferenceModelSaver.java
View file

This file was deleted.

94 changes: 46 additions & 48 deletions src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
*/
package org.apache.log4j.chainsaw;

import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SettingsListener;
Expand Down Expand Up @@ -127,35 +125,35 @@ public void remove(Component component) {
*/

public void saveSettings(SaveSettingsEvent event) {
File file = new File(SettingsManager.getInstance().getSettingsDirectory(), "tab-settings.xml");
XStream stream = new XStream(new DomDriver());
try {
FileWriter writer = new FileWriter(file);
int count = super.getTabCount();
String title;
SavableTabSetting setting = new SavableTabSetting();
for (int i = 0; i < count; i++) {
title = super.getTitleAt(i);
switch (title) {
case WELCOME_TAB:
setting.setWelcome(true);
break;
case "chainsaw-log":
setting.setChainsawLog(true);
break;
case ZEROCONF:
setting.setZeroconf(true);
break;
}
}

stream.toXML(setting, writer);
writer.close();

} catch (Exception e) {
file.delete();
e.printStackTrace();
}
// File file = new File(SettingsManager.getInstance().getSettingsDirectory(), "tab-settings.xml");
// XStream stream = new XStream(new DomDriver());
// try {
// FileWriter writer = new FileWriter(file);
// int count = super.getTabCount();
// String title;
// SavableTabSetting setting = new SavableTabSetting();
// for (int i = 0; i < count; i++) {
// title = super.getTitleAt(i);
// switch (title) {
// case WELCOME_TAB:
// setting.setWelcome(true);
// break;
// case "chainsaw-log":
// setting.setChainsawLog(true);
// break;
// case ZEROCONF:
// setting.setZeroconf(true);
// break;
// }
// }
//
// stream.toXML(setting, writer);
// writer.close();
//
// } catch (Exception e) {
// file.delete();
// e.printStackTrace();
// }
}

/**
Expand All @@ -165,22 +163,22 @@ public void saveSettings(SaveSettingsEvent event) {
*/

public void loadSettings(LoadSettingsEvent event) {
File file = new File(SettingsManager.getInstance().getSettingsDirectory(), "tab-settings.xml");
XStream stream = new XStream(new DomDriver());
try {
if (file.exists()) {
FileReader reader = new FileReader(file);
tabSetting = (SavableTabSetting) stream.fromXML(reader);
reader.close();
} else {
tabSetting = new SavableTabSetting();
tabSetting.setWelcome(true);
tabSetting.setChainsawLog(true);
tabSetting.setZeroconf(true);
}
} catch (Exception e) {
e.printStackTrace();
file.delete();
}
// File file = new File(SettingsManager.getInstance().getSettingsDirectory(), "tab-settings.xml");
// XStream stream = new XStream(new DomDriver());
// try {
// if (file.exists()) {
// FileReader reader = new FileReader(file);
// tabSetting = (SavableTabSetting) stream.fromXML(reader);
// reader.close();
// } else {
// tabSetting = new SavableTabSetting();
// tabSetting.setWelcome(true);
// tabSetting.setChainsawLog(true);
// tabSetting.setZeroconf(true);
// }
// } catch (Exception e) {
// e.printStackTrace();
// file.delete();
// }
}
}
77 changes: 0 additions & 77 deletions src/main/java/org/apache/log4j/chainsaw/LogPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.log4j.chainsaw;

import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import org.apache.log4j.chainsaw.color.ColorPanel;
import org.apache.log4j.chainsaw.color.RuleColorizer;
import org.apache.log4j.chainsaw.filter.FilterModel;
Expand All @@ -30,9 +28,7 @@
import org.apache.log4j.chainsaw.layout.LayoutEditorPane;
import org.apache.log4j.chainsaw.prefs.LoadSettingsEvent;
import org.apache.log4j.chainsaw.prefs.Profileable;
import org.apache.log4j.chainsaw.prefs.SaveSettingsEvent;
import org.apache.log4j.chainsaw.prefs.SettingsManager;
import org.apache.log4j.chainsaw.xstream.TableColumnConverter;
import org.apache.log4j.helpers.Constants;
import org.apache.log4j.rule.ColorRule;
import org.apache.log4j.rule.ExpressionRule;
Expand Down Expand Up @@ -2209,79 +2205,6 @@ private void loadSettings() {
// colorizer.loadColorSettings(identifier);
}

/**
* Save preferences to the panel preference model
*
* @param event
* @see LogPanelPreferenceModel
*/
public void saveSettings(SaveSettingsEvent event) {
File xmlFile;
try {
xmlFile = new File(SettingsManager.getInstance().getSettingsDirectory(), URLEncoder.encode(identifier, "UTF-8") + ".xml");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
//unable to save..just return
return;
}

preferenceModel.setHiddenLoggers(new HashSet(logTreePanel.getHiddenSet()));
preferenceModel.setHiddenExpression(logTreePanel.getHiddenExpression());
preferenceModel.setAlwaysDisplayExpression(logTreePanel.getAlwaysDisplayExpression());
List visibleOrder = new ArrayList();
Enumeration<TableColumn> cols = table.getColumnModel().getColumns();
while (cols.hasMoreElements()) {
TableColumn c = cols.nextElement();
visibleOrder.add(c);
}
preferenceModel.setVisibleColumnOrder(visibleOrder);
//search table will use same columns as main table

XStream stream = buildXStreamForLogPanelPreference();
ObjectOutputStream s = null;
try {
FileWriter w = new FileWriter(xmlFile);
s = stream.createObjectOutputStream(w);
s.writeObject(preferenceModel);
// if (isDetailPanelVisible) {
// //use current size
// s.writeInt(lowerPanel.getDividerLocation());
// } else {
// //use size when last hidden
// s.writeInt(lowerPanelDividerLocation);
// }
s.writeInt(nameTreeAndMainPanelSplit.getDividerLocation());
s.writeObject(detailLayout.getConversionPattern());
//this is a version number written to the file to identify that there is a Vector serialized after this
s.writeInt(LOG_PANEL_SERIALIZATION_VERSION_NUMBER);
//don't write filterexpressionvector, write the combobox's model's backing vector
Vector combinedVector = new Vector();
combinedVector.addAll(filterCombo.getModelData());
combinedVector.addAll(findCombo.getModelData());
//duplicates will be removed when loaded..
s.writeObject(combinedVector);
} catch (Exception ex) {
ex.printStackTrace();
// TODO need to log this..
} finally {
if (s != null) {
try {
s.close();
} catch (IOException ioe) {
}
}
}

//no need to URL encode the identifier
// colorizer.saveColorSettings(identifier);
}

private XStream buildXStreamForLogPanelPreference() {
XStream stream = new XStream(new DomDriver());
stream.registerConverter(new TableColumnConverter());
return stream;
}

public void setRuleColorizer(RuleColorizer newRuleColor){
if( newRuleColor == colorizer ){
return;
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/org/apache/log4j/chainsaw/prefs/MRUFileList.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*/
package org.apache.log4j.chainsaw.prefs;

import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;

import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
Expand Down Expand Up @@ -96,18 +94,4 @@ public List getMRUList() {
public static MRUFileList log4jMRU() {
return log4jList;
}

public static void loadLog4jMRUListFromXML(String xml) {
XStream xstream = new XStream(new DomDriver());
log4jList = (MRUFileList) xstream.fromXML(xml);
fireChangeEvent();
}

public static void loadLog4jMRUListFromReader(Reader reader) {
XStream xstream = new XStream(new DomDriver());
log4jList = (MRUFileList) xstream.fromXML(reader);
fireChangeEvent();

}
// TODO Auto-generated method stub
}

0 comments on commit 75bedf9

Please sign in to comment.