* changed some descriptions and text

epochcoder · epochcoder · commit e6dbb045abfa · 2013-11-27T15:02:00.000+02:00
* added balusc licences
diff --git a/build/built-jar.properties b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Wed, 27 Nov 2013 14:26:09 +0200
-
-
-C\:\\Projects\\Private\\GitHub\\image-scraper=
+#Wed, 27 Nov 2013 15:00:42 +0200
+
+
+C\:\\Projects\\Private\\GitHub\\image-scraper=
diff --git a/build/classes/imagedownloader/ImageDownloaderAboutBox.class b/build/classes/imagedownloader/ImageDownloaderAboutBox.class
diff --git a/build/classes/imagedownloader/ImageDownloaderAboutBox.form b/build/classes/imagedownloader/ImageDownloaderAboutBox.form
@@ -10,6 +10,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
@@ -30,15 +31,19 @@
               <Component id="imageLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="1" attributes="0">
+                  <Component id="appDescLabel" alignment="0" pref="0" max="32767" attributes="0"/>
+                  <Component id="closeButton" alignment="1" min="-2" max="-2" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="versionLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="appVersionLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="156" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="1" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="versionLabel" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
+                              <Component id="appVersionLabel" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <Component id="appTitleLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace min="-2" pref="129" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="appTitleLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="appDescLabel" alignment="0" pref="270" max="32767" attributes="0"/>
-                  <Component id="closeButton" alignment="1" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
@@ -57,7 +62,7 @@
                   <Component id="versionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="appVersionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="59" max="32767" attributes="0"/>
+              <EmptySpace pref="17" max="32767" attributes="0"/>
               <Component id="closeButton" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
diff --git a/build/classes/imagedownloader/ImageDownloaderApp.class b/build/classes/imagedownloader/ImageDownloaderApp.class
diff --git a/build/classes/imagedownloader/ImageDownloaderView.rs b/build/classes/imagedownloader/ImageDownloaderView.rs
@@ -1,2 +1,2 @@
-imagedownloader.MyCustomFilter
-imagedownloader.ImageDownloaderView
+imagedownloader.MyCustomFilter
+imagedownloader.ImageDownloaderView
diff --git a/build/classes/imagedownloader/resources/ImageDownloaderAboutBox.properties b/build/classes/imagedownloader/resources/ImageDownloaderAboutBox.properties
@@ -1,8 +1,8 @@
-title = About: ${Application.title} ${Application.version} 
+title = About: ${Application.title} ${Application.version}
 
 closeAboutBox.Action.text = &Close
 
-appDescLabel.text=<html>${Application.description}
+appDescLabel.text=<html>A simple Java desktop application that downloads files according to settings provided.<br>the url template is used to identify url path's with a numerical incrementor<br>the CSS Selector is used to identify images on the current page
 
 versionLabel.text=Product Version\:
 
diff --git a/build/classes/imagedownloader/resources/ImageDownloaderApp.properties b/build/classes/imagedownloader/resources/ImageDownloaderApp.properties
@@ -1,11 +1,10 @@
 # Application global resources
-
-Application.name = ImageDownloader
-Application.title = Image Downloader
-Application.version = 1.0
+Application.name = image-scraper
+Application.title = image-scraper
+Application.version = 2.0
 Application.vendor = Sun Microsystems Inc.
 Application.homepage = http\://appframework.dev.java.net/
-Application.description = A simple Java desktop application that downloads files according to settings provided. works with numerical indices
+Application.description = A simple java application for scraping images of websites using url templates and CSS selectors.
 Application.vendorId = Sun
 Application.id = ${Application.name}
 Application.lookAndFeel = system
diff --git a/build/classes/imagedownloader/resources/ImageDownloaderView.properties b/build/classes/imagedownloader/resources/ImageDownloaderView.properties
@@ -1,17 +1,12 @@
-# Resources for the ImageDownloaderView class
-
 # top-level menus
-
 fileMenu.text = File
 helpMenu.text = Help
 
 # @Action resources
