Skip to content

Commit 9fc20ce

Browse files
committed
more reorganisation of code
1 parent 2f7aa96 commit 9fc20ce

File tree

62 files changed

+129
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+129
-192
lines changed

src/main/java/com/tagtraum/perf/gcviewer/util/AutoCompletionComboBox.java src/main/java/com/tagtraum/perf/gcviewer/AutoCompletionComboBox.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.tagtraum.perf.gcviewer.util;
1+
package com.tagtraum.perf.gcviewer;
22

3-
import com.tagtraum.perf.gcviewer.RecentURLsModel;
43

54
import javax.swing.*;
65
import java.awt.event.ItemListener;

src/main/java/com/tagtraum/perf/gcviewer/util/AutoCompletionTextField.java src/main/java/com/tagtraum/perf/gcviewer/AutoCompletionTextField.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.tagtraum.perf.gcviewer.util;
1+
package com.tagtraum.perf.gcviewer;
22

3-
import com.tagtraum.perf.gcviewer.RecentURLsModel;
43

54
import javax.swing.*;
65
import javax.swing.event.ListDataListener;

src/main/java/com/tagtraum/perf/gcviewer/ChartPanelView.java

+3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
import javax.swing.SwingUtilities;
3333
import javax.swing.event.SwingPropertyChangeSupport;
3434

35+
import com.tagtraum.perf.gcviewer.imp.DataReader;
36+
import com.tagtraum.perf.gcviewer.imp.DataReaderFactory;
3537
import com.tagtraum.perf.gcviewer.log.TextAreaLogHandler;
38+
import com.tagtraum.perf.gcviewer.model.GCModel;
3639

3740

3841
/**

src/main/java/com/tagtraum/perf/gcviewer/FileTransferHandler.java

-58
This file was deleted.

src/main/java/com/tagtraum/perf/gcviewer/ModelChartImpl.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
import javax.swing.JPopupMenu;
2727
import javax.swing.JScrollPane;
2828

29-
import com.tagtraum.perf.gcviewer.AbstractGCEvent.Generation;
29+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
30+
import com.tagtraum.perf.gcviewer.model.GCEvent;
31+
import com.tagtraum.perf.gcviewer.model.GCModel;
32+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Generation;
3033
import com.tagtraum.perf.gcviewer.renderer.FullGCLineRenderer;
3134
import com.tagtraum.perf.gcviewer.renderer.GCRectanglesRenderer;
3235
import com.tagtraum.perf.gcviewer.renderer.GCTimesRenderer;

src/main/java/com/tagtraum/perf/gcviewer/ModelPanel.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import javax.swing.JPanel;
1818
import javax.swing.JTabbedPane;
1919

20+
import com.tagtraum.perf.gcviewer.model.GCModel;
2021
import com.tagtraum.perf.gcviewer.util.MemoryFormat;
2122
import com.tagtraum.perf.gcviewer.util.TimeFormat;
2223

src/main/java/com/tagtraum/perf/gcviewer/action/Export.java

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package com.tagtraum.perf.gcviewer.action;
22

33
import com.tagtraum.perf.gcviewer.*;
4+
import com.tagtraum.perf.gcviewer.exp.DataWriter;
5+
import com.tagtraum.perf.gcviewer.exp.DataWriterFactory;
6+
import com.tagtraum.perf.gcviewer.model.GCModel;
47

58
import javax.swing.*;
69
import java.awt.*;

src/main/java/com/tagtraum/perf/gcviewer/action/OpenURL.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tagtraum.perf.gcviewer.action;
22

3+
import com.tagtraum.perf.gcviewer.AutoCompletionComboBox;
34
import com.tagtraum.perf.gcviewer.GCViewer;
45
import com.tagtraum.perf.gcviewer.RecentURLsModel;
5-
import com.tagtraum.perf.gcviewer.util.AutoCompletionComboBox;
66

77
import javax.swing.*;
88
import java.awt.*;

src/main/java/com/tagtraum/perf/gcviewer/exp/CSVDataWriter.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.tagtraum.perf.gcviewer.exp;
22

3-
import com.tagtraum.perf.gcviewer.DataWriter;
4-
import com.tagtraum.perf.gcviewer.GCEvent;
5-
import com.tagtraum.perf.gcviewer.GCModel;
3+
import com.tagtraum.perf.gcviewer.model.GCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCModel;
65

76
import java.io.IOException;
87
import java.io.OutputStream;

src/main/java/com/tagtraum/perf/gcviewer/DataWriter.java src/main/java/com/tagtraum/perf/gcviewer/exp/DataWriter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
package com.tagtraum.perf.gcviewer;
1+
package com.tagtraum.perf.gcviewer.exp;
22

33
import java.io.IOException;
44

5+
import com.tagtraum.perf.gcviewer.model.GCModel;
6+
57
/**
68
* Writes a GCModel into a given Stream.
79
*

src/main/java/com/tagtraum/perf/gcviewer/DataWriterFactory.java src/main/java/com/tagtraum/perf/gcviewer/exp/DataWriterFactory.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package com.tagtraum.perf.gcviewer;
1+
package com.tagtraum.perf.gcviewer.exp;
22

3-
import com.tagtraum.perf.gcviewer.exp.CSVDataWriter;
4-
import com.tagtraum.perf.gcviewer.exp.PlainDataWriter;
53

64
import java.io.File;
75
import java.io.FileOutputStream;

src/main/java/com/tagtraum/perf/gcviewer/exp/PlainDataWriter.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.tagtraum.perf.gcviewer.exp;
22

3-
import com.tagtraum.perf.gcviewer.DataWriter;
4-
import com.tagtraum.perf.gcviewer.GCEvent;
5-
import com.tagtraum.perf.gcviewer.GCModel;
6-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
3+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCEvent;
5+
import com.tagtraum.perf.gcviewer.model.GCModel;
76

87
import java.io.IOException;
98
import java.io.OutputStream;

src/main/java/com/tagtraum/perf/gcviewer/imp/AbstractDataReaderSun.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
import java.util.logging.Level;
88
import java.util.logging.Logger;
99

10-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
11-
import com.tagtraum.perf.gcviewer.DataReader;
12-
import com.tagtraum.perf.gcviewer.GCEvent;
10+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
11+
import com.tagtraum.perf.gcviewer.model.GCEvent;
1312
import com.tagtraum.perf.gcviewer.util.NumberParser;
1413
import com.tagtraum.perf.gcviewer.util.ParsePosition;
1514

src/main/java/com/tagtraum/perf/gcviewer/DataReader.java src/main/java/com/tagtraum/perf/gcviewer/imp/DataReader.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
package com.tagtraum.perf.gcviewer;
1+
package com.tagtraum.perf.gcviewer.imp;
22

33
import java.io.IOException;
44

5+
import com.tagtraum.perf.gcviewer.model.GCModel;
6+
57
/**
68
*
79
* Date: Jan 30, 2002

src/main/java/com/tagtraum/perf/gcviewer/DataReaderFactory.java src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tagtraum.perf.gcviewer;
1+
package com.tagtraum.perf.gcviewer.imp;
22

33
import com.tagtraum.perf.gcviewer.imp.*;
44

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderHPUX1_2.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.tagtraum.perf.gcviewer.imp;
22

3-
import com.tagtraum.perf.gcviewer.DataReader;
4-
import com.tagtraum.perf.gcviewer.GCModel;
5-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
6-
import com.tagtraum.perf.gcviewer.GCEvent;
3+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCEvent;
5+
import com.tagtraum.perf.gcviewer.model.GCModel;
76

87
import java.io.IOException;
98
import java.io.InputStream;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderHPUX1_4_1.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
*/
77
package com.tagtraum.perf.gcviewer.imp;
88

