Updating copyright to GPL as per conversation with Benjamin Dobell Be…

…njamin-Dobell/libpit--Java-#1
N004Drake · Nov 24, 2013 · c4d8bc4 · c4d8bc4
1 parent 194b1d5
commit c4d8bc4
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 215 deletions.
diff --git a/CASCADE/CASCADE-GUI/nbproject/private/private.xml b/CASCADE/CASCADE-GUI/nbproject/private/private.xml
@@ -2,19 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/project.properties</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/private/private.properties</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/src/CASCADEGUI/CASCADEInteractions.java</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/genfiles.properties</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/build-impl.xml</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/private/private.xml</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/src/CASCADEGUI/CASCADEGUI.java</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/build.xml</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/private/config.properties</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/manifest.mf</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/src/CASCADEGUI/main.java</file>
-            <file>file:/home/adamoutler/code/android-casual/trunk/CASCADE/CASCADE-GUI/nbproject/project.xml</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/CASUALcore/src/CASUAL/archiving/libpit/PitData.java b/CASUALcore/src/CASUAL/archiving/libpit/PitData.java
@@ -1,25 +1,22 @@
 package CASUAL.archiving.libpit;
-/*Copyright (c) 2010-2011 Benjamin Dobell, Glass Echidna
+/*Pitdata provides a way to work with the header information of the PIT file
+ *Copyright (C) 2013  Adam Outler
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -28,13 +25,12 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-/**
- * Pitdata provides a way to work with the header information of the PIT file
+/** Pitdata provides a way to work with the header information of the PIT file
  * Original Files may be found here:
  * https://github.com/Benjamin-Dobell/libpit--Java-/tree/master/libpit/src/au/com/glassechidna/libpit
- * modified by:
+ * modified by: Adam Outler
  *
- * @author adam
+ * @author Benjamin Dobell
  */
 public class PitData {
 

diff --git a/CASUALcore/src/CASUAL/archiving/libpit/PitEntry.java b/CASUALcore/src/CASUAL/archiving/libpit/PitEntry.java
@@ -1,34 +1,28 @@
 package CASUAL.archiving.libpit;
-
-import java.util.Arrays;
-
-/*Copyright (c) 2010-2011 Benjamin Dobell, Glass Echidna
+/*PitEntry provides a method of organizing PIT entries and storing PIT data
+ *Copyright (C) 2013  Adam Outler
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/**
- * PitEntry provides a method of organizing PIT entries and storing data
+
+import java.util.Arrays;
+/** PitEntry provides a method of organizing PIT entries and storing PIT data
  * Original Files may be found here:
  * https://github.com/Benjamin-Dobell/libpit--Java-/tree/master/libpit/src/au/com/glassechidna/libpit
- * modified by:
+ * modified by: Adam Outler
  *
- * @author adam
+ * @author Benjamin Dobell
  */
 public class PitEntry {
 
@@ -577,7 +571,7 @@ public String getBlockCountFriendly(boolean si) {
     public String getPartitionDescritpion(){
         String n = System.getProperty("line.separator");
         StringBuilder sb=new StringBuilder();
-        sb.append("This ").append(this.getPartitionTypeFriendlyName()).append(" partion has a ").append(this.getFilesystemTypeFriendlyName()).append(" partition and resides on the ").append(this.getBinFriendlyType()).append(" ").append(this.getHardwareTypeFriendlyName());
+        sb.append("This ").append(this.getPartitionTypeFriendlyName()).append(" partion has a ").append(this.getFilesystemTypeFriendlyName()).append(" partition type, and resides on the ").append(this.getBinFriendlyType()).append(" ").append(this.getHardwareTypeFriendlyName()).append(".");
         return sb.toString();
     }
 
@@ -614,7 +608,7 @@ File Size (Obsolete): 0
         sb.append("   FOTA: ").append(this.getFotaName()).append(n);
         sb.append(getPartitionDescritpion());
         if (this.getFotaName().contains("remained")){
-            sb.append(" and the partition will expand to fill the remainder of the ").append(this.getHardwareTypeFriendlyName());
+            sb.append(" The partition will expand to fill the remainder of the ").append(this.getHardwareTypeFriendlyName()).append(".");
         }
         sb.append(n).append(n).append(n);
         return sb.toString();

diff --git a/CASUALcore/src/CASUAL/archiving/libpit/PitInputStream.java b/CASUALcore/src/CASUAL/archiving/libpit/PitInputStream.java
@@ -1,35 +1,30 @@
 package CASUAL.archiving.libpit;
-/*Copyright (c) 2010-2011 Benjamin Dobell, Glass Echidna
+/*PitInputStream provides tools used for writing a pit.
+ *Copyright (C) 2013  Adam Outler
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 import java.io.IOException;
 import java.io.InputStream;
 
-/**
- * PitInputStream provides tools used for writing a pit file Original Files may
- * be found here:
+/**PitInputStream provides tools used for writing a pit.
+ * Original Files may be found here:
  * https://github.com/Benjamin-Dobell/libpit--Java-/tree/master/libpit/src/au/com/glassechidna/libpit
- * modified by:
+ * modified by: Adam Outler
  *
- * @author adam
+ * @author Benjamin Dobell
  */
 public class PitInputStream {
 

diff --git a/CASUALcore/src/CASUAL/archiving/libpit/PitOutputStream.java b/CASUALcore/src/CASUAL/archiving/libpit/PitOutputStream.java
@@ -1,37 +1,31 @@
 package CASUAL.archiving.libpit;
-/*Copyright (c) 2010-2011 Benjamin Dobell, Glass Echidna
+/*PitOutputStream provides a set of tools designed to assist with reading PIT files
+ *Copyright (C) 2013  Adam Outler
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 import java.io.IOException;
 import java.io.OutputStream;
 
-/**
- * PitOutputStream provides a set of tools designed to assist with reading PIT
- * files
- *
+/** PitOutputStream provides a set of tools designed to assist with reading PIT files
  * Original Files may be found here:
  * https://github.com/Benjamin-Dobell/libpit--Java-/tree/master/libpit/src/au/com/glassechidna/libpit
- * modified by:
+ * modified by: Adam Outler
  *
- * @author adam
+ * @author Benjamin Dobell
  */
 public class PitOutputStream {
 

diff --git a/CASUALcore/src/CASUAL/archiving/libpit/PrintPit.java b/CASUALcore/src/CASUAL/archiving/libpit/PrintPit.java
@@ -1,3 +1,4 @@
+package CASUAL.archiving.libpit;
 /*PrintPit prints the pit file provided
  *Copyright (C) 2013  Adam Outler
  *
@@ -14,7 +15,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package CASUAL.archiving.libpit;
+
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/CASUALcore/src/CASUAL/resources/CASUALApp.properties b/CASUALcore/src/CASUAL/resources/CASUALApp.properties
@@ -1,16 +1,16 @@
-#Sat, 23 Nov 2013 20:14:59 -0600
-#Application.buildnumber=7476
-#Wed Nov 20 21:33:54 CST 2013
-Application.buildnumber=7476
+#Sun, 24 Nov 2013 10:12:57 -0600
+#Application.buildnumber=7477
+#Sat Nov 23 20:18:45 CST 2013
+Application.buildnumber=7477
 Application.name=CASUAL
 Application.lookAndFeel=system
 Application.version=${Application.revision}.${Application.buildnumber}
 Application.GUI=GUI.development.CASUALShowJFrameMain
 Application.homepage=xda-developers.com
 Application.vendor=AdamOutler
-Application.id=${Application.name}
-Application.vendorId=AdamOutler
 Application.interactions=GUI.development.CASUALShowJFrameMessageObject
-Application.revision=915
+Application.vendorId=AdamOutler
+Application.id=${Application.name}
 Application.description=CASUAL Cross-platform Android Scripting and Unified Auxiliary Loader
+Application.revision=917
 Application.title=CASUAL R
diff --git a/X/libpitX/src/com/casual_dev/libpitX/PitData.java b/X/libpitX/src/com/casual_dev/libpitX/PitData.java
@@ -1,25 +1,22 @@
 package com.casual_dev.libpitX;
-/*Copyright (c) 2010-2011 Benjamin Dobell, Glass Echidna
+/*Pitdata provides a way to work with the header information of the PIT file
+ *Copyright (C) 2013  Adam Outler
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -28,13 +25,12 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-/**
- * Pitdata provides a way to work with the header information of the PIT file
+/** Pitdata provides a way to work with the header information of the PIT file
  * Original Files may be found here:
  * https://github.com/Benjamin-Dobell/libpit--Java-/tree/master/libpit/src/au/com/glassechidna/libpit
- * modified by:
+ * modified by: Adam Outler
  *
- * @author adam
+ * @author Benjamin Dobell
  */
 public class PitData {