Revision 12733

View differences:

branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/CatalogAP.java
68 68
	 */
69 69
	public static void main(String[] args) {
70 70
		CatalogClientRegister register = CatalogClientRegister.getInstance();
71
		register.register(new Z3950CatalogServiceDriver());
72
		register.register(new SRWCatalogServiceDriver());
71
		//register.register(new Z3950CatalogServiceDriver());
72
		//register.register(new SRWCatalogServiceDriver());
73 73
		register.register(new CSWCatalogServiceDriver());
74 74
		Messages.addLocale(Locale.getDefault());
75 75
		try {
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/srw/drivers/SRWCatalogServiceDriver.java
51 51

  
52 52
import es.gva.cit.catalogClient.drivers.AbstractCatalogServiceDriver;
53 53
import es.gva.cit.catalogClient.drivers.CatalogCapabilities;
54
import es.gva.cit.catalogClient.drivers.GetRecordsReply;
54 55
import es.gva.cit.catalogClient.metadataxml.XMLNode;
55 56
import es.gva.cit.catalogClient.metadataxml.XMLTree;
56 57
import es.gva.cit.catalogClient.metadataxml.XMLTreeNumberOfRecordsAnswer;
57 58
import es.gva.cit.catalogClient.protocols.HTTPGetProtocol;
58 59
import es.gva.cit.catalogClient.protocols.SOAPProtocol;
59 60
import es.gva.cit.catalogClient.querys.Query;
60
import es.gva.cit.catalogClient.schemas.discoverer.Record;
61
import es.gva.cit.catalogClient.schemas.records.Record;
61 62
import es.gva.cit.catalogClient.srw.parsers.SrwCapabilitiesParser;
62 63

  
63 64
/**
......
92 93
			if (nodes.size() > 0){
93 94
				XMLNode n = (XMLNode)nodes.toArray()[0];
94 95
				if (n != null){    	
95
					setCommunicationProtocol("GET");
96
//					setCommunicationProtocol("GET");
96 97
					//return nodes;
97 98
				}
98 99
			}
99 100
		}
100 101
		nodes = new SOAPProtocol().doQuery(url, messages.getSOAPCapabilities(), 0);
101 102
		if (nodes != null) {
102
			setCommunicationProtocol("SOAP");
103
//			setCommunicationProtocol("SOAP");
103 104
		}
104 105
		new SrwCapabilitiesParser(this).parse((XMLNode)nodes.toArray()[0]);
105 106
		CatalogCapabilities capabilities = new CatalogCapabilities();
......
111 112
	 * (non-Javadoc)
112 113
	 * @see es.gva.cit.catalogClient.drivers.ICatalogServiceDriver#getRecords(java.net.URI, es.gva.cit.catalogClient.querys.Query, int)
113 114
	 */
114
	public Record[] getRecords(URI uri, Query query, int firstRecord) {        
115
	public GetRecordsReply getRecords(URI uri, Query query, int firstRecord) {        
115 116
		URL url = null;
116 117
		try {
117 118
			url = uri.toURL();
......
132 133
			}
133 134
		}
134 135
		XMLNode root = null;
135
		if (getCommunicationProtocol().equals("GET")) {
136
			nodes = new HTTPGetProtocol().doQuery(url,
137
					messages.getHTTPGETRecords(getQuery(), firstRecord), firstRecord);
138
			root = (XMLNode)nodes.toArray()[0];
139
		}
136
//		if (getCommunicationProtocol().equals("GET")) {
137
//			nodes = new HTTPGetProtocol().doQuery(url,
138
//					messages.getHTTPGETRecords(getQuery(), firstRecord), firstRecord);
139
//			root = (XMLNode)nodes.toArray()[0];
140
//		}
140 141

  
141
		if (getCommunicationProtocol().equals("POST") || 
142
				getCommunicationProtocol().equals("SOAP")){
143
			nodes = new SOAPProtocol().doQuery(url,
144
					messages.getSOAPRecords(getQuery(), firstRecord), firstRecord);
145
			root = (XMLNode)nodes.toArray()[0];
146
			root = root.getSubNode(0).getSubNode(0);
147
		}
142
//		if (getCommunicationProtocol().equals("POST") || 
143
//				getCommunicationProtocol().equals("SOAP")){
144
//			nodes = new SOAPProtocol().doQuery(url,
145
//					messages.getSOAPRecords(getQuery(), firstRecord), firstRecord);
146
//			root = (XMLNode)nodes.toArray()[0];
147
//			root = root.getSubNode(0).getSubNode(0);
148
//		}
148 149

  
149

  
150
		String prefix = new StringTokenizer(root.getName(), ":").nextToken();
151
		if (prefix.equals(root.getName())) {
152
			prefix = "";
153
		} else {
154
			prefix = prefix + ":";
155
		}        
156
		int numberOfRecords = getNumberOfRecords(root,
157
				prefix + "numberOfRecords",
158
				null);
159

  
160
		if (numberOfRecords == -1) {
161
			return null;
162
		}   
163

  
164
		answerNodes = createAnswerTree(numberOfRecords, firstRecord, root,
165
				url,prefix);
150
//
151
//		String prefix = new StringTokenizer(root.getName(), ":").nextToken();
152
//		if (prefix.equals(root.getName())) {
153
//			prefix = "";
154
//		} else {
155
//			prefix = prefix + ":";
156
//		}        
157
//		int numberOfRecords = getNumberOfRecords(root,
158
//				prefix + "numberOfRecords",
159
//				null);
160
//
161
//		if (numberOfRecords == -1) {
162
//			return null;
163
//		}   
164
//
165
//		answerNodes = createAnswerTree(numberOfRecords, firstRecord, root,
166
//				url,prefix);
166 167
		//return answerNodes;
167 168
		return null;
168 169
	} 
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/chooseresource/ChooseResourceDialog.java
46 46

  
47 47
import javax.swing.JFrame;
48 48

  
49
import es.gva.cit.catalogClient.schemas.discoverer.Resource;
49
import es.gva.cit.catalogClient.schemas.records.Resource;
50 50
import es.gva.cit.catalogClient.utils.Frames;
51 51

  
52 52
/**
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/chooseresource/ChooseResourceDialogPanel.java
54 54

  
55 55
import org.gvsig.i18n.Messages;
56 56

  
57
import es.gva.cit.catalogClient.schemas.discoverer.Resource;
57
import es.gva.cit.catalogClient.schemas.records.Resource;
58 58
import es.gva.cit.catalogClient.utils.resourcestable.ButtonEditor;
59 59
import es.gva.cit.catalogClient.utils.resourcestable.ButtonRenderer;
60 60

  
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/chooseresource/ChooseResourcePanel.java
49 49

  
50 50
import org.gvsig.i18n.Messages;
51 51

  
52
import es.gva.cit.catalogClient.schemas.discoverer.Resource;
52
import es.gva.cit.catalogClient.schemas.records.Resource;
53 53
import es.gva.cit.catalogClient.utils.resourcestable.TableModel;
54 54

  
55 55
/**
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/showresults/ShowResultsDialog.java
47 47
import javax.swing.JDialog;
48 48

  
49 49
import es.gva.cit.catalogClient.CatalogClient;
50
import es.gva.cit.catalogClient.schemas.discoverer.Record;
50
import es.gva.cit.catalogClient.drivers.GetRecordsReply;
51
import es.gva.cit.catalogClient.schemas.records.Record;
51 52
import es.gva.cit.catalogClient.utils.Frames;
52 53

  
53 54
/**
......
66 67
 * @param nodes DOCUMENT ME!
67 68
 * @param currentRecord DOCUMENT ME!
68 69
 */
69
    public  ShowResultsDialog(CatalogClient client, Record[] records, int currentRecord) {        
70
    public  ShowResultsDialog(CatalogClient client, GetRecordsReply recordsReply, int currentRecord) {        
70 71
        super();
71 72
        this.currentRecord = currentRecord;
72
        initialize(client,records);
73
        initialize(client,recordsReply);
73 74
    } 
74 75

  
75 76
/**
......
79 80
 * @param client 
80 81
 * @param nodes 
81 82
 */
82
    private void initialize(CatalogClient client, Record[] records) {        
83
    private void initialize(CatalogClient client, GetRecordsReply recordsReply) {        
83 84
        Frames.centerFrame(this, 625, 425);
84 85
        this.setSize(new Dimension(625, 425));
85 86
        this.setTitle("Cliente de Cat?logo");
86 87
        ShowResultsDialogPanel panel = new ShowResultsDialogPanel(client,
87
        		records, currentRecord);
88
        		recordsReply, currentRecord);
88 89
        panel.setParent(this);
89 90
        getContentPane().add(panel);
90 91
        this.setVisible(true);
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/showresults/ShowResultsDialogPanel.java
49 49
import javax.swing.JPanel;
50 50

  
51 51
import es.gva.cit.catalogClient.CatalogClient;
52
import es.gva.cit.catalogClient.drivers.GetRecordsReply;
52 53
import es.gva.cit.catalogClient.metadataxml.XMLTreeNumberOfRecordsAnswer;
53
import es.gva.cit.catalogClient.schemas.discoverer.Record;
54
import es.gva.cit.catalogClient.schemas.discoverer.Resource;
54
import es.gva.cit.catalogClient.schemas.records.Record;
55
import es.gva.cit.catalogClient.schemas.records.Resource;
55 56
import es.gva.cit.catalogClient.ui.chooseresource.ChooseResourceDialog;
56 57
import es.gva.cit.catalogClient.ui.showtree.ShowTreeDialog;
57 58

  
......
71 72
    private JButton descriptionButton = null;
72 73
    private JButton mapButton = null;
73 74
    private JButton closeButton = null;
74
    protected Record[] records = null;
75
    protected GetRecordsReply recordsReply = null;
75 76

  
76 77
/**
77 78
 * @param client 
......
79 80
 * @param currentRecord 
80 81
 * @param translator 
81 82
 */
82
    public  ShowResultsDialogPanel(CatalogClient client, Record[] records, int currentRecord) {        
83
        this.records = records;
83
    public  ShowResultsDialogPanel(CatalogClient client, GetRecordsReply recordsReply, int currentRecord) {        
84
        this.recordsReply = recordsReply;
84 85
        this.client = client;
85 86
        this.currentRecord = currentRecord;
86
        int numRecords = XMLTreeNumberOfRecordsAnswer.getNumberOfRecords(records[0].getNode());
87 87
        controlsPanel = new ShowResultsPanel(client,
88
        		records[currentRecord],
89
                numRecords);               
88
        		recordsReply.getRecordAt(currentRecord),
89
        		recordsReply.getRecordsNumber());               
90 90
        setDefaultButtonListeners();
91 91
        enableMapButton();
92 92
        add(controlsPanel);
......
175 175
 * @param firstRecord 
176 176
 */
177 177
    public void createNewSearch(int firstRecord) {        
178
        records = client.getRecords(null, firstRecord);
178
    	recordsReply = client.getRecords(null, firstRecord);
179 179
    } 
180 180

  
181 181
/**
182
 * 
183
 * 
184
 * 
185 182
 * @return 
186 183
 */
187 184
    public int getCurrentNode() {        
188 185
        if ((currentRecord % 10) == 0) {
189
            return 10;
186
            return 9;
190 187
        } else {
191
            return (currentRecord % 10);
188
            return ((currentRecord % 10) - 1);
192 189
        }
193 190
    } 
194 191

  
......
217 214
       
218 215
    } 
219 216

  
220
/**
221
 * 
222
 * 
223
 */
224
    public void nextButtonActionPerformed() {        
217
    protected void nextButtonActionPerformed() {        
225 218
        this.currentRecord = this.currentRecord + 1;
226
        if (this.currentRecord == XMLTreeNumberOfRecordsAnswer.getNumberOfRecords(
227
                    records[0].getNode())) {
228
            nextButton.setEnabled(false);
219
        if (this.currentRecord == recordsReply.getRecordsNumber()){
220
        	nextButton.setEnabled(false);
229 221
        } else {
230 222
            nextButton.setEnabled(true);
231 223
        }
232 224
        lastButton.setEnabled(true);
233 225
        if ((this.currentRecord % 10) == 1) {
234
            createNewSearch(currentRecord);
226
            if (recordsReply.getRetrievedRecordsNumber() + 1 == this.currentRecord){
227
            	createNewSearch(currentRecord);
228
            }
235 229
        }
236
        controlsPanel.loadTextNewRecord(records[getCurrentNode()],
230
        controlsPanel.loadTextNewRecord(recordsReply.getRecordAt(getCurrentNode()),
237 231
            client);
238 232
        controlsPanel.actualizaLabel(currentRecord);
239 233
        
240 234
        enableMapButton();
241 235
    } 
242 236

  
243
/**
244
 * 
245
 * 
246
 */
247
    public void lastButtonActionPerformed() {        
237
    protected void lastButtonActionPerformed() {        
248 238
        this.currentRecord = this.currentRecord - 1;
249 239
        if (this.currentRecord == 1) {
250 240
            lastButton.setEnabled(false);
......
252 242
            lastButton.setEnabled(true);
253 243
        }
254 244
        nextButton.setEnabled(true);
255
        if ((this.currentRecord % 10) == 0) {
256
            createNewSearch(currentRecord - 10 + 1);
257
        }
258
        controlsPanel.loadTextNewRecord(records[getCurrentNode()],
245
        controlsPanel.loadTextNewRecord(recordsReply.getRecordAt(getCurrentNode()),
259 246
            client);
260 247
        controlsPanel.actualizaLabel(currentRecord);
261 248
        
262 249
        enableMapButton();
263 250
    } 
264 251

  
265
/**
266
 * 
267
 * 
268
 */
269
    public void descriptionButtonActionPerformed() {        
270
    	Record record = records[getCurrentNode()];
252
    protected void descriptionButtonActionPerformed() {        
253
    	Record record = recordsReply.getRecordAt(getCurrentNode());
271 254
    	if (record == null){
272 255
    		//Impossible to parse
273 256
    	}else{
......
275 258
    	}
276 259
    } 
277 260

  
278
/**
279
 * 
280
 * 
281
 */
282
    public void mapButtonActionPerformed() {        
261
    protected void mapButtonActionPerformed() {        
283 262
        Resource[] resources = controlsPanel.getTags().getResources();
284 263
        Collection col = new java.util.ArrayList();
285 264
        for (int i=0 ; i<resources.length ; i++){
......
289 268
               
290 269
    } 
291 270

  
292
/**
293
 * 
294
 * 
295
 */
296
    public void closeButtonActionPerformed() {        
271
    protected void closeButtonActionPerformed() {        
297 272
        parent.setVisible(false);
298 273
    } 
299 274

  
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/showresults/ShowResultsPanel.java
70 70

  
71 71
import es.gva.cit.catalogClient.CatalogClient;
72 72
import es.gva.cit.catalogClient.metadataxml.XMLNode;
73
import es.gva.cit.catalogClient.schemas.discoverer.DiscovererFormat;
74
import es.gva.cit.catalogClient.schemas.discoverer.Record;
73
import es.gva.cit.catalogClient.schemas.records.Record;
75 74

  
76 75
/**
77 76
 * 
......
101 100
    private JButton lastButton = null;
102 101
    private JLabel textLabel = null;
103 102
    private JButton nextButton = null;
104
    private int numRecords;
105
    private DiscovererFormat discoverer = null;
103
    private int numRecords; 
106 104
    private JButton closeButton = null;
107 105

  
108 106
/**
......
120 118
        super();
121 119
        this.client = client;
122 120
        this.record = record;
123
        this.numRecords = numRecords;
124
        discoverer = new DiscovererFormat(client);
121
        this.numRecords = numRecords;        
125 122
        initialize();
126 123
    } 
127 124

  
......
335 332
 * @param protocol 
336 333
 */
337 334
    public void loadTextNewRecord(Record record, CatalogClient client) {        
338
        setTags(discoverer.DiscoverAndParse(record.getNode()));
335
        setTags(record);
339 336
        
340 337
        descriptionArea.setText(this.getHtml());
341 338
        descriptionArea.setCaretPosition(0);
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/search/SearchLowerPanel.java
71 71
 * @author Jorge Piera Llodra (piera_jor@gva.es)
72 72
 */
73 73
public class SearchLowerPanel extends JPanel {
74
	// Variables declaration - do not modify                     
75
	private javax.swing.JLabel abstractLabel1;
76
	private javax.swing.JPanel abstractPanel1;
77
	private javax.swing.JTextField abstractText1;
78
	private javax.swing.JRadioButton allRButton;
79
	private javax.swing.JRadioButton anyRButton;
80
	private javax.swing.JLabel brxLabel;
81
	private javax.swing.JTextField brxText;
82
	private javax.swing.JLabel bryLabel;
83
	private javax.swing.JTextField bryText;
84
	private javax.swing.JComboBox cathegoryCombo;
85
	private javax.swing.JLabel cathegoryLabel;
86
	private javax.swing.JPanel cathegoryPanel;
87
	private javax.swing.JPanel coordinatesPanel;
88
	private javax.swing.JComboBox coordinatesRelationshipCombo;
89
	private javax.swing.JPanel coordinatesRelationshipPanel;
90
	private javax.swing.JRadioButton exactRButton;
91
	private javax.swing.JLabel keywordsLabel;
92
	private javax.swing.JPanel keywordsPanel;
93
	private javax.swing.JTextField keywordsText;
94
	private javax.swing.JPanel leftPanel;
95
	private javax.swing.JPanel lowerCoordinatesPanel;
96
	private javax.swing.JLabel lowerUpdateLabel;
97
	private javax.swing.JPanel lowerUpdatePanel1;
98
	private javax.swing.JTextField loweruperUpdateText;
99
	private javax.swing.JPanel nameOptionsPanel;
100
	private javax.swing.JLabel providerLabel;
101
	private javax.swing.JPanel providerPanel;
102
	private javax.swing.JTextField providerText;
103
	private javax.swing.JPanel rigthPanel;
104
	private javax.swing.JComboBox scaleCombo;
105
	private javax.swing.JLabel scaleLabel;
106
	private javax.swing.JPanel scalePanel;
107
	private javax.swing.JLabel ulxLabel;
108
	private javax.swing.JTextField ulxText;
109
	private javax.swing.JLabel ulyLabel;
110
	private javax.swing.JTextField ulyText;
111
	private javax.swing.JPanel updatePanel;
112
	private javax.swing.JLabel uperUpdateLabel;
113
	private javax.swing.JTextField uperUpdateText;
114
	private javax.swing.JPanel upperCoordinatesPanel;
115
	private javax.swing.JPanel upperUpdatePanel;
74
	   private javax.swing.JLabel abstractLabel1;
75
	    private javax.swing.JPanel abstractPanel1;
76
	    private javax.swing.JTextField abstractText1;
77
	    private javax.swing.JRadioButton allRButton;
78
	    private javax.swing.JRadioButton anyRButton;
79
	    private javax.swing.JLabel brxLabel;
80
	    private javax.swing.JTextField brxText;
81
	    private javax.swing.JLabel bryLabel;
82
	    private javax.swing.JTextField bryText;
83
	    private javax.swing.JComboBox cathegoryCombo;
84
	    private javax.swing.JLabel cathegoryLabel;
85
	    private javax.swing.JPanel cathegoryPanel;
86
	    private javax.swing.JPanel coordinatesPanel;
87
	    private javax.swing.JComboBox coordinatesRelationshipCombo;
88
	    private javax.swing.JPanel coordinatesRelationshipPanel;
89
	    private javax.swing.JRadioButton exactRButton;
90
	    private javax.swing.JLabel keywordsLabel;
91
	    private javax.swing.JPanel keywordsPanel;
92
	    private javax.swing.JTextField keywordsText;
93
	    private javax.swing.JPanel leftPanel;
94
	    private javax.swing.JPanel lowerCoordinatesPanel;
95
	    private javax.swing.JLabel lowerUpdateLabel;
96
	    private javax.swing.JPanel lowerUpdatePanel1;
97
	    private javax.swing.JTextField loweruperUpdateText;
98
	    private javax.swing.JPanel nameOptionsPanel;
99
	    private javax.swing.JLabel providerLabel;
100
	    private javax.swing.JPanel providerPanel;
101
	    private javax.swing.JTextField providerText;
102
	    private javax.swing.JPanel rigthPanel;
103
	    private javax.swing.JPanel rigthUpperPanel;
104
	    private javax.swing.JComboBox scaleCombo;
105
	    private javax.swing.JLabel scaleLabel;
106
	    private javax.swing.JPanel scalePanel;
107
	    private javax.swing.JLabel ulxLabel;
108
	    private javax.swing.JTextField ulxText;
109
	    private javax.swing.JLabel ulyLabel;
110
	    private javax.swing.JTextField ulyText;
111
	    private javax.swing.JPanel updatePanel;
112
	    private javax.swing.JLabel uperUpdateLabel;
113
	    private javax.swing.JTextField uperUpdateText;
114
	    private javax.swing.JPanel upperCoordinatesPanel;
115
	    private javax.swing.JPanel upperUpdatePanel;
116 116
	
117 117
	// End of variables declaration  
118 118
	public SearchLowerPanel() {
......
128 128
	 */
129 129
	// <editor-fold defaultstate="collapsed" desc=" Generated Code ">                          
130 130
	private void initComponents() {
131
		java.awt.GridBagConstraints gridBagConstraints;
131
		   java.awt.GridBagConstraints gridBagConstraints;
132 132

  
133
		leftPanel = new javax.swing.JPanel();
134
		nameOptionsPanel = new javax.swing.JPanel();
135
		exactRButton = new javax.swing.JRadioButton();
136
		anyRButton = new javax.swing.JRadioButton();
137
		allRButton = new javax.swing.JRadioButton();
138
		abstractPanel1 = new javax.swing.JPanel();
139
		abstractLabel1 = new javax.swing.JLabel();
140
		abstractText1 = new javax.swing.JTextField();
141
		keywordsPanel = new javax.swing.JPanel();
142
		keywordsLabel = new javax.swing.JLabel();
143
		keywordsText = new javax.swing.JTextField();
144
		cathegoryPanel = new javax.swing.JPanel();
145
		cathegoryLabel = new javax.swing.JLabel();
146
		cathegoryCombo = new javax.swing.JComboBox();
147
		scalePanel = new javax.swing.JPanel();
148
		scaleLabel = new javax.swing.JLabel();
149
		scaleCombo = new javax.swing.JComboBox();
150
		providerPanel = new javax.swing.JPanel();
151
		providerLabel = new javax.swing.JLabel();
152
		providerText = new javax.swing.JTextField();
153
		rigthPanel = new javax.swing.JPanel();
154
		updatePanel = new javax.swing.JPanel();
155
		upperUpdatePanel = new javax.swing.JPanel();
156
		uperUpdateLabel = new javax.swing.JLabel();
157
		uperUpdateText = new javax.swing.JTextField();
158
		lowerUpdatePanel1 = new javax.swing.JPanel();
159
		lowerUpdateLabel = new javax.swing.JLabel();
160
		loweruperUpdateText = new javax.swing.JTextField();
161
		coordinatesPanel = new javax.swing.JPanel();
162
		upperCoordinatesPanel = new javax.swing.JPanel();
163
		ulxLabel = new javax.swing.JLabel();
164
		ulxText = new javax.swing.JTextField();
165
		ulyLabel = new javax.swing.JLabel();
166
		ulyText = new javax.swing.JTextField();
167
		lowerCoordinatesPanel = new javax.swing.JPanel();
168
		brxLabel = new javax.swing.JLabel();
169
		brxText = new javax.swing.JTextField();
170
		bryLabel = new javax.swing.JLabel();
171
		bryText = new javax.swing.JTextField();
172
		coordinatesRelationshipPanel = new javax.swing.JPanel();
173
		coordinatesRelationshipCombo = new javax.swing.JComboBox();
133
	        leftPanel = new javax.swing.JPanel();
134
	        nameOptionsPanel = new javax.swing.JPanel();
135
	        exactRButton = new javax.swing.JRadioButton();
136
	        anyRButton = new javax.swing.JRadioButton();
137
	        allRButton = new javax.swing.JRadioButton();
138
	        abstractPanel1 = new javax.swing.JPanel();
139
	        abstractLabel1 = new javax.swing.JLabel();
140
	        abstractText1 = new javax.swing.JTextField();
141
	        keywordsPanel = new javax.swing.JPanel();
142
	        keywordsLabel = new javax.swing.JLabel();
143
	        keywordsText = new javax.swing.JTextField();
144
	        cathegoryPanel = new javax.swing.JPanel();
145
	        cathegoryLabel = new javax.swing.JLabel();
146
	        cathegoryCombo = new javax.swing.JComboBox();
147
	        scalePanel = new javax.swing.JPanel();
148
	        scaleLabel = new javax.swing.JLabel();
149
	        scaleCombo = new javax.swing.JComboBox();
150
	        providerPanel = new javax.swing.JPanel();
151
	        providerLabel = new javax.swing.JLabel();
152
	        providerText = new javax.swing.JTextField();
153
	        rigthPanel = new javax.swing.JPanel();
154
	        rigthUpperPanel = new javax.swing.JPanel();
155
	        coordinatesPanel = new javax.swing.JPanel();
156
	        upperCoordinatesPanel = new javax.swing.JPanel();
157
	        ulxLabel = new javax.swing.JLabel();
158
	        ulxText = new javax.swing.JTextField();
159
	        ulyLabel = new javax.swing.JLabel();
160
	        ulyText = new javax.swing.JTextField();
161
	        lowerCoordinatesPanel = new javax.swing.JPanel();
162
	        brxLabel = new javax.swing.JLabel();
163
	        brxText = new javax.swing.JTextField();
164
	        bryLabel = new javax.swing.JLabel();
165
	        bryText = new javax.swing.JTextField();
166
	        coordinatesRelationshipPanel = new javax.swing.JPanel();
167
	        coordinatesRelationshipCombo = new javax.swing.JComboBox();
168
	        updatePanel = new javax.swing.JPanel();
169
	        upperUpdatePanel = new javax.swing.JPanel();
170
	        uperUpdateLabel = new javax.swing.JLabel();
171
	        uperUpdateText = new javax.swing.JTextField();
172
	        lowerUpdatePanel1 = new javax.swing.JPanel();
173
	        lowerUpdateLabel = new javax.swing.JLabel();
174
	        loweruperUpdateText = new javax.swing.JTextField();
174 175

  
175
		setLayout(new java.awt.GridBagLayout());
176
	        setLayout(new java.awt.GridLayout());
176 177

  
177
		leftPanel.setLayout(new java.awt.GridBagLayout());
178
	        leftPanel.setLayout(new java.awt.GridBagLayout());
178 179

  
179
		leftPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(2, 5, 2, 5));
180
		nameOptionsPanel.setLayout(new java.awt.GridBagLayout());
180
	        leftPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(2, 5, 2, 5));
181
	        nameOptionsPanel.setLayout(new java.awt.GridBagLayout());
181 182

  
182
		nameOptionsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("concordancia"));
183
		exactRButton.setText("jRadioButton1");
184
		exactRButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
185
		exactRButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
186
		gridBagConstraints = new java.awt.GridBagConstraints();
187
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
188
		gridBagConstraints.weightx = 1.0;
189
		gridBagConstraints.insets = new java.awt.Insets(2, 5, 5, 0);
190
		nameOptionsPanel.add(exactRButton, gridBagConstraints);
183
	        nameOptionsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("concordancia"));
184
	        exactRButton.setText("jRadioButton1");
185
	        exactRButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
186
	        exactRButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
187
	        gridBagConstraints = new java.awt.GridBagConstraints();
188
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
189
	        gridBagConstraints.weightx = 1.0;
190
	        gridBagConstraints.insets = new java.awt.Insets(2, 5, 5, 0);
191
	        nameOptionsPanel.add(exactRButton, gridBagConstraints);
191 192

  
192
		anyRButton.setText("jRadioButton1");
193
		anyRButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
194
		anyRButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
195
		gridBagConstraints = new java.awt.GridBagConstraints();
196
		gridBagConstraints.gridx = 0;
197
		gridBagConstraints.gridy = 1;
198
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
199
		gridBagConstraints.weightx = 1.0;
200
		gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 0);
201
		nameOptionsPanel.add(anyRButton, gridBagConstraints);
193
	        anyRButton.setText("jRadioButton1");
194
	        anyRButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
195
	        anyRButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
196
	        gridBagConstraints = new java.awt.GridBagConstraints();
197
	        gridBagConstraints.gridx = 0;
198
	        gridBagConstraints.gridy = 1;
199
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
200
	        gridBagConstraints.weightx = 1.0;
201
	        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 0);
202
	        nameOptionsPanel.add(anyRButton, gridBagConstraints);
202 203

  
203
		allRButton.setText("jRadioButton2");
204
		allRButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
205
		allRButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
206
		gridBagConstraints = new java.awt.GridBagConstraints();
207
		gridBagConstraints.gridx = 0;
208
		gridBagConstraints.gridy = 2;
209
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
210
		gridBagConstraints.weightx = 1.0;
211
		gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 0);
212
		nameOptionsPanel.add(allRButton, gridBagConstraints);
204
	        allRButton.setText("jRadioButton2");
205
	        allRButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
206
	        allRButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
207
	        gridBagConstraints = new java.awt.GridBagConstraints();
208
	        gridBagConstraints.gridx = 0;
209
	        gridBagConstraints.gridy = 2;
210
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
211
	        gridBagConstraints.weightx = 1.0;
212
	        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 0);
213
	        nameOptionsPanel.add(allRButton, gridBagConstraints);
213 214

  
214
		gridBagConstraints = new java.awt.GridBagConstraints();
215
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
216
		gridBagConstraints.weightx = 1.0;
217
		leftPanel.add(nameOptionsPanel, gridBagConstraints);
215
	        gridBagConstraints = new java.awt.GridBagConstraints();
216
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
217
	        gridBagConstraints.weightx = 1.0;
218
	        leftPanel.add(nameOptionsPanel, gridBagConstraints);
218 219

  
219
		abstractPanel1.setLayout(new java.awt.GridBagLayout());
220
	        abstractPanel1.setLayout(new java.awt.GridBagLayout());
220 221

  
221
		abstractLabel1.setText("jLabel1");
222
		gridBagConstraints = new java.awt.GridBagConstraints();
223
		gridBagConstraints.gridx = 0;
224
		gridBagConstraints.gridy = 0;
225
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
226
		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
227
		gridBagConstraints.weightx = 1.0;
228
		gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
229
		abstractPanel1.add(abstractLabel1, gridBagConstraints);
222
	        abstractLabel1.setText("jLabel1");
223
	        gridBagConstraints = new java.awt.GridBagConstraints();
224
	        gridBagConstraints.gridx = 0;
225
	        gridBagConstraints.gridy = 0;
226
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
227
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
228
	        gridBagConstraints.weightx = 1.0;
229
	        gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
230
	        abstractPanel1.add(abstractLabel1, gridBagConstraints);
230 231

  
231
		abstractText1.setText("jTextField1");
232
		gridBagConstraints = new java.awt.GridBagConstraints();
233
		gridBagConstraints.gridx = 0;
234
		gridBagConstraints.gridy = 1;
235
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
236
		gridBagConstraints.weightx = 1.0;
237
		gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
238
		abstractPanel1.add(abstractText1, gridBagConstraints);
232
	        abstractText1.setText("jTextField1");
233
	        gridBagConstraints = new java.awt.GridBagConstraints();
234
	        gridBagConstraints.gridx = 0;
235
	        gridBagConstraints.gridy = 1;
236
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
237
	        gridBagConstraints.weightx = 1.0;
238
	        gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
239
	        abstractPanel1.add(abstractText1, gridBagConstraints);
239 240

  
240
		gridBagConstraints = new java.awt.GridBagConstraints();
241
		gridBagConstraints.gridx = 0;
242
		gridBagConstraints.gridy = 1;
243
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
244
		gridBagConstraints.weightx = 1.0;
245
		leftPanel.add(abstractPanel1, gridBagConstraints);
241
	        gridBagConstraints = new java.awt.GridBagConstraints();
242
	        gridBagConstraints.gridx = 0;
243
	        gridBagConstraints.gridy = 1;
244
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
245
	        gridBagConstraints.weightx = 1.0;
246
	        leftPanel.add(abstractPanel1, gridBagConstraints);
246 247

  
247
		keywordsPanel.setLayout(new java.awt.GridBagLayout());
248
	        keywordsPanel.setLayout(new java.awt.GridBagLayout());
248 249

  
249
		keywordsLabel.setText("jLabel1");
250
		gridBagConstraints = new java.awt.GridBagConstraints();
251
		gridBagConstraints.gridx = 0;
252
		gridBagConstraints.gridy = 0;
253
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
254
		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
255
		gridBagConstraints.weightx = 1.0;
256
		gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
257
		keywordsPanel.add(keywordsLabel, gridBagConstraints);
250
	        keywordsLabel.setText("jLabel1");
251
	        gridBagConstraints = new java.awt.GridBagConstraints();
252
	        gridBagConstraints.gridx = 0;
253
	        gridBagConstraints.gridy = 0;
254
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
255
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
256
	        gridBagConstraints.weightx = 1.0;
257
	        gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
258
	        keywordsPanel.add(keywordsLabel, gridBagConstraints);
258 259

  
259
		keywordsText.setText("jTextField1");
260
		gridBagConstraints = new java.awt.GridBagConstraints();
261
		gridBagConstraints.gridx = 0;
262
		gridBagConstraints.gridy = 1;
263
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
264
		gridBagConstraints.weightx = 1.0;
265
		gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
266
		keywordsPanel.add(keywordsText, gridBagConstraints);
260
	        keywordsText.setText("jTextField1");
261
	        gridBagConstraints = new java.awt.GridBagConstraints();
262
	        gridBagConstraints.gridx = 0;
263
	        gridBagConstraints.gridy = 1;
264
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
265
	        gridBagConstraints.weightx = 1.0;
266
	        gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
267
	        keywordsPanel.add(keywordsText, gridBagConstraints);
267 268

  
268
		gridBagConstraints = new java.awt.GridBagConstraints();
269
		gridBagConstraints.gridx = 0;
270
		gridBagConstraints.gridy = 2;
271
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
272
		gridBagConstraints.weightx = 1.0;
273
		leftPanel.add(keywordsPanel, gridBagConstraints);
269
	        gridBagConstraints = new java.awt.GridBagConstraints();
270
	        gridBagConstraints.gridx = 0;
271
	        gridBagConstraints.gridy = 2;
272
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
273
	        gridBagConstraints.weightx = 1.0;
274
	        leftPanel.add(keywordsPanel, gridBagConstraints);
274 275

  
275
		cathegoryPanel.setLayout(new java.awt.GridBagLayout());
276
	        cathegoryPanel.setLayout(new java.awt.GridBagLayout());
276 277

  
277
		cathegoryLabel.setText("jLabel1");
278
		gridBagConstraints = new java.awt.GridBagConstraints();
279
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
280
		gridBagConstraints.weightx = 1.0;
281
		gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
282
		cathegoryPanel.add(cathegoryLabel, gridBagConstraints);
278
	        cathegoryLabel.setText("jLabel1");
279
	        gridBagConstraints = new java.awt.GridBagConstraints();
280
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
281
	        gridBagConstraints.weightx = 1.0;
282
	        gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
283
	        cathegoryPanel.add(cathegoryLabel, gridBagConstraints);
283 284

  
284
		cathegoryCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Art\u00edculo 1", "Art\u00edculo 2", "Art\u00edculo 3", "Art\u00edculo 4" }));
285
		gridBagConstraints = new java.awt.GridBagConstraints();
286
		gridBagConstraints.gridx = 0;
287
		gridBagConstraints.gridy = 1;
288
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
289
		gridBagConstraints.weightx = 1.0;
290
		gridBagConstraints.insets = new java.awt.Insets(2, 0, 5, 0);
291
		cathegoryPanel.add(cathegoryCombo, gridBagConstraints);
285
	        cathegoryCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Art\u00edculo 1", "Art\u00edculo 2", "Art\u00edculo 3", "Art\u00edculo 4" }));
286
	        gridBagConstraints = new java.awt.GridBagConstraints();
287
	        gridBagConstraints.gridx = 0;
288
	        gridBagConstraints.gridy = 1;
289
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
290
	        gridBagConstraints.weightx = 1.0;
291
	        gridBagConstraints.insets = new java.awt.Insets(2, 0, 5, 0);
292
	        cathegoryPanel.add(cathegoryCombo, gridBagConstraints);
292 293

  
293
		gridBagConstraints = new java.awt.GridBagConstraints();
294
		gridBagConstraints.gridx = 0;
295
		gridBagConstraints.gridy = 3;
296
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
297
		gridBagConstraints.weightx = 1.0;
298
		leftPanel.add(cathegoryPanel, gridBagConstraints);
294
	        gridBagConstraints = new java.awt.GridBagConstraints();
295
	        gridBagConstraints.gridx = 0;
296
	        gridBagConstraints.gridy = 3;
297
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
298
	        gridBagConstraints.weightx = 1.0;
299
	        leftPanel.add(cathegoryPanel, gridBagConstraints);
299 300

  
300
		scalePanel.setLayout(new java.awt.GridBagLayout());
301
	        scalePanel.setLayout(new java.awt.GridBagLayout());
301 302

  
302
		scaleLabel.setText("jLabel1");
303
		gridBagConstraints = new java.awt.GridBagConstraints();
304
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
305
		gridBagConstraints.weightx = 1.0;
306
		gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
307
		scalePanel.add(scaleLabel, gridBagConstraints);
303
	        scaleLabel.setText("jLabel1");
304
	        gridBagConstraints = new java.awt.GridBagConstraints();
305
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
306
	        gridBagConstraints.weightx = 1.0;
307
	        gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
308
	        scalePanel.add(scaleLabel, gridBagConstraints);
308 309

  
309
		scaleCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Art\u00edculo 1", "Art\u00edculo 2", "Art\u00edculo 3", "Art\u00edculo 4" }));
310
		gridBagConstraints = new java.awt.GridBagConstraints();
311
		gridBagConstraints.gridx = 0;
312
		gridBagConstraints.gridy = 1;
313
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
314
		gridBagConstraints.weightx = 1.0;
315
		gridBagConstraints.insets = new java.awt.Insets(2, 0, 5, 0);
316
		scalePanel.add(scaleCombo, gridBagConstraints);
310
	        scaleCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Art\u00edculo 1", "Art\u00edculo 2", "Art\u00edculo 3", "Art\u00edculo 4" }));
311
	        gridBagConstraints = new java.awt.GridBagConstraints();
312
	        gridBagConstraints.gridx = 0;
313
	        gridBagConstraints.gridy = 1;
314
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
315
	        gridBagConstraints.weightx = 1.0;
316
	        gridBagConstraints.insets = new java.awt.Insets(2, 0, 5, 0);
317
	        scalePanel.add(scaleCombo, gridBagConstraints);
317 318

  
318
		gridBagConstraints = new java.awt.GridBagConstraints();
319
		gridBagConstraints.gridx = 0;
320
		gridBagConstraints.gridy = 4;
321
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
322
		gridBagConstraints.weightx = 1.0;
323
		leftPanel.add(scalePanel, gridBagConstraints);
319
	        gridBagConstraints = new java.awt.GridBagConstraints();
320
	        gridBagConstraints.gridx = 0;
321
	        gridBagConstraints.gridy = 4;
322
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
323
	        gridBagConstraints.weightx = 1.0;
324
	        leftPanel.add(scalePanel, gridBagConstraints);
324 325

  
325
		providerPanel.setLayout(new java.awt.GridBagLayout());
326
	        providerPanel.setLayout(new java.awt.GridBagLayout());
326 327

  
327
		providerLabel.setText("jLabel1");
328
		gridBagConstraints = new java.awt.GridBagConstraints();
329
		gridBagConstraints.gridx = 0;
330
		gridBagConstraints.gridy = 0;
331
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
332
		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
333
		gridBagConstraints.weightx = 1.0;
334
		gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
335
		providerPanel.add(providerLabel, gridBagConstraints);
328
	        providerLabel.setText("jLabel1");
329
	        gridBagConstraints = new java.awt.GridBagConstraints();
330
	        gridBagConstraints.gridx = 0;
331
	        gridBagConstraints.gridy = 0;
332
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
333
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
334
	        gridBagConstraints.weightx = 1.0;
335
	        gridBagConstraints.insets = new java.awt.Insets(5, 0, 2, 0);
336
	        providerPanel.add(providerLabel, gridBagConstraints);
336 337

  
337
		providerText.setText("jTextField1");
338
		gridBagConstraints = new java.awt.GridBagConstraints();
339
		gridBagConstraints.gridx = 0;
340
		gridBagConstraints.gridy = 1;
341
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
342
		gridBagConstraints.weightx = 1.0;
343
		gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
344
		providerPanel.add(providerText, gridBagConstraints);
338
	        providerText.setText("jTextField1");
339
	        gridBagConstraints = new java.awt.GridBagConstraints();
340
	        gridBagConstraints.gridx = 0;
341
	        gridBagConstraints.gridy = 1;
342
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
343
	        gridBagConstraints.weightx = 1.0;
344
	        gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
345
	        providerPanel.add(providerText, gridBagConstraints);
345 346

  
346
		gridBagConstraints = new java.awt.GridBagConstraints();
347
		gridBagConstraints.gridx = 0;
348
		gridBagConstraints.gridy = 5;
349
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
350
		gridBagConstraints.weightx = 1.0;
351
		leftPanel.add(providerPanel, gridBagConstraints);
347
	        gridBagConstraints = new java.awt.GridBagConstraints();
348
	        gridBagConstraints.gridx = 0;
349
	        gridBagConstraints.gridy = 5;
350
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
351
	        gridBagConstraints.weightx = 1.0;
352
	        leftPanel.add(providerPanel, gridBagConstraints);
352 353

  
353
		gridBagConstraints = new java.awt.GridBagConstraints();
354
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
355
		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
356
		gridBagConstraints.weightx = 0.5;
357
		gridBagConstraints.weighty = 1.0;
358
		add(leftPanel, gridBagConstraints);
354
	        add(leftPanel);
359 355

  
360
		rigthPanel.setLayout(new java.awt.GridBagLayout());
356
	        rigthPanel.setLayout(new java.awt.BorderLayout());
361 357

  
362
		rigthPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 3));
363
		updatePanel.setLayout(new java.awt.GridBagLayout());
358
	        rigthPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 3));
359
	        rigthUpperPanel.setLayout(new java.awt.GridBagLayout());
364 360

  
365
		updatePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("update"));
366
		upperUpdatePanel.setLayout(new java.awt.GridBagLayout());
361
	        coordinatesPanel.setLayout(new java.awt.GridBagLayout());
367 362

  
368
		uperUpdateLabel.setText("jLabel1");
369
		gridBagConstraints = new java.awt.GridBagConstraints();
370
		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
371
		upperUpdatePanel.add(uperUpdateLabel, gridBagConstraints);
363
	        coordinatesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("coordinates"));
364
	        upperCoordinatesPanel.setLayout(new java.awt.GridBagLayout());
372 365

  
373
		uperUpdateText.setText("jTextField1");
374
		gridBagConstraints = new java.awt.GridBagConstraints();
375
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
376
		gridBagConstraints.weightx = 1.0;
377
		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
378
		upperUpdatePanel.add(uperUpdateText, gridBagConstraints);
366
	        upperCoordinatesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("upper"));
367
	        ulxLabel.setText("ULX:");
368
	        gridBagConstraints = new java.awt.GridBagConstraints();
369
	        gridBagConstraints.weightx = 0.15;
370
	        upperCoordinatesPanel.add(ulxLabel, gridBagConstraints);
379 371

  
380
		gridBagConstraints = new java.awt.GridBagConstraints();
381
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
382
		gridBagConstraints.weightx = 1.0;
383
		updatePanel.add(upperUpdatePanel, gridBagConstraints);
372
	        ulxText.setText("jTextField1");
373
	        gridBagConstraints = new java.awt.GridBagConstraints();
374
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
375
	        gridBagConstraints.weightx = 0.35;
376
	        gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 2);
377
	        upperCoordinatesPanel.add(ulxText, gridBagConstraints);
384 378

  
385
		lowerUpdatePanel1.setLayout(new java.awt.GridBagLayout());
379
	        ulyLabel.setText("ULY:");
380
	        gridBagConstraints = new java.awt.GridBagConstraints();
381
	        gridBagConstraints.weightx = 0.15;
382
	        gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 0);