9-
import com.tagtraum.perf.gcviewer.DataReader;
10-
import com.tagtraum.perf.gcviewer.GCModel;
11-
import com.tagtraum.perf.gcviewer.GCEvent;
12-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
9+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
10+
import com.tagtraum.perf.gcviewer.model.GCEvent;
11+
import com.tagtraum.perf.gcviewer.model.GCModel;
1312

1413
import java.util.logging.Logger;
1514
import java.util.logging.Level;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderIBM1_3_0.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.tagtraum.perf.gcviewer.imp;
22

3-
import com.tagtraum.perf.gcviewer.DataReader;
4-
import com.tagtraum.perf.gcviewer.GCEvent;
5-
import com.tagtraum.perf.gcviewer.GCModel;
6-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
3+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCEvent;
5+
import com.tagtraum.perf.gcviewer.model.GCModel;
76

87
import java.io.IOException;
98
import java.io.InputStream;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderIBM1_3_1.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.tagtraum.perf.gcviewer.imp;
22

3-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
4-
import com.tagtraum.perf.gcviewer.DataReader;
5-
import com.tagtraum.perf.gcviewer.GCEvent;
6-
import com.tagtraum.perf.gcviewer.GCModel;
3+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCEvent;
5+
import com.tagtraum.perf.gcviewer.model.GCModel;
76

87
import java.io.IOException;
98
import java.io.InputStream;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderIBM1_4_2.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
*/
77
package com.tagtraum.perf.gcviewer.imp;
88

9-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
10-
import com.tagtraum.perf.gcviewer.DataReader;
11-
import com.tagtraum.perf.gcviewer.GCModel;
12-
import com.tagtraum.perf.gcviewer.GCEvent;
9+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
10+
import com.tagtraum.perf.gcviewer.model.GCEvent;
11+
import com.tagtraum.perf.gcviewer.model.GCModel;
1312

1413
import java.util.logging.Logger;
1514
import java.util.logging.Level;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderIBM_J9_5_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
*/
99
package com.tagtraum.perf.gcviewer.imp;
1010

