Skip to content

Commit c3db9aa

Browse files
chewiebugchewiebug
committed
updates for Sun Java 1.6.x (CMS collector + experimental G1 support)
1 parent 69cc749 commit c3db9aa

40 files changed

+6145
-917
lines changed

‎.classpath

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
4+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
5+
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
7+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
8+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
9+
<classpathentry kind="output" path="target/classes"/>
10+
</classpath>

‎.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>GCViewer</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎README

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Supported verbose:gc formats are:
2222

2323
Best results are achieved with: -Xloggc:<file> -XX:+PrintGCDetails -XX:+PrintGCDateStamps
2424

25-
Up to GCViewer 1.29 was written by Hendrik Schreiber. What you are seeing
26-
here is based on his very good work.
25+
Hendrik Schreiber wrote GCViewer up to 1.29. What you are seeing here is based
26+
on his very good work.
2727
In detail descriptions of most JVM parameters relevant to garbage collection
2828
can be found at http://www.tagtraum.com/gcviewer-vmflags.html
2929

‎pom.xml

+67-55
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,69 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.tagtraum</groupId>
5-
<artifactId>gcviewer</artifactId>
6-
<version>1.29</version>
7-
<packaging>jar</packaging>
8-
<name>GCViewer</name>
9-
<url>http://www.tagtraum.com/gcviewer.html</url>
10-
<developers>
11-
<developer>
12-
<name>Hendrik Schreiber</name>
13-
<email>[email protected]</email>
14-
<url>http://www.tagtraum.com/</url>
15-
<organization>tagtraum industries incorporated</organization>
16-
<organizationUrl>http://www.tagtraum.com/</organizationUrl>
17-
</developer>
18-
</developers>
19-
<licenses>
20-
<license>
21-
<name>GNU Lesser General Public License 2.1</name>
22-
<url>http://www.gnu.org/licenses/lgpl.txt</url>
23-
</license>
24-
</licenses>
25-
<dependencies>
26-
<dependency>
27-
<groupId>junit</groupId>
28-
<artifactId>junit</artifactId>
29-
<version>3.8.2</version>
30-
<scope>test</scope>
31-
</dependency>
32-
</dependencies>
33-
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<configuration>
39-
<source>1.4</source>
40-
<target>1.4</target>
41-
</configuration>
42-
</plugin>
43-
<plugin>
44-
<groupId>org.apache.maven.plugins</groupId>
45-
<artifactId>maven-jar-plugin</artifactId>
46-
<configuration>
47-
<archive>
48-
<manifest>
49-
<mainClass>com.tagtraum.perf.gcviewer.GCViewer</mainClass>
50-
<addClasspath>true</addClasspath>
51-
</manifest>
52-
</archive>
53-
</configuration>
54-
</plugin>
55-
</plugins>
56-
</build>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.tagtraum</groupId>
5+
<artifactId>gcviewer</artifactId>
6+
<version>1.31</version>
7+
<packaging>jar</packaging>
8+
<name>GCViewer</name>
9+
<url>http://www.tagtraum.com/gcviewer.html</url>
10+
<developers>
11+
<developer>
12+
<name>Hendrik Schreiber</name>
13+
<email>[email protected]</email>
14+
<url>http://www.tagtraum.com/</url>
15+
<organization>tagtraum industries incorporated</organization>
16+
<organizationUrl>http://www.tagtraum.com/</organizationUrl>
17+
</developer>
18+
</developers>
19+
<licenses>
20+
<license>
21+
<name>GNU Lesser General Public License 2.1</name>
22+
<url>http://www.gnu.org/licenses/lgpl.txt</url>
23+
</license>
24+
</licenses>
25+
<dependencies>
26+
<dependency>
27+
<groupId>junit</groupId>
28+
<artifactId>junit</artifactId>
29+
<version>3.8.2</version>
30+
<scope>test</scope>
31+
</dependency>
32+
</dependencies>
33+
<build>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.apache.maven.plugins</groupId>
37+
<artifactId>maven-surefire-plugin</artifactId>
38+
<version>2.10</version>
39+
<configuration>
40+
<includes>
41+
<include>com/tagtraum/perf/gcviewer/TestAll.java</include>
42+
</includes>
43+
</configuration>
44+
</plugin>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-compiler-plugin</artifactId>
48+
<version>2.3.2</version>
49+
<configuration>
50+
<source>1.6</source>
51+
<target>1.6</target>
52+
</configuration>
53+
</plugin>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-jar-plugin</artifactId>
57+
<version>2.3.1</version>
58+
<configuration>
59+
<archive>
60+
<manifest>
61+
<mainClass>com.tagtraum.perf.gcviewer.GCViewer</mainClass>
62+
<addClasspath>true</addClasspath>
63+
</manifest>
64+
</archive>
65+
</configuration>
66+
</plugin>
67+
</plugins>
68+
</build>
5769
</project>

‎src/main/java/com/tagtraum/perf/gcviewer/AboutDialog.java

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

3-
import javax.swing.*;
4-
import javax.swing.border.EtchedBorder;
5-
import javax.swing.border.SoftBevelBorder;
6-
import java.awt.*;
3+
import java.awt.FlowLayout;
4+
import java.awt.Frame;
5+
import java.awt.Panel;
76
import java.awt.event.ActionEvent;
87
import java.awt.event.ActionListener;
9-
import java.util.ResourceBundle;
8+
import java.io.IOException;
9+
import java.net.MalformedURLException;
1010
import java.net.URL;
1111
import java.net.URLDecoder;
12-
import java.net.MalformedURLException;
13-
import java.io.IOException;
12+
import java.util.ResourceBundle;
13+
14+
import javax.swing.ImageIcon;
15+
import javax.swing.JButton;
16+
import javax.swing.JDialog;
17+
import javax.swing.JLabel;
18+
import javax.swing.border.SoftBevelBorder;
1419

1520

1621
/**
@@ -40,6 +45,12 @@ public AboutDialog(Frame f) {
4045
//la_icon.setBorder(new EtchedBorder(EtchedBorder.LOWERED));
4146
la_icon.setBorder(new SoftBevelBorder(SoftBevelBorder.LOWERED));
4247
panel0.add(la_icon);
48+
49+
Panel panel1 = new Panel();
50+
// TODO build automation -> version number
51+
JLabel version = new JLabel("JW edition [improvements for SUN 1.6.x (CMS)] 1.31");
52+
panel1.add(version);
53+
4354
Panel panel2 = new Panel();
4455
panel2.setLayout(new FlowLayout(FlowLayout.RIGHT));
4556
if (ExternalViewer.isSupported()) {
@@ -58,7 +69,7 @@ public AboutDialog(Frame f) {
5869
okButton.addActionListener(this);
5970
panel2.add(okButton);
6071
getContentPane().add("North", panel0);
61-
// getContentPane().add("Center",panel1);
72+
getContentPane().add("Center",panel1);
6273
getContentPane().add("South", panel2);
6374
pack();
6475
setResizable(false);

0 commit comments

Comments
 (0)