383
	        upperCoordinatesPanel.add(ulyLabel, gridBagConstraints);
386 384

  
387
		lowerUpdateLabel.setText("jLabel1");
388
		gridBagConstraints = new java.awt.GridBagConstraints();
389
		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
390
		lowerUpdatePanel1.add(lowerUpdateLabel, gridBagConstraints);
385
	        ulyText.setText("jTextField1");
386
	        gridBagConstraints = new java.awt.GridBagConstraints();
387
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
388
	        gridBagConstraints.weightx = 0.35;
389
	        upperCoordinatesPanel.add(ulyText, gridBagConstraints);
391 390

  
392
		loweruperUpdateText.setText("jTextField1");
393
		gridBagConstraints = new java.awt.GridBagConstraints();
394
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
395
		gridBagConstraints.weightx = 1.0;
396
		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
397
		lowerUpdatePanel1.add(loweruperUpdateText, gridBagConstraints);
391
	        gridBagConstraints = new java.awt.GridBagConstraints();
392
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
393
	        gridBagConstraints.weightx = 1.0;
394
	        coordinatesPanel.add(upperCoordinatesPanel, gridBagConstraints);
398 395

  
399
		gridBagConstraints = new java.awt.GridBagConstraints();
400
		gridBagConstraints.gridx = 0;