-
 showAboutBox.Action.text = &About...
 showAboutBox.Action.shortDescription = Show the application's information dialog
 
 # status bar resources
-
 StatusBar.messageTimeout = 5000
 StatusBar.busyAnimationRate = 30
 StatusBar.idleIcon = busyicons/idle-icon.png
@@ -32,7 +27,7 @@ StatusBar.busyIcons[13] = busyicons/busy-icon13.png
 StatusBar.busyIcons[14] = busyicons/busy-icon14.png
 fileChooser.dialogTitle=Select File
 butSelect.text=Open
-txtUrl.text=
+txtUrl.text= http://www.example.com
 butStart.text=Start Download
 lblDirectory.text=Directory :
 lblRangeStart.text=Range Start :
@@ -42,4 +37,4 @@ lblURLPatternEnd.text=URL Template
 txtUrlTemplate.text=$[digit].php
 txtCssSelector.text=td.content-center > img
 txtDirectory.text=
-chkPadded.text=Padded Digits?
+chkPadded.text=Padded Digits?
diff --git a/build/classes/imagedownloader/util/FileUtil.class b/build/classes/imagedownloader/util/FileUtil.class
diff --git a/dist/README.TXT b/dist/README.TXT
@@ -29,4 +29,4 @@ the projects runtime path.
 * To set a main class in a standard Java project, right-click the project node
 in the Projects window and choose Properties. Then click Run and enter the
 class name in the Main Class field. Alternatively, you can manually type the
-class name in the manifest Main-Class element.
+class name in the manifest Main-Class element.
diff --git a/dist/image-scraper.jar b/dist/image-scraper.jar
diff --git a/src/imagedownloader/ImageDownloaderAboutBox.form b/src/imagedownloader/ImageDownloaderAboutBox.form
@@ -10,6 +10,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="2"/>
@@ -30,15 +31,19 @@
               <Component id="imageLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="1" attributes="0">
+                  <Component id="appDescLabel" alignment="0" pref="0" max="32767" attributes="0"/>
+                  <Component id="closeButton" alignment="1" min="-2" max="-2" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="versionLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" max="-2" attributes="0"/>
-                      <Component id="appVersionLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="156" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="1" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="versionLabel" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace min="-2" max="-2" attributes="0"/>
+                              <Component id="appVersionLabel" min="-2" max="-2" attributes="0"/>
+                          </Group>
+                          <Component id="appTitleLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace min="-2" pref="129" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="appTitleLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="appDescLabel" alignment="0" pref="270" max="32767" attributes="0"/>
-                  <Component id="closeButton" alignment="1" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="-2" max="-2" attributes="0"/>
           </Group>
@@ -57,7 +62,7 @@
                   <Component id="versionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="appVersionLabel" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="59" max="32767" attributes="0"/>
+              <EmptySpace pref="17" max="32767" attributes="0"/>
               <Component id="closeButton" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
diff --git a/src/imagedownloader/ImageDownloaderAboutBox.java b/src/imagedownloader/ImageDownloaderAboutBox.java
@@ -69,14 +69,16 @@ private void initComponents() {
                 .addComponent(imageLabel)
                 .addGap(18, 18, 18)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(appDescLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
+                    .addComponent(closeButton)
                     .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                        .addComponent(versionLabel)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(appVersionLabel)
-                        .addGap(156, 156, 156))
-                    .addComponent(appTitleLabel, javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(appDescLabel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE)
-                    .addComponent(closeButton))
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                                .addComponent(versionLabel)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(appVersionLabel))
+                            .addComponent(appTitleLabel, javax.swing.GroupLayout.Alignment.LEADING))
+                        .addGap(129, 129, 129)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
@@ -91,16 +93,16 @@ private void initComponents() {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(versionLabel)
                     .addComponent(appVersionLabel))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 59, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 17, Short.MAX_VALUE)
                 .addComponent(closeButton)
                 .addContainerGap())
         );
 
         pack();
     }// </editor-fold>//GEN-END:initComponents
-    
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton closeButton;
     // End of variables declaration//GEN-END:variables
