Author: sshyrkov
Date: Mon Nov 19 16:40:13 2007
New Revision: 19225
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19225&repname=
=3Djahia
Log:
Cleanup deprecated API calls, unused local variables. Removed unused import=
statements.
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/file=
s/JahiaTextFileBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/file=
s/JahiaTextFileService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/home=
pages/JahiaHomepage.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/home=
pages/JahiaHomepagesBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
cache/UserAgentGroup.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/HtmlEditor.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/HtmlEditorsBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/JahiaHtmlEditor.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/JahiaHtmlEditorsFactory.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/files/JahiaTextFileBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/files/JahiaTextFileBaseServic=
e.java&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/file=
s/JahiaTextFileBaseService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/file=
s/JahiaTextFileBaseService.java Mon Nov 19 16:40:13 2007
@@ -28,12 +28,9 @@
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.cache.Cache;
-import org.jahia.services.cache.CacheFactory;
import org.jahia.services.cache.CacheService;
-import org.jahia.settings.SettingsBean;
import org.jahia.utils.FileUtils;
import org.jahia.utils.JahiaTools;
-import org.jahia.registries.ServicesRegistry;
=
=
public class JahiaTextFileBaseService extends JahiaTextFileService {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/files/JahiaTextFileService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/files/JahiaTextFileService.ja=
va&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/file=
s/JahiaTextFileService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/file=
s/JahiaTextFileService.java Mon Nov 19 16:40:13 2007
@@ -33,10 +33,8 @@
import java.io.IOException;
=
import org.jahia.exceptions.JahiaException;
-import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.services.JahiaService;
import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.settings.SettingsBean;
=
/**
* <p>Title: Jahia text file service</p>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/homepages/JahiaHomepage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/homepages/JahiaHomepage.java&=
rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/home=
pages/JahiaHomepage.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/home=
pages/JahiaHomepage.java Mon Nov 19 16:40:13 2007
@@ -50,11 +50,6 @@
protected Map props =3D new Hashtable();
protected JahiaHomepageManager manager;
=
- /**
- * Constructor
- */
- private JahiaHomepage(){}
-
/**
* Constructor, subclass must have exact constructor signature.
*
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/homepages/JahiaHomepagesBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/homepages/JahiaHomepagesBaseS=
ervice.java&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/home=
pages/JahiaHomepagesBaseService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/home=
pages/JahiaHomepagesBaseService.java Mon Nov 19 16:40:13 2007
@@ -23,13 +23,9 @@
=
import org.jahia.data.JahiaDOMObject;
import org.jahia.exceptions.JahiaException;
-import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.hibernate.manager.JahiaHomepageManager;
-import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.sites.JahiaSite;
-import org.jahia.settings.SettingsBean;
-
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmlcache/UserAgentGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmlcache/UserAgentGroup.java=
&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
cache/UserAgentGroup.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
cache/UserAgentGroup.java Mon Nov 19 16:40:13 2007
@@ -25,12 +25,9 @@
* @version 1.0
*/
=
-import java.util.Enumeration;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
-import java.util.Vector;
-
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
import java.util.ArrayList;
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmleditors/HtmlEditor.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmleditors/HtmlEditor.java&r=
ev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/HtmlEditor.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/HtmlEditor.java Mon Nov 19 16:40:13 2007
@@ -18,8 +18,6 @@
=
package org.jahia.services.htmleditors;
=
-import java.util.Hashtable;
-
/**
* <p>Title: HtmlEditor Interface</p>
* <p>Description: Interface for Html Editor</p>
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmleditors/HtmlEditorsBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmleditors/HtmlEditorsBaseSe=
rvice.java&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/HtmlEditorsBaseService.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/HtmlEditorsBaseService.java Mon Nov 19 16:40:13 2007
@@ -25,7 +25,6 @@
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.sites.JahiaSite;
-import org.jahia.settings.SettingsBean;
=
=
/**
@@ -35,13 +34,8 @@
*/
public class HtmlEditorsBaseService extends HtmlEditorsService
{
- private static org.apache.log4j.Logger logger =3D
- org.apache.log4j.Logger.getLogger (HtmlEditorsBaseService.clas=
s);
-
static private HtmlEditorsBaseService instance =3D null;
private HtmlEditorsFactory htmlEditorsFactory =3D null;
- private String htmlEditorsRootDiskPath =3D "";
- private String htmlEditorsContextPath =3D "";
private String htmlEditorsConfigFile =3D "";
=
protected HtmlEditorsBaseService() {
@@ -57,8 +51,6 @@
public void start()
throws JahiaInitializationException {
=
- this.htmlEditorsRootDiskPath =3D settingsBean.getJahiaHtmlEditors=
DiskPath();
- this.htmlEditorsContextPath =3D settingsBean.getHtmlEditorsContex=
t();
StringBuffer buff =3D new StringBuffer(settingsBean.getJahiaEtcDi=
skPath());
buff.append(File.separator);
buff.append("htmleditors");
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmleditors/JahiaHtmlEditor.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmleditors/JahiaHtmlEditor.j=
ava&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/JahiaHtmlEditor.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/JahiaHtmlEditor.java Mon Nov 19 16:40:13 2007
@@ -18,7 +18,6 @@
=
package org.jahia.services.htmleditors;
=
-import java.util.Hashtable;
import org.jahia.registries.ServicesRegistry;
import java.io.Serializable;
=
@@ -43,9 +42,6 @@
private String baseDirectory;
private boolean enableCSS =3D false;
private int rank;
- private boolean fullScreenOnly =3D false;
- private boolean fullScreenCapable =3D false;
- private Hashtable cssList =3D new Hashtable();
=
public JahiaHtmlEditor( String id,
String displayName,
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/htmleditors/JahiaHtmlEditorsFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/htmleditors/JahiaHtmlEditorsF=
actory.java&rev=3D19225&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/JahiaHtmlEditorsFactory.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/html=
editors/JahiaHtmlEditorsFactory.java Mon Nov 19 16:40:13 2007
@@ -17,7 +17,6 @@
*///
package org.jahia.services.htmleditors;
=
-import java.util.Hashtable;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Vector;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