401
		gridBagConstraints.gridy = 1;
402
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
403
		gridBagConstraints.weightx = 1.0;
404
		updatePanel.add(lowerUpdatePanel1, gridBagConstraints);
396
	        lowerCoordinatesPanel.setLayout(new java.awt.GridBagLayout());
405 397

  
406
		gridBagConstraints = new java.awt.GridBagConstraints();
407
		gridBagConstraints.gridx = 0;
408
		gridBagConstraints.gridy = 1;
409
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
410
		gridBagConstraints.weightx = 1.0;
411
		rigthPanel.add(updatePanel, gridBagConstraints);
398
	        lowerCoordinatesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("lower"));
399
	        brxLabel.setText("ULX:");
400
	        gridBagConstraints = new java.awt.GridBagConstraints();
401
	        gridBagConstraints.weightx = 0.15;
402
	        lowerCoordinatesPanel.add(brxLabel, gridBagConstraints);
412 403

  
413
		coordinatesPanel.setLayout(new java.awt.GridBagLayout());
404
	        brxText.setText("jTextField1");
405
	        gridBagConstraints = new java.awt.GridBagConstraints();
406
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
407
	        gridBagConstraints.weightx = 0.35;
408
	        gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 2);
409
	        lowerCoordinatesPanel.add(brxText, gridBagConstraints);
