Skip to content

Commit

Permalink
New version - v2.20.8 - with more debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
jpaulm committed Jul 2, 2020
1 parent 84da721 commit 7622dea
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 18 deletions.
1 change: 0 additions & 1 deletion .project
Expand Up @@ -13,7 +13,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -41,7 +41,7 @@ apply plugin: 'java-library'

}

version = '2.20.7'
version = '2.20.8'

group = 'com.jpaulmorrison'

Expand Down Expand Up @@ -80,7 +80,7 @@ java {
}

jar {
archiveVersion = '2.20.7'
archiveVersion = '2.20.8'
manifest {
attributes 'Implementation-Title': 'DrawFBP', 'Implementation-Version': archiveVersion,
"Class-Path": configurations.compileClasspath.collect { it.getName() }.join(' '),
Expand Down Expand Up @@ -149,7 +149,7 @@ description = "Create default maven directory structure"
groupId = 'com.jpaulmorrison'
artifactId = 'drawfbp'

version = '2.20.7'
version = '2.20.8'
from components.java


Expand Down
Binary file added build/distributions/drawfbp-2.20.8.tar
Binary file not shown.
Binary file added build/distributions/drawfbp-2.20.8.zip
Binary file not shown.
Binary file added build/libs/drawfbp-2.20.8-javadoc.jar
Binary file not shown.
Binary file added build/libs/drawfbp-2.20.8-sources.jar
Binary file not shown.
Binary file added build/libs/drawfbp-2.20.8.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion build/scripts/drawfbp
Expand Up @@ -80,7 +80,7 @@ case "`uname`" in
;;
esac

CLASSPATH=$APP_HOME/lib/drawfbp-2.20.7.jar:$APP_HOME/lib/javaGeom-0.11.1.jar:$APP_HOME/lib/javahelp-2.0.05.jar
CLASSPATH=$APP_HOME/lib/drawfbp-2.20.8.jar:$APP_HOME/lib/javaGeom-0.11.1.jar:$APP_HOME/lib/javahelp-2.0.05.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/drawfbp.bat
Expand Up @@ -82,7 +82,7 @@ set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\lib\drawfbp-2.20.7.jar;%APP_HOME%\lib\javaGeom-0.11.1.jar;%APP_HOME%\lib\javahelp-2.0.05.jar
set CLASSPATH=%APP_HOME%\lib\drawfbp-2.20.8.jar;%APP_HOME%\lib\javaGeom-0.11.1.jar;%APP_HOME%\lib\javahelp-2.0.05.jar

@rem Execute drawfbp
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %DRAWFBP_OPTS% -classpath "%CLASSPATH%" com.jpaulmorrison.graphics.DrawFBP %CMD_LINE_ARGS%
Expand Down
2 changes: 1 addition & 1 deletion build/tmp/jar/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Implementation-Title: DrawFBP
Implementation-Version: 2.20.7
Implementation-Version: 2.20.8
Class-Path: javaGeom-0.11.1.jar javahelp-2.0.05.jar
Main-Class: com.jpaulmorrison.graphics.DrawFBP

4 changes: 2 additions & 2 deletions build/tmp/javadoc/javadoc.options
@@ -1,10 +1,10 @@
-Xdoclint:none
-classpath 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\build\\classes\\java\\main;C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\build\\resources\\main;C:\\Users\\Paul\\.gradle\\caches\\modules-2\\files-2.1\\math.geom2d\\javaGeom\\0.11.1\\5951b33da14e56c9e2b1f741b9ba3531401393b6\\javaGeom-0.11.1.jar;C:\\Users\\Paul\\.gradle\\caches\\modules-2\\files-2.1\\javax.help\\javahelp\\2.0.05\\ca70822c47a67fc3a11670270567c2d01566dae1\\javahelp-2.0.05.jar'
-d 'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\build\\docs\\javadoc'
-doctitle 'drawfbp 2.20.7 API'
-doctitle 'drawfbp 2.20.8 API'
-notimestamp
-quiet
-windowtitle 'drawfbp 2.20.7 API'
-windowtitle 'drawfbp 2.20.8 API'
'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\src\\main\\java\\com\\jpaulmorrison\\graphics\\AInPort.java'
'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\src\\main\\java\\com\\jpaulmorrison\\graphics\\AOutPort.java'
'C:\\Users\\Paul\\Documents\\GitHub\\drawfbp\\src\\main\\java\\com\\jpaulmorrison\\graphics\\Arrow.java'
Expand Down
4 changes: 2 additions & 2 deletions drawfbp.bat
@@ -1,4 +1,4 @@
echo Displaying %1
echo Displaying "%1"
pause
java -jar "C:\Users\%USERNAME%\Documents\GitHub\drawfbp\build\libs\drawfbp-2.20.7.jar" %1
java -jar "C:\Users\%USERNAME%\Documents\GitHub\drawfbp\build\libs\drawfbp-2.20.7.jar" "%1"
pause
22 changes: 17 additions & 5 deletions src/main/java/com/jpaulmorrison/graphics/DrawFBP.java
Expand Up @@ -2869,7 +2869,7 @@ void compileCode() {

if (curDiag.changed) {
cMsg = "Select a " + currLang.label + " source file - if diagram has changed, \n invoke 'File/Generate " + currLang.label + " Network' first";
//return;

}

cMsg = "Select a " + currLang.label + " source file";
Expand Down Expand Up @@ -2900,8 +2900,11 @@ void compileCode() {
cFile = new File(getSelFile(fc));
}
// }
if (cFile == null || !(cFile.exists()))
if (cFile == null || !(cFile.exists())) {

MyOptionPane.showMessageDialog(this, "File \"" + cFile + "\" does not exist", MyOptionPane.ERROR_MESSAGE);
return;
}

srcDir = cFile.getAbsolutePath();
srcDir = srcDir.replace('\\', '/');
Expand Down Expand Up @@ -3056,8 +3059,10 @@ void compileCode() {
proc = null;
}

if (proc == null)
if (proc == null) {
MyOptionPane.showMessageDialog(this, "Compile process failed", MyOptionPane.WARNING_MESSAGE);
return;
}

if (srcDir.endsWith("/"))
srcDir = srcDir.substring(0, srcDir.length() - 1);
Expand Down Expand Up @@ -3365,8 +3370,10 @@ void compileCode() {
proc = null;
}

if (proc == null)
if (proc == null) {
MyOptionPane.showMessageDialog(this, "Compile process failed", MyOptionPane.WARNING_MESSAGE);
return;
}

//interrupt = true;
//program = v + "/" + progName + ".cs";
Expand Down Expand Up @@ -3494,8 +3501,10 @@ void runCode() {
cFile = new File(ss);
}
// }
if (cFile == null || !(cFile.exists()))
if (cFile == null || !(cFile.exists())) {
MyOptionPane.showMessageDialog(this, "File \"" + cFile + "\" does not exist", MyOptionPane.ERROR_MESSAGE);
return;
}

// if (currLang.label.equals("Java")) {
if (!(ss.endsWith(".class"))) {
Expand Down Expand Up @@ -3716,6 +3725,9 @@ String analyzeCatch(Exception e) {
err = "Security Exception";

err += ": " + e.getMessage();

e.printStackTrace();

return err;
}

Expand Down
Expand Up @@ -5,11 +5,11 @@

public final class VersionAndTimestamp {

static String version = "2.20.7";
static String version = "2.20.8";



static String date = "June 17, 2020";
static String date = "July 2, 2020";



Expand Down

0 comments on commit 7622dea

Please sign in to comment.