[Trovacap-java-loginfo] jTrovaCap/java/uk/co/marcoratto/jtrovacap/thinlet Gui.java, 1.1, 1.2
Brought to you by:
marcoratto
Menu
▾
▴
[Trovacap-java-loginfo] jTrovaCap/java/uk/co/marcoratto/jtrovacap/thinlet Gui.java, 1.1, 1.2
|
From: Marco R. <mar...@us...> - 2008-07-02 14:13:04
|
Update of /cvsroot/trovacap-java/jTrovaCap/java/uk/co/marcoratto/jtrovacap/thinlet In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26823/java/uk/co/marcoratto/jtrovacap/thinlet Modified Files: Gui.java Log Message: Update to release 1.2 Index: Gui.java =================================================================== RCS file: /cvsroot/trovacap-java/jTrovaCap/java/uk/co/marcoratto/jtrovacap/thinlet/Gui.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Gui.java 18 Jun 2007 09:57:34 -0000 1.1 --- Gui.java 2 Jul 2008 14:13:12 -0000 1.2 *************** *** 1,17 **** package uk.co.marcoratto.jtrovacap.thinlet; ! import java.sql.*; ! import thinlet.*; ! import java.util.*; ! import java.awt.*; ! import java.awt.datatransfer.*; ! import uk.co.marcoratto.jtrovacap.hsqldb.*; /** ! * Simple demonstration of widgets and events */ public class Gui extends Thinlet { /** * Loads the xml file --- 1,54 ---- + /* + * Copyright (C) 2007 Marco Ratto + * + * This file is part of the project trovacap-java. + * + * trovacap-java 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 2 of the License, or + * any later version. + * + * trovacap-java 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 trovacap-java; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ package uk.co.marcoratto.jtrovacap.thinlet; ! import java.util.List; ! import java.util.Locale; ! import java.util.ResourceBundle; ! import java.awt.FontMetrics; ! import java.awt.Toolkit; ! import java.awt.datatransfer.Clipboard; ! import java.awt.datatransfer.StringSelection; ! import org.apache.log4j.Logger; ! ! import thinlet.Thinlet; ! import uk.co.marcoratto.jtrovacap.hsqldb.CapDAO; ! import uk.co.marcoratto.jtrovacap.hsqldb.Cap; ! import uk.co.marcoratto.jtrovacap.hsqldb.CapDAOException; /** ! * @author Marco Ratto */ public class Gui extends Thinlet { + private String comune = null; + private String provincia = null; + private String toponimo = null; + private String cap = null; + + private Object dialog; + private Object alert; + private ResourceBundle bundle; + + private static Logger logger = Logger.getLogger("uk.co.marcoratto.jtrovacap"); + /** * Loads the xml file *************** *** 65,82 **** Object choice = null; try { ! con = DbConnection.getInstance().getConnection(); ! TabCapDAO dao = new TabCapDAO(); ! java.util.List l = dao.getElencoProvince(con); for (int j=0; j<l.size(); j++) { - TabCapDTO dto = (TabCapDTO) l.get(j); choice = create("choice"); ! setString(choice, "text", dto.getProvCap()); add(table, choice, -1); } ! } catch (Exception e) { ! e.printStackTrace(); ! } finally { ! DbConnection.getInstance().closeConnection(con); ! } } --- 102,114 ---- Object choice = null; try { ! List<String> l = CapDAO.getInstance().getElencoProvince(); for (int j=0; j<l.size(); j++) { choice = create("choice"); ! setString(choice, "text", l.get(j)); add(table, choice, -1); } ! } catch (CapDAOException e) { ! logger.error(e); ! } } *************** *** 105,112 **** } ! System.out.println("comune=" + comune); ! System.out.println("provincia=" + provincia); ! System.out.println("toponimo=" + toponimo); ! System.out.println("cap=" + cap); if ((comune == null) && --- 137,144 ---- } ! logger.debug("comune=" + comune); ! logger.debug("provincia=" + provincia); ! logger.debug("toponimo=" + toponimo); ! logger.debug("cap=" + cap); if ((comune == null) && *************** *** 119,126 **** removeAll(elenco); try { ! con = DbConnection.getInstance().getConnection(); ! TabCapDAO dao = new TabCapDAO(); ! int i = dao.getTotal(con, comune, provincia, toponimo, cap); ! System.out.println("Total Records=" + i); if (i == 0) { showAlert(bundle.getString("msg.no_records")); --- 151,156 ---- removeAll(elenco); try { ! int i = CapDAO.getInstance().getTotal(comune, provincia, toponimo, cap); ! logger.debug("Total Records=" + i); if (i == 0) { showAlert(bundle.getString("msg.no_records")); *************** *** 128,170 **** showAlert(bundle.getString("msg.too_many_records")); } else { ! java.util.List l = dao.getElenco(con, comune, provincia, toponimo, cap); for (int j=0; j<l.size(); j++) { ! TabCapDTO dto = (TabCapDTO) l.get(j); Object row = create("row"); Object cellDUG = create("cell"); ! setString(cellDUG, "text", dto.getDugtCap()); add(row, cellDUG); ! this.adjustColumn(elenco, "colDug", dto.getDugtCap()); Object cellToponimo = create("cell"); ! setString(cellToponimo, "text", dto.getTopoCap()); add(row, cellToponimo); ! this.adjustColumn(elenco, "colCap", dto.getTopoCap()); Object cellCivici = create("cell"); ! setString(cellCivici, "text", dto.getNcivCap()); add(row, cellCivici); ! this.adjustColumn(elenco, "colCivici", dto.getNcivCap()); Object cellCap = create("cell"); ! setString(cellCap, "text", dto.getCapiCap()); add(row, cellCap); ! this.adjustColumn(elenco, "colCap", dto.getCapiCap()); Object cellComune = create("cell"); ! setString(cellComune, "text", dto.getComuCap()); add(row, cellComune); ! this.adjustColumn(elenco, "colComune", dto.getComuCap()); Object cellFrazione = create("cell"); ! setString(cellFrazione, "text", dto.getFrazCap()); add(row, cellFrazione); ! this.adjustColumn(elenco, "colFrazione", dto.getFrazCap()); Object cellProvincia = create("cell"); ! setString(cellProvincia, "text", dto.getProvCap()); add(row, cellProvincia); ! this.adjustColumn(elenco, "colProvincia", dto.getProvCap()); add(elenco, row); --- 158,200 ---- showAlert(bundle.getString("msg.too_many_records")); } else { ! List<Cap> l = CapDAO.getInstance().getElenco(comune, provincia, toponimo, cap); for (int j=0; j<l.size(); j++) { ! Cap dto = (Cap) l.get(j); Object row = create("row"); Object cellDUG = create("cell"); ! setString(cellDUG, "text", dto.getDugt()); add(row, cellDUG); ! this.adjustColumn(elenco, "colDug", dto.getDugt()); Object cellToponimo = create("cell"); ! setString(cellToponimo, "text", dto.getTopo()); add(row, cellToponimo); ! this.adjustColumn(elenco, "colCap", dto.getTopo()); Object cellCivici = create("cell"); ! setString(cellCivici, "text", dto.getNciv()); add(row, cellCivici); ! this.adjustColumn(elenco, "colCivici", dto.getNciv()); Object cellCap = create("cell"); ! setString(cellCap, "text", dto.getCapi()); add(row, cellCap); ! this.adjustColumn(elenco, "colCap", dto.getCapi()); Object cellComune = create("cell"); ! setString(cellComune, "text", dto.getComu()); add(row, cellComune); ! this.adjustColumn(elenco, "colComune", dto.getComu()); Object cellFrazione = create("cell"); ! setString(cellFrazione, "text", dto.getFraz()); add(row, cellFrazione); ! this.adjustColumn(elenco, "colFrazione", dto.getFraz()); Object cellProvincia = create("cell"); ! setString(cellProvincia, "text", dto.getProv()); add(row, cellProvincia); ! this.adjustColumn(elenco, "colProvincia", dto.getProv()); add(elenco, row); *************** *** 172,179 **** } } catch (Exception e) { ! e.printStackTrace(); ! } finally { ! DbConnection.getInstance().closeConnection(con); ! } } --- 202,207 ---- } } catch (Exception e) { ! logger.error(e); ! } } *************** *** 232,235 **** --- 260,264 ---- clipboard.setContents(new StringSelection(sb.toString()), null); } catch (Exception e) { + logger.warn(e); } } *************** *** 249,260 **** } - private String comune = null; - private String provincia = null; - private String toponimo = null; - private String cap = null; - private Connection con = null; - - private Object dialog; - private Object alert; - private ResourceBundle bundle; } --- 278,280 ---- |