414 410

  
415
		coordinatesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("coordinates"));
416
		upperCoordinatesPanel.setLayout(new java.awt.GridBagLayout());
411
	        bryLabel.setText("ULY:");
412
	        gridBagConstraints = new java.awt.GridBagConstraints();
413
	        gridBagConstraints.weightx = 0.15;
414
	        gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 0);
415
	        lowerCoordinatesPanel.add(bryLabel, gridBagConstraints);
417 416

  
418
		upperCoordinatesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("upper"));
419
		ulxLabel.setText("ULX:");
420
		gridBagConstraints = new java.awt.GridBagConstraints();
421
		gridBagConstraints.weightx = 0.15;
422
		upperCoordinatesPanel.add(ulxLabel, gridBagConstraints);
417
	        bryText.setText("jTextField1");
418
	        gridBagConstraints = new java.awt.GridBagConstraints();
419
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
420
	        gridBagConstraints.weightx = 0.35;
421
	        lowerCoordinatesPanel.add(bryText, gridBagConstraints);
423 422

  
424
		ulxText.setText("jTextField1");
425
		gridBagConstraints = new java.awt.GridBagConstraints();
426
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
427
		gridBagConstraints.weightx = 0.35;
428
		gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 2);
429
		upperCoordinatesPanel.add(ulxText, gridBagConstraints);
