Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[1482] trunk/src/org
|
From: <hei...@us...> - 2008-08-20 11:40:30
|
Revision: 1482
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1482&view=rev
Author: heikkidoeleman
Date: 2008-08-20 11:40:32 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Organized imports
Modified Paths:
--------------
trunk/src/org/fao/gast/boot/Util.java
trunk/src/org/fao/gast/cli/setup/Setup.java
trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java
trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java
trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java
trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java
trunk/src/org/fao/gast/lib/DatabaseLib.java
trunk/src/org/fao/gast/lib/IOLib.java
trunk/src/org/fao/gast/lib/druid/Import.java
trunk/src/org/fao/geonet/csw/client/MainFrame.java
trunk/src/org/fao/geonet/csw/common/requests/CatalogRequest.java
trunk/src/org/fao/geonet/kernel/EditLib.java
trunk/src/org/fao/geonet/kernel/XmlSerializer.java
trunk/src/org/fao/geonet/kernel/csw/CatalogDispatcher.java
trunk/src/org/fao/geonet/kernel/csw/services/AbstractOperation.java
trunk/src/org/fao/geonet/kernel/csw/services/DescribeRecord.java
trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java
trunk/src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
trunk/src/org/fao/geonet/kernel/mef/Importer.java
trunk/src/org/fao/geonet/kernel/mef/MEFConstants.java
trunk/src/org/fao/geonet/kernel/mef/MEFLib.java
trunk/src/org/fao/geonet/kernel/oaipmh/services/ListMetadataFormats.java
trunk/src/org/fao/geonet/kernel/schema/ComplexContentEntry.java
trunk/src/org/fao/geonet/kernel/schema/ElementEntry.java
trunk/src/org/fao/geonet/kernel/schema/Logger.java
trunk/src/org/fao/geonet/kernel/schema/MetadataType.java
trunk/src/org/fao/geonet/kernel/schema/SimpleContentEntry.java
trunk/src/org/fao/geonet/kernel/setting/SettingManager.java
trunk/src/org/fao/geonet/lib/SourcesLib.java
trunk/src/org/fao/geonet/services/banner/Get.java
trunk/src/org/fao/geonet/services/category/Update.java
trunk/src/org/fao/geonet/services/config/Set.java
trunk/src/org/fao/geonet/services/group/Update.java
trunk/src/org/fao/geonet/services/harvesting/Add.java
trunk/src/org/fao/geonet/services/harvesting/Get.java
trunk/src/org/fao/geonet/services/harvesting/Remove.java
trunk/src/org/fao/geonet/services/harvesting/Update.java
trunk/src/org/fao/geonet/services/harvesting/Util.java
trunk/src/org/fao/geonet/services/main/RemoteShow.java
trunk/src/org/fao/geonet/services/main/SearchResult.java
trunk/src/org/fao/geonet/services/metadata/AddAttribute.java
trunk/src/org/fao/geonet/services/metadata/AddElement.java
trunk/src/org/fao/geonet/services/metadata/Create.java
trunk/src/org/fao/geonet/services/metadata/DeleteAttribute.java
trunk/src/org/fao/geonet/services/metadata/DeleteElement.java
trunk/src/org/fao/geonet/services/metadata/GetEditableData.java
trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java
trunk/src/org/fao/geonet/services/metadata/MassiveDelete.java
trunk/src/org/fao/geonet/services/metadata/MoveElement.java
trunk/src/org/fao/geonet/services/metadata/Update.java
trunk/src/org/fao/geonet/services/thumbnail/Unset.java
trunk/src/org/fao/geonet/services/user/List.java
trunk/src/org/fao/geonet/services/user/Update.java
trunk/src/org/fao/geonet/services/util/z3950/GNSearchTask.java
trunk/src/org/fao/geonet/services/util/z3950/GNSearchable.java
trunk/src/org/fao/geonet/services/util/z3950/Server.java
trunk/src/org/fao/geonet/util/ISODate.java
trunk/src/org/wfp/vam/intermap/kernel/Geonet.java
trunk/src/org/wfp/vam/intermap/kernel/GlobalTempFiles.java
trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java
trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageUtils.java
trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/arcims/ArcIMSService.java
trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/wms/WmsService.java
trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/wms/schema/impl/WMSDCPTypeImpl.java
trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/wms/schema/type/WMSLayer.java
trunk/src/org/wfp/vam/intermap/services/geonet/GetGeonetRecords.java
trunk/src/org/wfp/vam/intermap/services/map/FullExtent.java
trunk/src/org/wfp/vam/intermap/services/map/MapUtil.java
trunk/src/org/wfp/vam/intermap/services/map/UnsetAoi.java
trunk/src/org/wfp/vam/intermap/services/map/layers/Add.java
trunk/src/org/wfp/vam/intermap/services/map/layers/SetOrder.java
trunk/src/org/wfp/vam/intermap/services/map/layers/SetTransparency.java
Modified: trunk/src/org/fao/gast/boot/Util.java
===================================================================
--- trunk/src/org/fao/gast/boot/Util.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/boot/Util.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,7 +23,6 @@
package org.fao.gast.boot;
-import java.awt.Component;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
@@ -31,6 +30,7 @@
import java.net.URLClassLoader;
import java.net.URLDecoder;
import java.util.ArrayList;
+
import javax.swing.JOptionPane;
//==============================================================================
Modified: trunk/src/org/fao/gast/cli/setup/Setup.java
===================================================================
--- trunk/src/org/fao/gast/cli/setup/Setup.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/cli/setup/Setup.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,9 +23,8 @@
package org.fao.gast.cli.setup;
-import java.io.File;
import java.util.List;
-import jeeves.resources.dbms.Dbms;
+
import org.fao.gast.lib.Lib;
import org.fao.gast.lib.Resource;
Modified: trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java
===================================================================
--- trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/gui/panels/database/sample/Worker.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,9 +24,10 @@
package org.fao.gast.gui.panels.database.sample;
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
+
import jeeves.utils.XmlRequest;
+
import org.dlib.gui.ProgressDialog;
import org.fao.gast.app.App;
import org.fao.gast.app.Configuration;
Modified: trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java
===================================================================
--- trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/gui/panels/manag/mefexport/SearchPanel.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -25,13 +25,15 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.List;
+
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JTextField;
+
import jeeves.utils.XmlRequest;
+
import org.dlib.gui.FlexLayout;
import org.dlib.gui.TPanel;
import org.fao.gast.app.App;
Modified: trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java
===================================================================
--- trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/gui/panels/manag/mefimport/Worker.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,11 +24,10 @@
package org.fao.gast.gui.panels.manag.mefimport;
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
-import jeeves.exceptions.UserNotFoundEx;
-import jeeves.utils.Xml;
+
import jeeves.utils.XmlRequest;
+
import org.dlib.gui.ProgressDialog;
import org.fao.gast.app.App;
import org.fao.gast.app.Configuration;
Modified: trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java
===================================================================
--- trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/gui/panels/migration/oldinst/Worker.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -25,16 +25,15 @@
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import javax.swing.JOptionPane;
+
import jeeves.resources.dbms.Dbms;
import jeeves.utils.Util;
import jeeves.utils.Xml;
+
import org.dlib.gui.ProgressDialog;
import org.fao.gast.app.App;
import org.fao.gast.lib.DatabaseLib;
@@ -45,7 +44,6 @@
import org.fao.gast.lib.druid.ImportField;
import org.fao.geonet.kernel.XmlSerializer;
import org.jdom.Element;
-import org.jdom.output.*;
//==============================================================================
Modified: trunk/src/org/fao/gast/lib/DatabaseLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/DatabaseLib.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/lib/DatabaseLib.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -38,12 +38,12 @@
import java.util.Set;
import java.util.StringTokenizer;
import java.util.UUID;
+
import jeeves.resources.dbms.Dbms;
import jeeves.utils.BinaryFile;
+
import org.fao.gast.lib.druid.Import;
import org.fao.geonet.kernel.AccessManager;
-import org.fao.geonet.kernel.DataManager;
-import org.fao.geonet.kernel.XmlSerializer;
import org.fao.geonet.util.ISODate;
import org.jdom.Document;
import org.jdom.Element;
Modified: trunk/src/org/fao/gast/lib/IOLib.java
===================================================================
--- trunk/src/org/fao/gast/lib/IOLib.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/lib/IOLib.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,8 +29,8 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+
import jeeves.utils.BinaryFile;
-import org.fao.geonet.util.ISODate;
//=============================================================================
Modified: trunk/src/org/fao/gast/lib/druid/Import.java
===================================================================
--- trunk/src/org/fao/gast/lib/druid/Import.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/gast/lib/druid/Import.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -18,7 +18,7 @@
import java.sql.Time;
import java.sql.Timestamp;
import java.util.List;
-import org.dlib.tools.FullTokenizer;
+
import org.dlib.tools.TVector;
//==============================================================================
Modified: trunk/src/org/fao/geonet/csw/client/MainFrame.java
===================================================================
--- trunk/src/org/fao/geonet/csw/client/MainFrame.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/csw/client/MainFrame.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -33,11 +33,11 @@
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.List;
+
import javax.swing.JButton;
+import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -46,13 +46,12 @@
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.JTextField;
+
import org.dlib.gui.FlexLayout;
import org.dlib.gui.MultiPanel;
import org.dlib.gui.TPanel;
-import org.fao.geonet.csw.common.exceptions.CatalogException;
import org.fao.geonet.csw.common.requests.CatalogRequest;
import org.jdom.Element;
-import javax.swing.JCheckBox;
//==============================================================================
Modified: trunk/src/org/fao/geonet/csw/common/requests/CatalogRequest.java
===================================================================
--- trunk/src/org/fao/geonet/csw/common/requests/CatalogRequest.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/csw/common/requests/CatalogRequest.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,37 +23,34 @@
package org.fao.geonet.csw.common.requests;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.fao.geonet.csw.common.Csw;
-import org.fao.geonet.csw.common.exceptions.CatalogException;
-import org.fao.geonet.csw.common.exceptions.NoApplicableCodeEx;
-import org.fao.geonet.csw.common.util.Xml;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+
+import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.NameValuePair;
-import java.util.ArrayList;
-import java.net.URLEncoder;
+import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.fao.geonet.csw.common.Csw;
+import org.fao.geonet.csw.common.exceptions.CatalogException;
+import org.fao.geonet.csw.common.util.Xml;
import org.jdom.Document;
-import java.io.UnsupportedEncodingException;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.httpclient.Header;
-import java.net.URL;
-import org.apache.commons.httpclient.Credentials;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.Namespace;
//=============================================================================
Modified: trunk/src/org/fao/geonet/kernel/EditLib.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/EditLib.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/EditLib.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -27,14 +27,22 @@
package org.fao.geonet.kernel;
-import java.util.*;
-import org.fao.geonet.kernel.schema.*;
-import org.jdom.*;
-import org.jdom.filter.*;
-import jeeves.utils.Xml;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
-import java.io.File;
import org.fao.geonet.constants.Edit;
+import org.fao.geonet.kernel.schema.MetadataAttribute;
+import org.fao.geonet.kernel.schema.MetadataSchema;
+import org.fao.geonet.kernel.schema.MetadataType;
+import org.fao.geonet.kernel.schema.SchemaLoader;
+import org.jdom.Attribute;
+import org.jdom.Element;
+import org.jdom.Namespace;
//=============================================================================
Modified: trunk/src/org/fao/geonet/kernel/XmlSerializer.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/XmlSerializer.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/XmlSerializer.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -26,11 +26,12 @@
import java.sql.SQLException;
import java.util.List;
import java.util.Vector;
+
import jeeves.constants.Jeeves;
import jeeves.resources.dbms.Dbms;
-import jeeves.server.UserSession;
import jeeves.utils.Util;
import jeeves.utils.Xml;
+
import org.fao.geonet.util.ISODate;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/kernel/csw/CatalogDispatcher.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/csw/CatalogDispatcher.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/csw/CatalogDispatcher.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,27 +23,17 @@
package org.fao.geonet.kernel.csw;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
+
import jeeves.server.context.ServiceContext;
import jeeves.server.sources.ServiceRequest.InputMethod;
import jeeves.server.sources.ServiceRequest.OutputMethod;
import jeeves.utils.SOAPUtil;
import jeeves.utils.Util;
import jeeves.utils.Xml;
+
import org.fao.geonet.csw.common.exceptions.CatalogException;
import org.fao.geonet.csw.common.exceptions.MissingParameterValueEx;
import org.fao.geonet.csw.common.exceptions.NoApplicableCodeEx;
@@ -56,11 +46,7 @@
import org.fao.geonet.kernel.csw.services.Harvest;
import org.fao.geonet.kernel.csw.services.Transaction;
import org.jdom.Element;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-import static org.fao.geonet.csw.common.Csw.*;
-
//=============================================================================
public class CatalogDispatcher
Modified: trunk/src/org/fao/geonet/kernel/csw/services/AbstractOperation.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/csw/services/AbstractOperation.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/csw/services/AbstractOperation.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -25,8 +25,8 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import java.util.StringTokenizer;
+
import org.fao.geonet.csw.common.Csw;
import org.fao.geonet.csw.common.Csw.ElementSetName;
import org.fao.geonet.csw.common.exceptions.CatalogException;
Modified: trunk/src/org/fao/geonet/kernel/csw/services/DescribeRecord.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/csw/services/DescribeRecord.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/csw/services/DescribeRecord.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -26,14 +26,15 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
+
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
import jeeves.utils.Xml;
+
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.csw.common.Csw;
import org.fao.geonet.csw.common.exceptions.CatalogException;
import org.fao.geonet.csw.common.exceptions.InvalidParameterValueEx;
-import org.fao.geonet.csw.common.exceptions.MissingParameterValueEx;
import org.fao.geonet.csw.common.exceptions.NoApplicableCodeEx;
import org.fao.geonet.kernel.csw.CatalogService;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/harvest/harvester/geonet20/Aligner.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -25,11 +25,12 @@
import java.util.Iterator;
import java.util.List;
+
import jeeves.interfaces.Logger;
import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
-import jeeves.utils.Util;
import jeeves.utils.XmlRequest;
+
import org.fao.geonet.constants.Edit;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.kernel.DataManager;
Modified: trunk/src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,31 +23,30 @@
package org.fao.geonet.kernel.harvest.harvester.ogcwxs;
-import java.io.BufferedInputStream;
-import java.io.IOException;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.IOException;
import java.io.OutputStream;
+import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.ArrayList;
import java.util.Date;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.UUID;
-import java.net.URL;
-import jeeves.constants.Jeeves;
-import jeeves.exceptions.OperationAbortedEx;
import jeeves.interfaces.Logger;
import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
-import jeeves.utils.Xml;
import jeeves.utils.BinaryFile;
+import jeeves.utils.Xml;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.methods.GetMethod;
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
@@ -59,16 +58,11 @@
import org.fao.geonet.kernel.harvest.harvester.UriMapper;
import org.fao.geonet.lib.Lib;
import org.fao.geonet.services.thumbnail.Set;
-import org.fao.geonet.services.thumbnail.Unset;
import org.jdom.Element;
-import org.jdom.filter.ElementFilter;
+import org.jdom.JDOMException;
import org.jdom.Namespace;
+import org.jdom.filter.ElementFilter;
import org.jdom.xpath.XPath;
-import org.jdom.JDOMException;
-import org.wfp.vam.intermap.kernel.map.mapServices.wms.CapabilitiesStore;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.GetMethod;
//=============================================================================
Modified: trunk/src/org/fao/geonet/kernel/mef/Importer.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/mef/Importer.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/mef/Importer.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -30,21 +30,20 @@
import java.util.Iterator;
import java.util.List;
import java.util.UUID;
+
import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
import jeeves.utils.BinaryFile;
import jeeves.utils.Log;
import jeeves.utils.Xml;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.fao.geonet.lib.Lib;
import org.fao.geonet.util.ISODate;
import org.jdom.Element;
-import static org.fao.geonet.kernel.mef.MEFConstants.*;
-
//=============================================================================
class Importer
Modified: trunk/src/org/fao/geonet/kernel/mef/MEFConstants.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/mef/MEFConstants.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/mef/MEFConstants.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,7 +23,6 @@
package org.fao.geonet.kernel.mef;
-import java.io.File;
//=============================================================================
Modified: trunk/src/org/fao/geonet/kernel/mef/MEFLib.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/mef/MEFLib.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/mef/MEFLib.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,13 +24,11 @@
package org.fao.geonet.kernel.mef;
import java.io.File;
+
import jeeves.exceptions.BadInputEx;
import jeeves.exceptions.BadParameterEx;
import jeeves.exceptions.MissingParameterEx;
import jeeves.server.context.ServiceContext;
-import java.io.IOException;
-import org.jdom.JDOMException;
-import jeeves.exceptions.BadFormatEx;
//=============================================================================
Modified: trunk/src/org/fao/geonet/kernel/oaipmh/services/ListMetadataFormats.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/oaipmh/services/ListMetadataFormats.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/oaipmh/services/ListMetadataFormats.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,14 +24,15 @@
package org.fao.geonet.kernel.oaipmh.services;
import java.io.IOException;
+
import jeeves.server.context.ServiceContext;
import jeeves.utils.Xml;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.kernel.DataManager;
import org.fao.geonet.kernel.oaipmh.Lib;
import org.fao.geonet.kernel.oaipmh.OaiPmhService;
-import org.fao.geonet.kernel.setting.SettingInfo;
import org.fao.oaipmh.requests.AbstractRequest;
import org.fao.oaipmh.requests.ListMetadataFormatsRequest;
import org.fao.oaipmh.responses.AbstractResponse;
Modified: trunk/src/org/fao/geonet/kernel/schema/ComplexContentEntry.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/schema/ComplexContentEntry.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/schema/ComplexContentEntry.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.io.*;
import org.jdom.Attribute;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/kernel/schema/ElementEntry.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/schema/ElementEntry.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/schema/ElementEntry.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.StringTokenizer;
import org.jdom.Attribute;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/kernel/schema/Logger.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/schema/Logger.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/schema/Logger.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -28,7 +28,6 @@
package org.fao.geonet.kernel.schema;
import java.io.File;
-import jeeves.utils.Xml;
//==============================================================================
Modified: trunk/src/org/fao/geonet/kernel/schema/MetadataType.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/schema/MetadataType.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/schema/MetadataType.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -28,10 +28,7 @@
package org.fao.geonet.kernel.schema;
import java.util.ArrayList;
-import java.util.List;
-import org.jdom.Attribute;
-import org.jdom.Element;
import org.fao.geonet.constants.Edit;
//==============================================================================
Modified: trunk/src/org/fao/geonet/kernel/schema/SimpleContentEntry.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/schema/SimpleContentEntry.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/schema/SimpleContentEntry.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -32,7 +32,6 @@
import org.jdom.Attribute;
import org.jdom.Element;
-import jeeves.utils.Xml;
//==============================================================================
Modified: trunk/src/org/fao/geonet/kernel/setting/SettingManager.java
===================================================================
--- trunk/src/org/fao/geonet/kernel/setting/SettingManager.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/kernel/setting/SettingManager.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -30,12 +30,13 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Vector;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+
import jeeves.resources.dbms.Dbms;
import jeeves.server.resources.ProviderManager;
import jeeves.server.resources.ResourceListener;
import jeeves.server.resources.ResourceProvider;
+
import org.fao.geonet.constants.Geonet;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/lib/SourcesLib.java
===================================================================
--- trunk/src/org/fao/geonet/lib/SourcesLib.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/lib/SourcesLib.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,11 +29,12 @@
import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
-import jeeves.interfaces.Logger;
+
import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
import jeeves.utils.BinaryFile;
import jeeves.utils.XmlRequest;
+
import org.fao.geonet.constants.Geonet;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/banner/Get.java
===================================================================
--- trunk/src/org/fao/geonet/services/banner/Get.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/banner/Get.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,15 +23,14 @@
package org.fao.geonet.services.banner;
-import org.jdom.*;
+import jeeves.constants.Jeeves;
+import jeeves.interfaces.Service;
+import jeeves.server.ServiceConfig;
+import jeeves.server.UserSession;
+import jeeves.server.context.ServiceContext;
-import jeeves.interfaces.*;
-import jeeves.server.*;
-import jeeves.server.context.*;
-import jeeves.constants.*;
+import org.jdom.Element;
-import org.fao.geonet.constants.*;
-
//=============================================================================
/** This service returns all information needed to build the banner with XSL
Modified: trunk/src/org/fao/geonet/services/category/Update.java
===================================================================
--- trunk/src/org/fao/geonet/services/category/Update.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/category/Update.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,14 +23,13 @@
package org.fao.geonet.services.category;
-import java.util.Set;
-import java.util.Vector;
import jeeves.constants.Jeeves;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.lib.Lib;
Modified: trunk/src/org/fao/geonet/services/config/Set.java
===================================================================
--- trunk/src/org/fao/geonet/services/config/Set.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/config/Set.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -25,20 +25,21 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.StringTokenizer;
+
import jeeves.constants.Jeeves;
+import jeeves.exceptions.BadInputEx;
+import jeeves.exceptions.BadParameterEx;
import jeeves.exceptions.OperationAbortedEx;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.kernel.setting.SettingManager;
+import org.fao.geonet.lib.Lib;
import org.jdom.Element;
-import jeeves.exceptions.BadParameterEx;
-import jeeves.exceptions.BadInputEx;
-import org.fao.geonet.lib.Lib;
//=============================================================================
Modified: trunk/src/org/fao/geonet/services/group/Update.java
===================================================================
--- trunk/src/org/fao/geonet/services/group/Update.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/group/Update.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,13 +23,13 @@
package org.fao.geonet.services.group;
-import java.util.Set;
import jeeves.constants.Jeeves;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.lib.Lib;
Modified: trunk/src/org/fao/geonet/services/harvesting/Add.java
===================================================================
--- trunk/src/org/fao/geonet/services/harvesting/Add.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/harvesting/Add.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -28,7 +28,7 @@
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
-import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.kernel.harvest.HarvestManager;
Modified: trunk/src/org/fao/geonet/services/harvesting/Get.java
===================================================================
--- trunk/src/org/fao/geonet/services/harvesting/Get.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/harvesting/Get.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,11 +23,11 @@
package org.fao.geonet.services.harvesting;
-import jeeves.constants.Jeeves;
import jeeves.exceptions.ObjectNotFoundEx;
import jeeves.interfaces.Service;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/harvesting/Remove.java
===================================================================
--- trunk/src/org/fao/geonet/services/harvesting/Remove.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/harvesting/Remove.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,13 +23,13 @@
package org.fao.geonet.services.harvesting;
-import java.sql.SQLException;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
+
+import org.fao.geonet.kernel.harvest.HarvestManager;
import org.fao.geonet.kernel.harvest.Common.OperResult;
-import org.fao.geonet.kernel.harvest.HarvestManager;
import org.jdom.Element;
//=============================================================================
Modified: trunk/src/org/fao/geonet/services/harvesting/Update.java
===================================================================
--- trunk/src/org/fao/geonet/services/harvesting/Update.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/harvesting/Update.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -28,10 +28,10 @@
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.kernel.harvest.HarvestManager;
-import org.jdom.Attribute;
import org.jdom.Element;
//=============================================================================
Modified: trunk/src/org/fao/geonet/services/harvesting/Util.java
===================================================================
--- trunk/src/org/fao/geonet/services/harvesting/Util.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/harvesting/Util.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,15 +23,16 @@
package org.fao.geonet.services.harvesting;
-import java.sql.SQLException;
import java.util.Iterator;
+
import jeeves.constants.Jeeves;
import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.kernel.harvest.HarvestManager;
import org.fao.geonet.kernel.harvest.Common.OperResult;
-import org.fao.geonet.kernel.harvest.HarvestManager;
import org.jdom.Attribute;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/main/RemoteShow.java
===================================================================
--- trunk/src/org/fao/geonet/services/main/RemoteShow.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/main/RemoteShow.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,16 +23,16 @@
package org.fao.geonet.services.main;
-import java.util.*;
-import org.jdom.*;
+import jeeves.interfaces.Service;
+import jeeves.server.ServiceConfig;
+import jeeves.server.UserSession;
+import jeeves.server.context.ServiceContext;
-import jeeves.interfaces.*;
-import jeeves.server.*;
-import jeeves.server.context.*;
+import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.constants.Params;
+import org.fao.geonet.kernel.search.MetaSearcher;
+import org.jdom.Element;
-import org.fao.geonet.constants.*;
-import org.fao.geonet.kernel.search.*;
-
//=============================================================================
/** remote.result service. Returns just one metadata formatted like the local search
Modified: trunk/src/org/fao/geonet/services/main/SearchResult.java
===================================================================
--- trunk/src/org/fao/geonet/services/main/SearchResult.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/main/SearchResult.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,17 +24,12 @@
package org.fao.geonet.services.main;
-import org.jdom.*;
+import jeeves.interfaces.Service;
+import jeeves.server.ServiceConfig;
+import jeeves.server.context.ServiceContext;
-import jeeves.interfaces.*;
-import jeeves.server.*;
-import jeeves.server.context.*;
+import org.jdom.Element;
-import org.fao.geonet.constants.*;
-import org.fao.geonet.kernel.search.*;
-import org.fao.geonet.GeonetContext;
-import org.fao.geonet.services.util.MainUtil;
-
//=============================================================================
public class SearchResult implements Service
Modified: trunk/src/org/fao/geonet/services/metadata/AddAttribute.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/AddAttribute.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/AddAttribute.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,11 +29,11 @@
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.exceptions.ConcurrentUpdateEx;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/metadata/AddElement.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/AddElement.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/AddElement.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,11 +29,11 @@
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.exceptions.ConcurrentUpdateEx;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/metadata/Create.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/Create.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/Create.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,13 +23,13 @@
package org.fao.geonet.services.metadata;
-import java.util.HashSet;
import jeeves.constants.Jeeves;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
Modified: trunk/src/org/fao/geonet/services/metadata/DeleteAttribute.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/DeleteAttribute.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/DeleteAttribute.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,11 +29,11 @@
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.exceptions.ConcurrentUpdateEx;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/metadata/DeleteElement.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/DeleteElement.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/DeleteElement.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,11 +29,11 @@
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.exceptions.ConcurrentUpdateEx;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/metadata/GetEditableData.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/GetEditableData.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/GetEditableData.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,19 +23,17 @@
package org.fao.geonet.services.metadata;
-import java.util.*;
-import org.jdom.*;
+import jeeves.interfaces.Service;
+import jeeves.server.ServiceConfig;
+import jeeves.server.context.ServiceContext;
+import jeeves.utils.Util;
-import jeeves.interfaces.*;
-import jeeves.resources.dbms.*;
-import jeeves.server.*;
-import jeeves.server.context.*;
-import jeeves.utils.*;
+import org.fao.geonet.GeonetContext;
+import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.constants.Params;
+import org.fao.geonet.kernel.DataManager;
+import org.jdom.Element;
-import org.fao.geonet.constants.*;
-import org.fao.geonet.kernel.*;
-import org.fao.geonet.*;
-
//=============================================================================
/** Retrieves a particular metadata with editing information. Access is restricted
Modified: trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/ImportFromDir.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,18 +29,19 @@
import java.util.Hashtable;
import java.util.List;
import java.util.UUID;
+
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
import jeeves.utils.Xml;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
-import org.jdom.Namespace;
// FIXME: this class could be moved to DataManager
Modified: trunk/src/org/fao/geonet/services/metadata/MassiveDelete.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/MassiveDelete.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/MassiveDelete.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -26,8 +26,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.util.HashSet;
-import java.util.Set;
+
import jeeves.constants.Jeeves;
import jeeves.exceptions.OperationNotAllowedEx;
import jeeves.interfaces.Service;
@@ -36,10 +35,9 @@
import jeeves.server.UserSession;
import jeeves.server.context.ServiceContext;
import jeeves.utils.BinaryFile;
-import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
-import org.fao.geonet.constants.Params;
import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.fao.geonet.kernel.MdInfo;
Modified: trunk/src/org/fao/geonet/services/metadata/MoveElement.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/MoveElement.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/MoveElement.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,11 +29,11 @@
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.exceptions.ConcurrentUpdateEx;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/metadata/Update.java
===================================================================
--- trunk/src/org/fao/geonet/services/metadata/Update.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/metadata/Update.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -30,11 +30,11 @@
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
import jeeves.utils.Xml;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.fao.geonet.exceptions.ConcurrentUpdateEx;
-import org.fao.geonet.kernel.AccessManager;
import org.fao.geonet.kernel.DataManager;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/thumbnail/Unset.java
===================================================================
--- trunk/src/org/fao/geonet/services/thumbnail/Unset.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/thumbnail/Unset.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,13 +24,14 @@
package org.fao.geonet.services.thumbnail;
import java.io.File;
+
import jeeves.exceptions.OperationAbortedEx;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
-import jeeves.utils.Xml;
+
import org.fao.geonet.GeonetContext;
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
Modified: trunk/src/org/fao/geonet/services/user/List.java
===================================================================
--- trunk/src/org/fao/geonet/services/user/List.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/user/List.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -27,13 +27,14 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import jeeves.constants.Jeeves;
+
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ProfileManager;
import jeeves.server.ServiceConfig;
import jeeves.server.UserSession;
import jeeves.server.context.ServiceContext;
+
import org.fao.geonet.constants.Geonet;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/user/Update.java
===================================================================
--- trunk/src/org/fao/geonet/services/user/Update.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/user/Update.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,13 +24,14 @@
package org.fao.geonet.services.user;
import java.util.ArrayList;
-import java.util.Vector;
+
import jeeves.constants.Jeeves;
import jeeves.interfaces.Service;
import jeeves.resources.dbms.Dbms;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Util;
+
import org.fao.geonet.constants.Geonet;
import org.fao.geonet.constants.Params;
import org.jdom.Element;
Modified: trunk/src/org/fao/geonet/services/util/z3950/GNSearchTask.java
===================================================================
--- trunk/src/org/fao/geonet/services/util/z3950/GNSearchTask.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/util/z3950/GNSearchTask.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,6 +23,26 @@
package org.fao.geonet.services.util.z3950;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Observer;
+import java.util.Properties;
+import java.util.Stack;
+
+import jeeves.server.ServiceConfig;
+import jeeves.server.context.ServiceContext;
+import jeeves.utils.Log;
+import jeeves.utils.Xml;
+
+import org.fao.geonet.GeonetContext;
+import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.kernel.search.MetaSearcher;
+import org.fao.geonet.kernel.search.SearchManager;
+import org.jdom.Attribute;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.output.DOMOutputter;
+
import com.k_int.IR.AsynchronousEnumeration;
import com.k_int.IR.DefaultSourceEnumeration;
import com.k_int.IR.IFSNotificationTarget;
@@ -42,24 +62,6 @@
import com.k_int.util.RPNQueryRep.QueryNode;
import com.k_int.util.RPNQueryRep.QueryNodeVisitor;
import com.k_int.util.RPNQueryRep.RootNode;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Observer;
-import java.util.Properties;
-import java.util.Stack;
-import jeeves.server.ServiceConfig;
-import jeeves.server.context.ServiceContext;
-import jeeves.utils.Log;
-import jeeves.utils.Xml;
-import org.fao.geonet.GeonetContext;
-import org.fao.geonet.constants.Edit;
-import org.fao.geonet.constants.Geonet;
-import org.fao.geonet.kernel.search.MetaSearcher;
-import org.fao.geonet.kernel.search.SearchManager;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.output.DOMOutputter;
//=============================================================================
Modified: trunk/src/org/fao/geonet/services/util/z3950/GNSearchable.java
===================================================================
--- trunk/src/org/fao/geonet/services/util/z3950/GNSearchable.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/util/z3950/GNSearchable.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,16 +23,22 @@
package org.fao.geonet.services.util.z3950;
+import java.util.Observer;
+import java.util.Properties;
+
+import javax.naming.Context;
+
import jeeves.server.context.ServiceContext;
-import jeeves.server.UserSession;
-import jeeves.interfaces.Logger;
-import java.util.*;
-import javax.naming.*;
+import com.k_int.IR.IRQuery;
+import com.k_int.IR.ScanInformation;
+import com.k_int.IR.ScanRequestInfo;
+import com.k_int.IR.Scanable;
+import com.k_int.IR.SearchTask;
+import com.k_int.IR.Searchable;
+import com.k_int.util.LoggingFacade.LogContextFactory;
+import com.k_int.util.LoggingFacade.LoggingContext;
-import com.k_int.IR.*;
-import com.k_int.util.LoggingFacade.*;
-
//=============================================================================
public class GNSearchable implements Searchable, Scanable // RGFIX: should I implement Scanable?
Modified: trunk/src/org/fao/geonet/services/util/z3950/Server.java
===================================================================
--- trunk/src/org/fao/geonet/services/util/z3950/Server.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/services/util/z3950/Server.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,20 +23,19 @@
package org.fao.geonet.services.util.z3950;
-import com.k_int.z3950.server.ZServer;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Properties;
+
import jeeves.constants.Jeeves;
-import jeeves.resources.dbms.Dbms;
import jeeves.server.context.ServiceContext;
import jeeves.utils.Xml;
-import org.fao.geonet.GeonetContext;
-import org.fao.geonet.constants.Geonet;
-import org.fao.geonet.kernel.setting.SettingManager;
+
import org.jdom.Document;
import org.jdom.Element;
+import com.k_int.z3950.server.ZServer;
+
//=============================================================================
/** Z3950 server
Modified: trunk/src/org/fao/geonet/util/ISODate.java
===================================================================
--- trunk/src/org/fao/geonet/util/ISODate.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/fao/geonet/util/ISODate.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -28,10 +28,6 @@
package org.fao.geonet.util;
import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.StringTokenizer;
-import java.util.TimeZone;
//==============================================================================
Modified: trunk/src/org/wfp/vam/intermap/kernel/Geonet.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/Geonet.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/wfp/vam/intermap/kernel/Geonet.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -25,18 +25,17 @@
package org.wfp.vam.intermap.kernel;
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.net.MalformedURLException;
-import org.jdom.*;
-
-import org.wfp.vam.intermap.http.ConcurrentHTTPTransactionHandler;
-import org.wfp.vam.intermap.http.cache.HttpGetFileCache;
import jeeves.utils.Xml;
-import java.util.Hashtable;
-import org.apache.commons.httpclient.*;
-import org.apache.commons.httpclient.methods.*;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.cookie.CookiePolicy;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.jdom.Element;
public class Geonet {
Modified: trunk/src/org/wfp/vam/intermap/kernel/GlobalTempFiles.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/GlobalTempFiles.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/wfp/vam/intermap/kernel/GlobalTempFiles.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -24,7 +24,6 @@
package org.wfp.vam.intermap.kernel;
-import java.io.File;
public class GlobalTempFiles extends TempFiles
{
Modified: trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageMerger.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -29,29 +29,33 @@
package org.wfp.vam.intermap.kernel.map.images;
-import Acme.JPM.Encoders.GifEncoder;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-import com.sun.media.jai.codec.ImageCodec;
-import com.sun.media.jai.codec.PNGEncodeParam;
-import com.sun.media.jai.codecimpl.PNGCodec;
-import com.sun.media.jai.codecimpl.PNGImageEncoder;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.List;
import java.util.Vector;
+
import javax.swing.ImageIcon;
-import org.wfp.vam.intermap.Constants;
+
import jeeves.utils.Log;
+import org.wfp.vam.intermap.Constants;
+
+import Acme.JPM.Encoders.GifEncoder;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
+import com.sun.media.jai.codec.ImageCodec;
+import com.sun.media.jai.codec.PNGEncodeParam;
+import com.sun.media.jai.codecimpl.PNGCodec;
+import com.sun.media.jai.codecimpl.PNGImageEncoder;
+
public class ImageMerger {
static public final int JPG = 0;
static public final int PNG = 1;
Modified: trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageUtils.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageUtils.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/wfp/vam/intermap/kernel/map/images/ImageUtils.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,11 +23,11 @@
package org.wfp.vam.intermap.kernel.map.images;
-import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.image.BufferedImage;
+
import javax.swing.ImageIcon;
public class ImageUtils
Modified: trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/arcims/ArcIMSService.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/arcims/ArcIMSService.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/arcims/ArcIMSService.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import jeeves.utils.Xml;
+
import org.jdom.Element;
import org.wfp.vam.intermap.kernel.map.mapServices.BoundingBox;
import org.wfp.vam.intermap.kernel.map.mapServices.MapService;
Modified: trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/wms/WmsService.java
===================================================================
--- trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/wms/WmsService.java 2008-08-17 00:39:53 UTC (rev 1481)
+++ trunk/src/org/wfp/vam/intermap/kernel/map/mapServices/wms/WmsService.java 2008-08-20 11:40:32 UTC (rev 1482)
@@ -23,26 +23,30 @@
package org.wfp.vam.intermap.kernel.map.mapServices.wms;
-import org.wfp.vam.intermap.kernel.map.mapServices.wms.schema.type.*;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.jdom.CDATA;
+import jeeves.utils.Log;
+
import org.jdom.Element;
import org.jdom.Text;
+import org.wfp.vam.intermap.Constants;
import org.wfp.vam.intermap.kernel.map.mapServices.BoundingBox;
-import org.wfp.vam.intermap.kernel.map.mapServices.HttpClient;
import org.wfp.vam.intermap.kernel.map.mapServices.MapService;
import org.wfp.vam.intermap.kern...
[truncated message content] |