Initial commit of GR3, probably very broken. I'll move to GIT soon, p…

…romise :-)

build.xml

@@ -294,13 +294,6 @@ tofile="${install}/staging/GalleryRemote.${version}.Win32.NoVM.exe"/>
   <move file="${install}/Java/InstallGalleryRemote.jar" tofile="${install}/staging/GalleryRemote.${version}.jar"/>
  </target>
 
- <target name="post" description="Posts ChangeLog to menalto.com">
-  <taskdef name="postchangelog"
-   classpath="GalleryRemote.jar"
-   classname="com.gallery.GalleryRemote.util.PostChangeLog"/>
-  <postchangelog/>
- </target>
-
  <target name="create_keystore" description="Creates a self-signed certificate">
   <exec executable="keytool">
    <arg line="-genkey -keyalg RSA -alias gallery -dname &quot;CN=gallery.sourceforge.net, OU=Gallery, O=Gallery, L=Menlo Park, ST=California, C=US&quot; -keypass gallery -storepass gallery" />
@@ -317,26 +310,6 @@ tofile="${install}/staging/GalleryRemote.${version}.Win32.NoVM.exe"/>
   description="Run all the tasks for a nightly build" />
 
 
- <!-- SaverBeans screensaver -->
-  <target name="sbproperties">
-    <property file="defaults.properties"/>
-
-    <property name="sbbuild" value="build/sb" />
-
-    <property name="screensaver" value="Gallery" />
-    <property name="screensaverez" value="Gallery" />
-    <property name="screensavershort" value="gallery" />
-    <property name="screensavershortfull" value="gallery_screensaver" />
-    <property name="screensaver.class"
-        value="com.gallery.GalleryRemote.GRScreenSaver" />
-
-    <!-- Values for the Windows installer -->
-    <property name="productName" value="Gallery Remote Screensaver" />
-    <property name="productVersion" value="${version}" />
-    <property name="productPublisher" value="The Gallery project" />
-    <property name="productWebSite" value="http://gallery.sf.net/" />
-  </target>
-
   <target name="sbcheck-nsis" description="Check if NSIS is present">
     <fail unless="nsis.path">
       Property nsis.path not found.  Please copy

com/gallery/GalleryRemote/CoreUtils.java

@@ -195,8 +195,8 @@ public Component getListCellRendererComponent(
 						}
 					}
 
-					if (p.getCaption() != null && getIcon() != null) {
-						text.append("<p><font color=\"gray\">").append(p.getEscapedCaption()).append("</font></p>");
+					if (p.getDescription() != null && getIcon() != null) {
+						text.append("<p><font color=\"gray\">").append(p.getEscapedDescription()).append("</font></p>");
 					}
 
 					text.append("</html>");

com/gallery/GalleryRemote/GRApplet.java

@@ -10,9 +10,6 @@
 import java.net.MalformedURLException;
 import java.util.Locale;
 
-import HTTPClient.CookieModule;
-import HTTPClient.Cookie;
-
 /**
  * Created by IntelliJ IDEA.
  * User: paour
@@ -202,7 +199,7 @@ protected AppletInfo getGRAppletInfo() {
 		if (urlFull == null) {
 			// old versions of Gallery, or bad urlFull
 			info.gallery.setType(Gallery.TYPE_STANDALONE);
-			info.gallery.setStUrlString(url);
+			info.gallery.setUrlString(url);
 		}
 
 		info.gallery.setUserAgent(userAgent);
@@ -216,7 +213,7 @@ protected AppletInfo getGRAppletInfo() {
 		}
 		info.slideshowFrom = slideshowFrom;
 
-		CookieModule.discardAllCookies();
+		/*CookieModule.discardAllCookies();
 		if (cookieName != null) {
 			Cookie cookie = new Cookie(cookieName, cookieValue, cookieDomain, cookiePath, null, false);
 			Log.log(Log.LEVEL_TRACE, MODULE, "Adding cookie: " + cookie);
@@ -231,7 +228,7 @@ protected AppletInfo getGRAppletInfo() {
 			Log.log(Log.LEVEL_TRACE, MODULE, "Adding cookie: " + cookie1);
 			CookieModule.addCookie(cookie1);
 			cookieNum++;
-		}
+		}*/
 
 		return info;
 	}

com/gallery/GalleryRemote/GRAppletMini.java

@@ -7,7 +7,6 @@
 import com.gallery.GalleryRemote.util.GRI18n;
 import com.gallery.GalleryRemote.util.DialogUtil;
 import com.gallery.GalleryRemote.prefs.PreferenceNames;
-import com.gallery.GalleryRemote.util.OsShutdown;
 
 import javax.swing.*;
 import javax.swing.event.DocumentListener;
@@ -181,23 +180,6 @@ public void setInProgress(boolean inProgress) {
 		jThumbnails.setEnabled(!inProgress);
 
 		this.inProgress = inProgress;
-
-		if (! inProgress && hasHadPictures) {
-			// probably finished uploading...
-			try {
-				// no update for G2 and for embedded applets (non-embedded applets are TYPE_STANDALONE)
-				if (! (gallery.getComm(null) instanceof GalleryComm2_5) && gallery.getType() != Gallery.TYPE_APPLET) {
-					getAppletContext().showDocument(new URL(getCodeBase().toString() + "add_photos_refresh.php"), "hack");
-				}
-
-				// use Java to Javascript scripting
-				g2Feedback("doneUploading", new Object[] {});
-			} catch (MalformedURLException e) {
-				Log.logException(Log.LEVEL_ERROR, MODULE, e);
-			}
-
-			hasHadPictures = false;
-		}
 	}
 
 	public void addPictures(File[] files, int index, boolean select) {
@@ -417,7 +399,7 @@ public void textUpdate(DocumentEvent e) {
 
 		if (p != null) {
 			if (e.getDocument() == jCaption.getDocument()) {
-				p.setCaption(jCaption.getText());
+				p.setDescription(jCaption.getText());
 			} else {
 				Iterator i = jExtrafields.iterator();
 				while (i.hasNext()) {
@@ -449,7 +431,7 @@ public void valueChanged(ListSelectionEvent e) {
 				jExtrafield.setBackground(UIManager.getColor("TextField.inactiveBackground"));
 			}
 		} else {
-			jCaption.setText(p.getCaption());
+			jCaption.setText(p.getDescription());
 			jCaption.setEditable(true);
 			jCaption.setBackground(UIManager.getColor("TextField.background"));