423
	        gridBagConstraints = new java.awt.GridBagConstraints();
424
	        gridBagConstraints.gridx = 0;
425
	        gridBagConstraints.gridy = 1;
426
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
427
	        gridBagConstraints.weightx = 1.0;
428
	        coordinatesPanel.add(lowerCoordinatesPanel, gridBagConstraints);
430 429

  
431
		ulyLabel.setText("ULY:");
432
		gridBagConstraints = new java.awt.GridBagConstraints();
433
		gridBagConstraints.weightx = 0.15;
434
		gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 0);
435
		upperCoordinatesPanel.add(ulyLabel, gridBagConstraints);
430
	        coordinatesRelationshipPanel.setLayout(new java.awt.GridBagLayout());
436 431

  
437
		ulyText.setText("jTextField1");
438
		gridBagConstraints = new java.awt.GridBagConstraints();
439
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
440
		gridBagConstraints.weightx = 0.35;
441
		upperCoordinatesPanel.add(ulyText, gridBagConstraints);
432
	        coordinatesRelationshipCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Art\u00edculo 1", "Art\u00edculo 2", "Art\u00edculo 3", "Art\u00edculo 4" }));
433
	        gridBagConstraints = new java.awt.GridBagConstraints();
434
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
435
	        gridBagConstraints.weightx = 1.0;
