Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d3834c7
Adding Autodetect time format in drop-down list that toggles linux ti…
May 15, 2017
d90a25f
CSV output fix, date value was missing
May 15, 2017
6757a13
Revert "CSV output fix, date value was missing"
May 15, 2017
d1d30a1
Revert "Adding Autodetect time format in drop-down list that toggles …
May 15, 2017
3a38eb6
csv_export_fix
May 15, 2017
b0fd4bf
console mode
May 15, 2017
d7dde91
style fix
May 15, 2017
0890d08
autodetect option
May 15, 2017
51bd259
remove_trailing
May 15, 2017
dc34f53
adding graph fix
May 15, 2017
810b2ba
fix of format
May 15, 2017
cec3644
fix of format
May 15, 2017
4004367
fix of format
May 15, 2017
c7e2224
fix of format
May 15, 2017
9190a05
fix of format
May 15, 2017
52adcbb
Merge pull request #2 from elkrieg/csv_export_fix
elkrieg May 18, 2017
687eefb
fix of missing else clause
May 18, 2017
34c68c2
unittests
May 18, 2017
1b6aae3
style fixes
May 18, 2017
8a602f4
style fixes
May 18, 2017
7f93028
style fixes
May 18, 2017
4e91c98
style fixes
May 18, 2017
012e824
add format selection in console mode
May 18, 2017
0d33144
add format selection in console mode
May 18, 2017
225f532
Merge pull request #3 from elkrieg/AutoDateFormat
elkrieg May 22, 2017
5919c80
add unittests
Jul 7, 2017
88695a0
add unittests
Jul 7, 2017
4f069f8
Merge branch 'master' into console_feature
elkrieg Jul 7, 2017
09cfa0d
format
Jul 7, 2017
9ebe51d
format
Jul 7, 2017
9e19416
Update AllParser.java
elkrieg Jul 7, 2017
a1caf27
Update AllParser.java
elkrieg Jul 7, 2017
546fd17
Update AllParser.java
elkrieg Jul 7, 2017
b069100
123
Jul 19, 2017
028506b
return version to usage
elkrieg Aug 7, 2017
43a0b50
height typo fix
elkrieg Aug 7, 2017
a39c4bb
Update Main.java
elkrieg Aug 7, 2017
91d6efd
Update Linux.java
elkrieg Aug 7, 2017
a16205e
moved vars declaration back to the end of file
elkrieg Aug 7, 2017
0a5817c
format fixes
elkrieg Aug 7, 2017
107623b
Update AllParser.java
elkrieg Aug 7, 2017
b7e8cb2
Merge pull request #4 from vlsi/master
elkrieg Aug 7, 2017
975f4b0
Merge remote-tracking branch 'upstream/master'
Apr 28, 2018
3b065b7
merge
Apr 28, 2018
e5eb850
format issues
Apr 28, 2018
2905662
Merge branch 'console_feature' of https://github.com/elkrieg/ksar int…
Apr 28, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ gradle-app.setting
.idea/
ksar_all.log
out/
/bin/
29 changes: 29 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ksar</name>
<comment>Project ksar created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.babel.editor.rbeBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>com.jaspersoft.studio.babel.editor.rbeNature</nature>
</natures>
</projectDescription>
3 changes: 3 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
1 change: 1 addition & 0 deletions kSar.version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12.1.2
37 changes: 37 additions & 0 deletions output_junit.csv

Large diffs are not rendered by default.

Binary file added output_junit_PDF
Binary file not shown.
1 change: 1 addition & 0 deletions result.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Date;
Empty file added result.pdf
Empty file.
28 changes: 27 additions & 1 deletion src/main/java/net/atomique/ksar/AllParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,32 @@

public abstract class AllParser {

protected String sarStartDate = null;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please refrain from moving things around in the same commit/PR as the feature.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved declarations back

protected String sarEndDate = null;

protected LocalDateTime startofgraph = null;
protected LocalDateTime endofgraph = null;
protected TreeSet<LocalDateTime> DateSamples = new TreeSet<LocalDateTime>();
protected int firstdatacolumn = 0;

abstract public String getInfo();

abstract public void parse_header(String s);

abstract public void updateUITitle();

protected kSar mysar = null;
protected OSConfig myosconfig = null;
protected String ParserName = null;

protected LocalTime parsetime = null;
protected LocalDate parsedate = null;

protected String currentStat = "NONE";
protected String dateFormat = "MM/dd/yy";
protected String timeFormat = "HH:mm:ss";
protected int timeColumn = 1;

private static final Logger log = LoggerFactory.getLogger(AllParser.class);
private static final Map<String, String> DATE_FORMAT_REGEXPS = new HashMap<String, String>() {
{
Expand Down Expand Up @@ -87,7 +113,6 @@ public boolean setDate(String s) {
} else {
formatter = DateTimeFormatter.ofPattern(dateFormat);
}

currentDate = LocalDate.parse(s, formatter);

parsedate = currentDate;
Expand Down Expand Up @@ -159,4 +184,5 @@ public static String determineDateFormat(String dateString) {
protected String dateFormat = "MM/dd/yy";
protected String timeFormat = "HH:mm:ss";
protected int timeColumn = 1;

}
54 changes: 54 additions & 0 deletions src/main/java/net/atomique/ksar/GlobalOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,54 @@ static void saveHistory() {

}

public static String getOutCSV() {
return outCSV;
}

public static void setOutCSV(String outCSV) {
GlobalOptions.outCSV = outCSV;
}

public static String getOutPDF() {
return outPDF;
}

public static void setOutPDF(String outPDF) {
GlobalOptions.outPDF = outPDF;
}

public static String getOutIMG() {
return outIMG;
}

public static void setOutIMG(String outIMG) {
GlobalOptions.outIMG = outIMG;
}

public static String getOutTags() {
return outTags;
}

public static void setOutTags(String outTags) {
GlobalOptions.outTags = outTags;
}

public static int getWidth() {
return width;
}

public static void setWidth(int width) {
GlobalOptions.width = width;
}

public static int getHeigth() {
return heigth;
}

public static void setHeigth(int heigth) {
GlobalOptions.heigth = heigth;
}

private static Desktop UI = null;
private static Properties systemprops;
private static String userhome;
Expand All @@ -256,4 +304,10 @@ static void saveHistory() {
private static String CLfilename = null;
private static HashMap<String, Class> ParserMap;
private static boolean firstrun = true;
private static String outCSV;
private static String outPDF;
private static String outIMG;
private static String outTags;
private static int width = 600;
private static int heigth = 400;
}
Loading