Commits

Anonymous committed 75dea8d

Changed sqlite-jdbc lib

  • Participants
  • Parent commits 6c29633

Comments (0)

Files changed (10)

lib/SQLITE/sqlite-jdbc-3.6.20.1.jar

Binary file added.

lib/nblibraries.properties

 libs.jccKit.classpath=\
     ${base}/jccKit/jcckit.jar
 libs.SQLITE.classpath=\
-    ${base}/SQLITE/sqlitejdbc-v056.jar
+    ${base}/SQLITE/sqlite-jdbc-3.6.20.1.jar

nbproject/project.properties

 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
-application.splash=
+application.homepage=http://nyagua.sourceforge.net
+application.splash=/home/rudi/NetBeansProjects/Nyagua-1.4/splash.jpg
 application.title=Nyagua
 application.vendor=giacomini
 build.classes.dir=${build.dir}/classes
     ${libs.jccKit.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
-javac.deprecation=false
+javac.deprecation=true
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.5

splash.jpg

Added
New image

src/icons/aquarium.png

Old
Old image
New
New image

src/icons/fish.png

Old
Old image
New
New image

src/icons/plants.png

Old
Old image
New
New image

src/nyagua/Ny.form

                       <Group type="102" attributes="0">
                           <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
                           <Component id="phKhCo2RelationPanel" min="-2" max="-2" attributes="0"/>
+<<<<<<< .mine
+                          <EmptySpace pref="53" max="32767" attributes="0"/>
+=======
                           <EmptySpace pref="47" max="32767" attributes="0"/>
+>>>>>>> .r136
                           <Component id="heaterCalculatorPanel" min="-2" max="-2" attributes="0"/>
+<<<<<<< .mine
+                          <EmptySpace min="0" pref="175" max="32767" attributes="0"/>
+=======
                           <EmptySpace min="0" pref="169" max="32767" attributes="0"/>
+>>>>>>> .r136
                       </Group>
                   </Group>
                 </DimensionLayout>

src/nyagua/Ny.java

 private void jTree1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jTree1MouseClicked
     /**Load selected aquarium data from db */
     int node=jTree1.getLeadSelectionRow();    
-    if (node==1) {//fishbase
+    if (node==1) {//fishbase icon selected
         this.jTabbedPane1.setSelectedIndex(5);
-    } else if (node==2){//plantsbase
-            
+    } else if (node==2){//plantsbase icon selected            
         this.jTabbedPane1.setSelectedIndex(7);
     } else {
         this.jTabbedPane1.setSelectedIndex(0);
                         jTree1.getLastSelectedPathComponent().toString())) {
                     Global.AqID = rs.getInt("id");// NOI18N
                     Ny.PopulateTable();
-
                     Aquarium tank=Aquarium.getById(Global.AqID);
                     aquariumNameTextField.setText(tank.getName());// NOI18N
                     aquariumDeepTextField.setText(tank.getDepth());// NOI18N
         if (Application.DATA_FILENAME!=null){
             treename=Application.DATA_FILENAME;
         }
-        jTree1.setModel(null);        
-        //javax.swing.tree.DefaultMutableTreeNode treeNode1 =new javax.swing.tree.DefaultMutableTreeNode(treename);
+        jTree1.setModel(null);                
         //root node
         IconNode treeNode1=new IconNodeImpl(treename, new javax.swing.ImageIcon(getClass().getResource("/icons/database.png")), "");//NOI18N            
         //jTree1.setModel(new javax.swing.tree.DefaultTreeModel(treeNode1));
         jTree1.setCellRenderer(new IconNodeRenderer());
         jTree1.setModel(new DefaultTreeModel(treeNode1));//Apply custom gui-bits model structure
-        
-        
         IconNode leaf1 = new IconNodeImpl(java.util.ResourceBundle.getBundle("nyagua/Bundle").getString("FISHBASE"), new javax.swing.ImageIcon(getClass().getResource("/icons/fish.png")),"");// NOI18N
         treeNode1.add(leaf1);
         //Fishbase leaf
         //PlantsBase leaf
         IconNode leaf3 = new IconNodeImpl(java.util.ResourceBundle.getBundle("nyagua/Bundle").getString("AQUARIUMS"), new javax.swing.ImageIcon(getClass().getResource("/icons/aquarium.png")),"");// NOI18N
         treeNode1.add(leaf3);
+        
         String qry = "SELECT Name FROM Aquarium;";// NOI18N
         try {
             DB.openConn();
      * @param lstNum the list number (0 for all)
      */
     public void PopulateList(int lstNum) {        
-        DefaultListModel dlm = new DefaultListModel();        
+        DefaultListModel dlm = new DefaultListModel();         
         switch (lstNum) {
             case 0:
                 //empty lists

src/nyagua/Settings.java

     private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened
        /** Load current settings */
         dateFormatComboBox.removeAllItems();
-        String [] items=LocUtil.getDateFormats();
-        for (int x = 0 ; x < items.length; x++ ){
-             dateFormatComboBox.addItem(items[x]);
+        String [] item=LocUtil.getDateFormats();
+        for (int x = 0 ; x < item.length; x++ ){
+             dateFormatComboBox.addItem(item[x]);
         }
         dateFormatComboBox.setEditable(true);
         Setting s =Setting.getInstance();