436
	        coordinatesRelationshipPanel.add(coordinatesRelationshipCombo, gridBagConstraints);
442 437

  
443
		gridBagConstraints = new java.awt.GridBagConstraints();
444
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
445
		gridBagConstraints.weightx = 1.0;
446
		coordinatesPanel.add(upperCoordinatesPanel, gridBagConstraints);
438
	        gridBagConstraints = new java.awt.GridBagConstraints();
439
	        gridBagConstraints.gridx = 0;
440
	        gridBagConstraints.gridy = 2;
441
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
442
	        gridBagConstraints.weightx = 1.0;
443
	        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
444
	        coordinatesPanel.add(coordinatesRelationshipPanel, gridBagConstraints);
447 445

  
448
		lowerCoordinatesPanel.setLayout(new java.awt.GridBagLayout());
446
	        gridBagConstraints = new java.awt.GridBagConstraints();
447
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
448
	        gridBagConstraints.weightx = 1.0;
449
	        rigthUpperPanel.add(coordinatesPanel, gridBagConstraints);
449 450

  
450
		lowerCoordinatesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("lower"));
451
		brxLabel.setText("ULX:");
452
		gridBagConstraints = new java.awt.GridBagConstraints();
453
		gridBagConstraints.weightx = 0.15;
454
		lowerCoordinatesPanel.add(brxLabel, gridBagConstraints);
451
	        updatePanel.setLayout(new java.awt.GridBagLayout());
455 452

  
456
		brxText.setText("jTextField1");
457
		gridBagConstraints = new java.awt.GridBagConstraints();
458
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
459
		gridBagConstraints.weightx = 0.35;
460
		gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 2);
461
		lowerCoordinatesPanel.add(brxText, gridBagConstraints);
453
	        updatePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("update"));
454
	        upperUpdatePanel.setLayout(new java.awt.GridBagLayout());
462 455

  
463
		bryLabel.setText("ULY:");
464
		gridBagConstraints = new java.awt.GridBagConstraints();
465
		gridBagConstraints.weightx = 0.15;
466
		gridBagConstraints.insets = new java.awt.Insets(0, 2, 0, 0);
