diff --git a/nbproject/UPDATED.TXT b/nbproject/UPDATED.TXT index 5b7ffc9..1fc7e4f 100644 --- a/nbproject/UPDATED.TXT +++ b/nbproject/UPDATED.TXT @@ -5,7 +5,7 @@ Project CPscoreboard build script updated Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized as compliant with this version of NetBeans JavaFX support module. To ensure correct and complete functionality within this NetBeans installation the script file has been -backed up to jfx-impl_backup_10.xml and then updated to the currently supported state. +backed up to jfx-impl_backup_11.xml and then updated to the currently supported state. FX Project build script auto-update may be triggered on project open either after NetBeans installation update or by manual changes in jfx-impl.xml. Please note that diff --git a/nbproject/jfx-impl.xml b/nbproject/jfx-impl.xml index 69e9f66..575cf06 100644 --- a/nbproject/jfx-impl.xml +++ b/nbproject/jfx-impl.xml @@ -327,26 +327,48 @@ + + + + + + - + + + + - + + + + + + + + + - + + + + - + + + @@ -1825,6 +1847,25 @@ // manifest var man = jar.createManifest(); + var userManifestPath = project.getProperty("manifest.file"); + if (userManifestPath) { + var userManifestFile = project.resolveFile(userManifestPath); + if (userManifestFile.isFile()) { + var manifestEncoding = project.getProperty("manifest.encoding"); + var userManifestReader = manifestEncoding ? + new java.io.InputStreamReader( + new java.io.FileInputStream(userManifestFile), + manifestEncoding) : + new java.io.InputStreamReader( + new java.io.FileInputStream(userManifestFile)); + try { + var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader); + man.merge(userManifest); + } finally { + userManifestReader.close(); + } + } + } var a1val = new String(project.getProperty("application.vendor")); var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute(); a1.setName("Implementation-Vendor"); diff --git a/nbproject/jfx-impl_backup_11.xml b/nbproject/jfx-impl_backup_11.xml new file mode 100644 index 0000000..69e9f66 --- /dev/null +++ b/nbproject/jfx-impl_backup_11.xml @@ -0,0 +1,4008 @@ + + + + + JavaFX-specific Ant calls + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cssfileslist} + + + + + + + + + + + + + + + + + + + + + + + + self.addMappedName( + (source.indexOf("jfxrt.jar") >= 0) || + (source.indexOf("deploy.jar") >= 0) || + (source.indexOf("javaws.jar") >= 0) || + (source.indexOf("plugin.jar") >= 0) + ? "" : source + ); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index d34f25e..bf62860 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -9,4 +9,4 @@ javadoc.preview=true javafx.run.as=standalone javafx.run.inbrowser= javafx.run.inbrowser.path=C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe -user.properties.file=C:\\Users\\054457\\AppData\\Roaming\\NetBeans\\8.1\\build.properties +user.properties.file=/home/vinay/.netbeans/8.2/build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 9504026..e0478dc 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,16 +2,14 @@ - - file:/D:/CPscoreboard/src/cpscorereport/GUIHelper.java - file:/D:/CPscoreboard/src/cpscorereport/CPscorereport.java - file:/D:/CPscoreboard/src/cpscorereport/ServerHelper.java - file:/C:/Users/054457/Documents/CPscoreboard/src/cpscorereport/PasswordDialog.java file:/C:/Users/054457/Documents/CPscoreboard/src/cpscorereport/DataBaseConnection.java file:/C:/Users/054457/Documents/CPscoreboard/src/cpscorereport/ServerHelper.java file:/C:/Users/054457/Documents/CPscoreboard/src/cpscorereport/GUIHelper.java + + file:/mnt/sd/CyberPatriot/CPscoreboard/src/cpscorereport/CPscorereport.java + diff --git a/nbproject/project.properties b/nbproject/project.properties index 1cffaa1..51a9285 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -36,7 +36,6 @@ includes=** jar.archive.disabled=true jar.compress=false javac.classpath=\ - ${javafx.classpath.extension}:\ ${file.reference.sqljdbc4-3.0.jar} # Space-separated list of extra javac options javac.compilerargs= @@ -64,10 +63,6 @@ javadoc.version=false javadoc.windowtitle= javafx.application.implementation.version=1.0 javafx.binarycss=false -javafx.classpath.extension=\ - ${java.home}/lib/javaws.jar:\ - ${java.home}/lib/deploy.jar:\ - ${java.home}/lib/plugin.jar javafx.deploy.adddesktopshortcut=false javafx.deploy.addstartmenushortcut=false javafx.deploy.allowoffline=true @@ -75,7 +70,7 @@ javafx.deploy.allowoffline=true javafx.deploy.backgroundupdate=false javafx.deploy.disable.proxy=false javafx.deploy.embedJNLP=true -javafx.deploy.includeDT=true +javafx.deploy.includeDT=false javafx.deploy.installpermanently=false javafx.deploy.permissionselevated=false # Set true to prevent creation of temporary copy of deployment artifacts before each run (disables concurrent runs) diff --git a/src/cpscorereport/DataBaseConnection.java b/src/cpscorereport/DataBaseConnection.java index d8f4e5d..556c3ea 100644 --- a/src/cpscorereport/DataBaseConnection.java +++ b/src/cpscorereport/DataBaseConnection.java @@ -1,7 +1,8 @@ /* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. + * How 'bout you don't touch this source? + * Submit a pull request and problemo solved. + * Use it at your own will honestly, just if it's a big competition scenario, + * give me a shoutout... please? Thanks! */ package cpscorereport; @@ -52,10 +53,10 @@ public static ArrayList loadList(String connectionString) throws Malformed String ip = in.readLine(); // Get the IP System.out.println(ip); // Print it out } catch (IOException ex1) { - System.out.println("An error occured while printint the error:\n" + ex1); + System.out.println("An error occured while printing the error:\n" + ex1.getMessage()); } } - return teams; + return teams; // Give them the teams array } private static int doesTeamExist(ArrayList teams, String teamName) { diff --git a/src/cpscorereport/ServerHelper.java b/src/cpscorereport/ServerHelper.java index aae826c..f9368dd 100644 --- a/src/cpscorereport/ServerHelper.java +++ b/src/cpscorereport/ServerHelper.java @@ -59,6 +59,6 @@ public String getURL() { } public boolean isAzureRunning() { // Check if it's running - return myAzureStatus; // Give it + return myAzureStatus; // Send out the status } }