11-
import com.tagtraum.perf.gcviewer.DataReader;
12-
import com.tagtraum.perf.gcviewer.GCModel;
11+
import com.tagtraum.perf.gcviewer.model.GCModel;
12+
1313
import org.xml.sax.SAXException;
1414
import org.xml.sax.helpers.DefaultHandler;
1515

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderIBMi5OS1_4_2.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.tagtraum.perf.gcviewer.imp;
22

3-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
4-
import com.tagtraum.perf.gcviewer.DataReader;
5-
import com.tagtraum.perf.gcviewer.GCEvent;
6-
import com.tagtraum.perf.gcviewer.GCModel;
3+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCEvent;
5+
import com.tagtraum.perf.gcviewer.model.GCModel;
76

87
import java.io.IOException;
98
import java.io.InputStream;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderJRockit1_4_2.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import java.util.logging.Level;
88
import java.util.logging.Logger;
99

10-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
11-
import com.tagtraum.perf.gcviewer.AbstractGCEvent.Generation;
12-
import com.tagtraum.perf.gcviewer.DataReader;
13-
import com.tagtraum.perf.gcviewer.GCEvent;
14-
import com.tagtraum.perf.gcviewer.GCModel;
10+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
11+
import com.tagtraum.perf.gcviewer.model.GCEvent;
12+
import com.tagtraum.perf.gcviewer.model.GCModel;
13+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Generation;
1514

1615
/**
1716
* DataReaderJRockit1_4_2.

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderSun1_2_2.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.tagtraum.perf.gcviewer.imp;
22

3-
import com.tagtraum.perf.gcviewer.DataReader;
4-
import com.tagtraum.perf.gcviewer.GCEvent;
5-
import com.tagtraum.perf.gcviewer.GCModel;
6-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
3+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
4+
import com.tagtraum.perf.gcviewer.model.GCEvent;
5+
import com.tagtraum.perf.gcviewer.model.GCModel;
76

87
import java.io.BufferedReader;
98
import java.io.IOException;

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderSun1_3_1.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
import java.util.logging.Level;
1010
import java.util.logging.Logger;
1111

12-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
13-
import com.tagtraum.perf.gcviewer.DataReader;
14-
import com.tagtraum.perf.gcviewer.GCEvent;
15-
import com.tagtraum.perf.gcviewer.GCModel;
12+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
13+
import com.tagtraum.perf.gcviewer.model.GCEvent;
14+
import com.tagtraum.perf.gcviewer.model.GCModel;
1615
import com.tagtraum.perf.gcviewer.util.ParsePosition;
1716

1817
/**

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderSun1_4_0.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
import java.util.logging.Logger;
1010
import java.util.regex.Pattern;
1111

12-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
13-
import com.tagtraum.perf.gcviewer.DataReader;
14-
import com.tagtraum.perf.gcviewer.GCEvent;
15-
import com.tagtraum.perf.gcviewer.GCModel;
12+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
13+
import com.tagtraum.perf.gcviewer.model.GCEvent;
14+
import com.tagtraum.perf.gcviewer.model.GCModel;
1615
import com.tagtraum.perf.gcviewer.util.ParsePosition;
1716

1817
/**

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderSun1_5_0.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import java.util.logging.Level;
66
import java.util.logging.Logger;
77

8-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
9-
import com.tagtraum.perf.gcviewer.AbstractGCEvent.Concurrency;
10-
import com.tagtraum.perf.gcviewer.ConcurrentGCEvent;
11-
import com.tagtraum.perf.gcviewer.GCEvent;
8+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
9+
import com.tagtraum.perf.gcviewer.model.ConcurrentGCEvent;
10+
import com.tagtraum.perf.gcviewer.model.GCEvent;
11+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Concurrency;
1212
import com.tagtraum.perf.gcviewer.util.ParsePosition;
1313

1414
/**

src/main/java/com/tagtraum/perf/gcviewer/imp/DataReaderSun1_6_0.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import java.util.regex.Matcher;
1313
import java.util.regex.Pattern;
1414

15-
import com.tagtraum.perf.gcviewer.AbstractGCEvent;
16-
import com.tagtraum.perf.gcviewer.AbstractGCEvent.Concurrency;
17-
import com.tagtraum.perf.gcviewer.AbstractGCEvent.GcPattern;
18-
import com.tagtraum.perf.gcviewer.ConcurrentGCEvent;
19-
import com.tagtraum.perf.gcviewer.GCEvent;
20-
import com.tagtraum.perf.gcviewer.GCModel;
15+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent;
16+
import com.tagtraum.perf.gcviewer.model.ConcurrentGCEvent;
17+
import com.tagtraum.perf.gcviewer.model.GCEvent;
18+
import com.tagtraum.perf.gcviewer.model.GCModel;
19+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.Concurrency;
20+
import com.tagtraum.perf.gcviewer.model.AbstractGCEvent.GcPattern;
2121
import com.tagtraum.perf.gcviewer.util.ParsePosition;
2222

2323
public class DataReaderSun1_6_0 extends DataReaderSun1_5_0 {

0 commit comments

Comments
 (0)