467
		lowerCoordinatesPanel.add(bryLabel, gridBagConstraints);
456
	        uperUpdateLabel.setText("jLabel1");
457
	        gridBagConstraints = new java.awt.GridBagConstraints();
458
	        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
459
	        upperUpdatePanel.add(uperUpdateLabel, gridBagConstraints);
468 460

  
469
		bryText.setText("jTextField1");
470
		gridBagConstraints = new java.awt.GridBagConstraints();
471
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
472
		gridBagConstraints.weightx = 0.35;
473
		lowerCoordinatesPanel.add(bryText, gridBagConstraints);
461
	        uperUpdateText.setText("jTextField1");
462
	        gridBagConstraints = new java.awt.GridBagConstraints();
463
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
464
	        gridBagConstraints.weightx = 1.0;
465
	        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
466
	        upperUpdatePanel.add(uperUpdateText, gridBagConstraints);
474 467

  
475
		gridBagConstraints = new java.awt.GridBagConstraints();
476
		gridBagConstraints.gridx = 0;
477
		gridBagConstraints.gridy = 1;
478
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
479
		gridBagConstraints.weightx = 1.0;
480
		coordinatesPanel.add(lowerCoordinatesPanel, gridBagConstraints);
468
	        gridBagConstraints = new java.awt.GridBagConstraints();
469
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
470
	        gridBagConstraints.weightx = 1.0;
471
	        updatePanel.add(upperUpdatePanel, gridBagConstraints);
481 472

  
482
		coordinatesRelationshipPanel.setLayout(new java.awt.GridBagLayout());
473
	        lowerUpdatePanel1.setLayout(new java.awt.GridBagLayout());
483 474

  
484
		coordinatesRelationshipCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Art\u00edculo 1", "Art\u00edculo 2", "Art\u00edculo 3", "Art\u00edculo 4" }));
485
		gridBagConstraints = new java.awt.GridBagConstraints();
486
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
487
		gridBagConstraints.weightx = 1.0;
488
		coordinatesRelationshipPanel.add(coordinatesRelationshipCombo, gridBagConstraints);
475
	        lowerUpdateLabel.setText("jLabel1");
476
	        gridBagConstraints = new java.awt.GridBagConstraints();
477
	        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
478
	        lowerUpdatePanel1.add(lowerUpdateLabel, gridBagConstraints);
489 479

  
490
		gridBagConstraints = new java.awt.GridBagConstraints();
491
		gridBagConstraints.gridx = 0;
492
		gridBagConstraints.gridy = 2;
493
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
494
		gridBagConstraints.weightx = 1.0;
495
		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
496
		coordinatesPanel.add(coordinatesRelationshipPanel, gridBagConstraints);
480
	        loweruperUpdateText.setText("jTextField1");
481
	        gridBagConstraints = new java.awt.GridBagConstraints();
482
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
483
	        gridBagConstraints.weightx = 1.0;
484
	        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
485
	        lowerUpdatePanel1.add(loweruperUpdateText, gridBagConstraints);
497 486

  
498
		gridBagConstraints = new java.awt.GridBagConstraints();
499
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
500
		gridBagConstraints.weightx = 1.0;
501
		rigthPanel.add(coordinatesPanel, gridBagConstraints);
487
	        gridBagConstraints = new java.awt.GridBagConstraints();
488
	        gridBagConstraints.gridx = 0;
489
	        gridBagConstraints.gridy = 1;
490
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
491
	        gridBagConstraints.weightx = 1.0;
492
	        updatePanel.add(lowerUpdatePanel1, gridBagConstraints);
502 493

  
503
		gridBagConstraints = new java.awt.GridBagConstraints();
504
		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
505
		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
506
		gridBagConstraints.weightx = 0.5;
507
		gridBagConstraints.weighty = 1.0;
508
		add(rigthPanel, gridBagConstraints);
494
	        gridBagConstraints = new java.awt.GridBagConstraints();
495
	        gridBagConstraints.gridx = 0;
496
	        gridBagConstraints.gridy = 1;
497
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
498
	        gridBagConstraints.weightx = 1.0;
499
	        rigthUpperPanel.add(updatePanel, gridBagConstraints);
509 500

  
501
	        rigthPanel.add(rigthUpperPanel, java.awt.BorderLayout.NORTH);
502

  
503
	        add(rigthPanel);
504

  
510 505
	}// </editor-fold>                
511 506

  
512 507
	private void initLabels(){
......
514 509
		exactRButton.setText(Messages.getText("exactSentence"));
515 510
		anyRButton.setText(Messages.getText("anyWord"));
516 511
		allRButton.setText(Messages.getText("allWords"));
512
		abstractLabel1.setText(Messages.getText("abstract"));
513
		keywordsLabel.setText(Messages.getText("keyWords"));
514
		cathegoryLabel.setText(Messages.getText("cathegory"));
515
		scaleLabel.setText(Messages.getText("scale"));
516
		providerLabel.setText(Messages.getText("provider"));
517 517
		coordinatesPanel.setBorder(BorderFactory.createTitledBorder(Messages.getText("coordinates")));
518 518
		upperCoordinatesPanel.setBorder(BorderFactory.createTitledBorder(Messages.getText("upperCoordinates")));
519 519
		lowerCoordinatesPanel.setBorder(BorderFactory.createTitledBorder(Messages.getText("lowerCoordinates")));
......
521 521
		ulyLabel.setText(Messages.getText("ULY") + ":");
522 522
		brxLabel.setText(Messages.getText("BRX") + ":");
523 523
		bryLabel.setText(Messages.getText("BRY") + ":");
524
		uperUpdateLabel.setText(Messages.getText("from") + ":");
525
		lowerUpdateLabel.setText(Messages.getText("to") + ":");
524 526
	}
525 527
	
526 528
	/**
......
603 605
	 * @return the cathegory
604 606
	 */
605 607
	public String getCathegory() {
606
		return (String)cathegoryCombo.getSelectedItem();
608
		String cathegory = (String)cathegoryCombo.getSelectedItem();
609
		if (cathegory.compareTo(Messages.getText("cathegoryAny")) == 0){
610
			return null;
611
		}
612
		return cathegory;
607 613
	}
608 614

  
609 615
	/**
610 616
	 * @return the scale
611 617
	 */
612 618
	public String getScale() {
613
		return (String)scaleCombo.getSelectedItem();
619
		String scale = (String)scaleCombo.getSelectedItem();
620
		if (scale.compareTo(Messages.getText("scaleAny")) == 0){
621
			return null;
622
		}
623
		return scale;
614 624
	}
615 625

  
616 626
	/**
......
627 637
	 * @return the date from field
628 638
	 */
629 639
	public String getDateFrom() {
640
		if (uperUpdateText.getText().equals("")){
641
			return null;
642
		}
630 643
		return uperUpdateText.getText();
631 644
	}
632 645

  
......
634 647
	 * @return the date to field
635 648
	 */
636 649
	public String getDateTo() {
650
		if (loweruperUpdateText.getText().equals("")){
651
			return null;
652
		}
637 653
		return loweruperUpdateText.getText();
638 654
	}
639 655
	
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/search/SearchButtonPanel.java
52 52
 *
53 53
 * $Id$
54 54
 * $Log$
55
 * Revision 1.1.2.2  2007-07-13 12:00:35  jorpiell
55
 * Revision 1.1.2.3  2007-07-23 07:14:24  jorpiell
56
 * Catalog refactoring
57
 *
58
 * Revision 1.1.2.2  2007/07/13 12:00:35  jorpiell
56 59
 * Add the posibility to add a new panel
57 60
 *
58 61
 * Revision 1.1.2.1  2007/07/11 13:01:50  jorpiell
......
113 116
	private void initLabels(){
114 117
		searchButton.setText(Messages.getText("searchButton"));
115 118
		closeButton.setText(Messages.getText("close"));
116
		lastButton.setText(Messages.getText("lastButton"));
117
		cancelButton.setText(Messages.getText("cancelButton"));
119
		lastButton.setText(Messages.getText("last"));
120
		cancelButton.setText(Messages.getText("cancel"));
118 121
	}
119 122
	
120 123
	/**
branches/CatalogYNomenclator_v1_1_0_1005/applications/appCatalogYNomenclatorClient/src/es/gva/cit/catalogClient/ui/search/SearchUpperPanel.java
56 56
 * @author Jorge Piera Llodra (piera_jor@gva.es)
57 57
 */