-    
+
 }
diff --git a/src/imagedownloader/ImageDownloaderApp.java b/src/imagedownloader/ImageDownloaderApp.java
@@ -1,7 +1,3 @@
-/*
- * ImageDownloaderApp.java
- */
-
 package imagedownloader;
 
 import org.jdesktop.application.Application;
diff --git a/src/imagedownloader/resources/ImageDownloaderAboutBox.properties b/src/imagedownloader/resources/ImageDownloaderAboutBox.properties
@@ -1,8 +1,8 @@
-title = About: ${Application.title} ${Application.version} 
+title = About: ${Application.title} ${Application.version}
 
 closeAboutBox.Action.text = &Close
 
-appDescLabel.text=<html>${Application.description}
+appDescLabel.text=<html>A simple Java desktop application that downloads files according to settings provided.<br>the url template is used to identify url path's with a numerical incrementor<br>the CSS Selector is used to identify images on the current page
 
 versionLabel.text=Product Version\:
 
diff --git a/src/imagedownloader/resources/ImageDownloaderApp.properties b/src/imagedownloader/resources/ImageDownloaderApp.properties
@@ -1,11 +1,10 @@
 # Application global resources
-
-Application.name = ImageDownloader
-Application.title = Image Downloader
-Application.version = 1.0
+Application.name = image-scraper
+Application.title = image-scraper
+Application.version = 2.0
 Application.vendor = Sun Microsystems Inc.
 Application.homepage = http\://appframework.dev.java.net/
-Application.description = A simple Java desktop application that downloads files according to settings provided. works with numerical indices
+Application.description = A simple java application for scraping images of websites using url templates and CSS selectors.
 Application.vendorId = Sun
 Application.id = ${Application.name}
 Application.lookAndFeel = system
diff --git a/src/imagedownloader/resources/ImageDownloaderView.properties b/src/imagedownloader/resources/ImageDownloaderView.properties
@@ -1,17 +1,12 @@
-# Resources for the ImageDownloaderView class
-
 # top-level menus
-
 fileMenu.text = File
 helpMenu.text = Help
 
 # @Action resources
-
 showAboutBox.Action.text = &About...
 showAboutBox.Action.shortDescription = Show the application's information dialog
 
 # status bar resources
-
 StatusBar.messageTimeout = 5000
 StatusBar.busyAnimationRate = 30
 StatusBar.idleIcon = busyicons/idle-icon.png
@@ -32,7 +27,7 @@ StatusBar.busyIcons[13] = busyicons/busy-icon13.png
 StatusBar.busyIcons[14] = busyicons/busy-icon14.png
 fileChooser.dialogTitle=Select File
 butSelect.text=Open
-txtUrl.text=
+txtUrl.text= http://www.example.com
 butStart.text=Start Download
 lblDirectory.text=Directory :
 lblRangeStart.text=Range Start :
@@ -42,4 +37,4 @@ lblURLPatternEnd.text=URL Template
 txtUrlTemplate.text=$[digit].php
 txtCssSelector.text=td.content-center > img
 txtDirectory.text=
-chkPadded.text=Padded Digits?
+chkPadded.text=Padded Digits?
diff --git a/src/imagedownloader/util/FileUtil.java b/src/imagedownloader/util/FileUtil.java
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * net/balusc/util/FileUtil.java
+ *
+ * Copyright (C) 2007 BalusC
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU Lesser General Public License as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with this library.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 
 package imagedownloader.util;
@@ -263,11 +275,11 @@ public static Object readObject(File file) throws ClassNotFoundException,
             ois = new ObjectInputStream(new FileInputStream(file));
             object = ois.readObject();
         } finally {
-            close(ois, file);            
-            return object;            
+            close(ois, file);
+            return object;
         }
     }
-    
+
     /**
      * Read byte array from file. Take care with big files, this would be memory hogging, rather
      * use readStream() instead.
@@ -601,7 +613,7 @@ public static boolean delete(File dir) {
             }
 
             return dir.delete();
-        } else {     
+        } else {
             return false;
         }
     }