58 58
public class SearchUpperPanel extends JPanel {
59
	 private javax.swing.JCheckBox areaCheckBox;
60
	    private javax.swing.JPanel areaPanel;
61
	    private javax.swing.JPanel leftPanel;
62
	    private javax.swing.JButton resizeButton;
63
	    private javax.swing.JPanel resizePanel;
64
	    private javax.swing.JComboBox serviceCombo;
65
	    private javax.swing.JLabel serviceLabel;
66
	    private javax.swing.JPanel servicePanel;
67
	    private javax.swing.JLabel titleLabel;
68
	    private javax.swing.JPanel titlePanel;
69
	    private javax.swing.JTextField titleText;
70

  
59
	private javax.swing.JCheckBox areaCheckBox;
60
    private javax.swing.JPanel areaPanel;
61
    private javax.swing.JPanel leftPanel;
62
    private javax.swing.JPanel leftUpperPanel;
63
    private javax.swing.JButton resizeButton;
64
    private javax.swing.JPanel resizePanel;
65
    private javax.swing.JPanel rigthPanel;
66
    private javax.swing.JPanel rigthUpperPanel;
67
    private javax.swing.JComboBox serviceCombo;
68
    private javax.swing.JLabel serviceLabel;
69
    private javax.swing.JPanel servicePanel;
70
    private javax.swing.JLabel titleLabel;
71
    private javax.swing.JPanel titlePanel;
72
    private javax.swing.JTextField titleText;
73
    
71 74
	/** Creates new form upperPanel */
72 75
	public SearchUpperPanel() {
73 76
		initComponents();
......
82 85
	 */
83 86
	// <editor-fold defaultstate="collapsed" desc=" C?digo Generado  ">                          
84 87
	private void initComponents() {
85
		 java.awt.GridBagConstraints gridBagConstraints;
88
        java.awt.GridBagConstraints gridBagConstraints;
86 89

  
87
	        leftPanel = new javax.swing.JPanel();
88
	        areaPanel = new javax.swing.JPanel();
89
	        areaCheckBox = new javax.swing.JCheckBox();
90
	        resizePanel = new javax.swing.JPanel();
91
	        resizeButton = new javax.swing.JButton();
92
	        servicePanel = new javax.swing.JPanel();
93
	        serviceLabel = new javax.swing.JLabel();
94
	        serviceCombo = new javax.swing.JComboBox();
95
	        titlePanel = new javax.swing.JPanel();
96
	        titleLabel = new javax.swing.JLabel();
97
	        titleText = new javax.swing.JTextField();
90
        leftPanel = new javax.swing.JPanel();
91
        leftUpperPanel = new javax.swing.JPanel();
92
        titlePanel = new javax.swing.JPanel();
93
        titleLabel = new javax.swing.JLabel();
94
        titleText = new javax.swing.JTextField();
95
        servicePanel = new javax.swing.JPanel();
96
        serviceLabel = new javax.swing.JLabel();
97
        serviceCombo = new javax.swing.JComboBox();
98
        rigthPanel = new javax.swing.JPanel();
99
        rigthUpperPanel = new javax.swing.JPanel();
100
        areaPanel = new javax.swing.JPanel();
101
        areaCheckBox = new javax.swing.JCheckBox();
102
        resizePanel = new javax.swing.JPanel();
103
        resizeButton = new javax.swing.JButton();
98 104

  
99
	        setLayout(new java.awt.GridBagLayout());
105
        setLayout(new java.awt.GridLayout(1, 0));
100 106

  
101
	        leftPanel.setLayout(new java.awt.GridBagLayout());
107
        leftPanel.setLayout(new java.awt.BorderLayout());
102 108

  
103
	        areaPanel.setLayout(new java.awt.GridBagLayout());
109
        leftUpperPanel.setLayout(new java.awt.GridBagLayout());
104 110

  
105
	        areaCheckBox.setText("jCheckBox1");
106
	        areaCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
107
	        areaCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
108
	        gridBagConstraints = new java.awt.GridBagConstraints();
109
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
110
	        gridBagConstraints.weightx = 1.0;
111
	        gridBagConstraints.insets = new java.awt.Insets(20, 2, 2, 2);
112
	        areaPanel.add(areaCheckBox, gridBagConstraints);
111
        titlePanel.setLayout(new java.awt.GridBagLayout());
113 112

  
114
	        gridBagConstraints = new java.awt.GridBagConstraints();
115
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
116
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
117
	        gridBagConstraints.weightx = 0.8;
118
	        leftPanel.add(areaPanel, gridBagConstraints);
113
        titleLabel.setText("jLabel1");
114
        gridBagConstraints = new java.awt.GridBagConstraints();
115
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
116
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
117
        gridBagConstraints.weightx = 1.0;
118
        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 2);
119
        titlePanel.add(titleLabel, gridBagConstraints);
119 120

  
120
	        resizePanel.setLayout(new java.awt.GridBagLayout());
121
        titleText.setText("jTextField1");
122
        gridBagConstraints = new java.awt.GridBagConstraints();
123
        gridBagConstraints.gridx = 0;
124
        gridBagConstraints.gridy = 1;
125
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
126
        gridBagConstraints.weightx = 1.0;
127
        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 2);
128
        titlePanel.add(titleText, gridBagConstraints);
121 129

  
122
	        resizeButton.setText("jButton1");
123
	        resizeButton.setPreferredSize(new java.awt.Dimension(18, 18));
124
	  
125
	        gridBagConstraints = new java.awt.GridBagConstraints();
126
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
127
	        gridBagConstraints.weightx = 1.0;
128
	        gridBagConstraints.insets = new java.awt.Insets(20, 2, 2, 5);
129
	        resizePanel.add(resizeButton, gridBagConstraints);
130
        gridBagConstraints = new java.awt.GridBagConstraints();
131
        gridBagConstraints.gridx = 0;
132
        gridBagConstraints.gridy = 1;
133
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
134
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
135
        gridBagConstraints.weightx = 0.5;
136
        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 5);
137
        leftUpperPanel.add(titlePanel, gridBagConstraints);
130 138

  
131
	        gridBagConstraints = new java.awt.GridBagConstraints();
132
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
133
	        gridBagConstraints.weightx = 0.2;
134
	        leftPanel.add(resizePanel, gridBagConstraints);
139
        servicePanel.setLayout(new java.awt.GridBagLayout());
135 140

  
136
	        gridBagConstraints = new java.awt.GridBagConstraints();
137
	        gridBagConstraints.gridx = 1;
138
	        gridBagConstraints.gridy = 1;
139
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
140
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
141
	        gridBagConstraints.weightx = 0.5;
142
	        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 2);
143
	        add(leftPanel, gridBagConstraints);
141
        serviceLabel.setText("jLabel1");
142
        gridBagConstraints = new java.awt.GridBagConstraints();
143
        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
144
        gridBagConstraints.weightx = 1.0;
145
        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 2);
146
        servicePanel.add(serviceLabel, gridBagConstraints);
144 147

  
145
	        servicePanel.setLayout(new java.awt.GridBagLayout());
148
        serviceCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
149
        gridBagConstraints = new java.awt.GridBagConstraints();
150
        gridBagConstraints.gridx = 0;
151
        gridBagConstraints.gridy = 1;
152
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
153
        gridBagConstraints.weightx = 1.0;
154
        gridBagConstraints.insets = new java.awt.Insets(2, 5, 3, 2);
155
        servicePanel.add(serviceCombo, gridBagConstraints);
146 156

  
147
	        serviceLabel.setText("jLabel1");
148
	        gridBagConstraints = new java.awt.GridBagConstraints();
149
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
150
	        gridBagConstraints.weightx = 1.0;
151
	        gridBagConstraints.insets = new java.awt.Insets(2, 5, 2, 2);
152
	        servicePanel.add(serviceLabel, gridBagConstraints);
157
        gridBagConstraints = new java.awt.GridBagConstraints();
158
        gridBagConstraints.gridx = 0;
159
        gridBagConstraints.gridy = 0;
160
        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
161
        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
162
        gridBagConstraints.weightx = 0.5;
163
        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 5);
164
        leftUpperPanel.add(servicePanel, gridBagConstraints);
153 165

  
154
	        serviceCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
155
	        gridBagConstraints = new java.awt.GridBagConstraints();
156
	        gridBagConstraints.gridx = 0;
157
	        gridBagConstraints.gridy = 1;
158
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
159
	        gridBagConstraints.weightx = 1.0;
160
	        gridBagConstraints.insets = new java.awt.Insets(2, 5, 5, 2);
161
	        servicePanel.add(serviceCombo, gridBagConstraints);
166
        leftPanel.add(leftUpperPanel, java.awt.BorderLayout.NORTH);
162 167

  
163
	        gridBagConstraints = new java.awt.GridBagConstraints();
164
	        gridBagConstraints.gridx = 0;
165
	        gridBagConstraints.gridy = 0;
166
	        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
167
	        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
168
	        gridBagConstraints.weightx = 0.5;
169
	        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 5);
170
	        add(servicePanel, gridBagConstraints);
168
        add(leftPanel);
171 169

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff