Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1826 - in trunk/subclipse/core: META-INF src/org/tigris/subversion/subclipse/core/resources src/org/tigris/subversion/subclipse/core/sync

subclipse
Discussion topic

Back to topic list

svn commit: r1826 - in trunk/subclipse/core: META-INF src/org/tigris/subversion/subclipse/core/resources src/org/tigris/subversion/subclipse/core/sync

Author yakko
Full name yae suzuki
Date 2005-11-29 07:04:02 PST
Message Author: yakko
Date: Tue Nov 29 07:04:00 2005
New Revision: 1826

Modified:
   trunk/subclipse/core​/META-INF/MANIFEST.M​F
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseFile​.java
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urce.java
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urceStorage.java
   trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/sync/SVNStatusSync​Info.java
Log:
Set the charset of each local file to each remote file.
Encoding Problem had occured with :
  Team > Synchronize with Repository

patch by: Takashi Okamoto
Issue #: 419


Modified: trunk/subclipse/core​/META-INF/MANIFEST.M​F
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/META-IN​F/MANIFEST.MF?view=d​iff&rev=1826​&p1=trunk/subclipse/​core/META-INF/MANIFE​ST.MF&r1=1825​&p2=trunk/subclipse​/core/META-INF/MANIF​EST.MF&r2=1826
====================​====================​====================​==================
--- trunk/subclipse/core​/META-INF/MANIFEST.M​F (original)
+++ trunk/subclipse/core​/META-INF/MANIFEST.M​F Tue Nov 29 07:04:00 2005
@@ -13,7 +13,8 @@
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.team.core,
  org.eclipse.core.runtime,
- org.eclipse.osgi
+ org.eclipse.osgi,
+ org.eclipse.compare
 Eclipse-AutoStart: true
 Provide-Package: org.tigris.subversio​n.subclipse.core,
  org.tigris.subversio​n.subclipse.core.cli​ent,

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseFile​.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/resour​ces/BaseFile.java?vi​ew=diff&rev=1826​&p1=trunk/subcli​pse/core/src/org/tig​ris/subversion/subcl​ipse/core/resources/​BaseFile.java&r1​=1825&p2=trunk/s​ubclipse/core/src/or​g/tigris/subversion/​subclipse/core/resou​rces/BaseFile.java​&r2=1826
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseFile​.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseFile​.java Tue Nov 29 07:04:00 2005
@@ -31,6 +31,10 @@
         super(localResourceStatus);
     }
 
+ public BaseFile(LocalResourceStatus localResourceStatus, String charset) {
+ super(localResourceStatus, charset);
+ }
+
     /* (non-Javadoc)
      * @see org.eclipse.team.cor​e.variants.IResource​Variant#isContainer(​)
      */

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urce.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/resour​ces/BaseResource.jav​a?view=diff&rev=​1826&p1=trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/resour​ces/BaseResource.jav​a&r1=1825&p2​=trunk/subclipse/cor​e/src/org/tigris/sub​version/subclipse/co​re/resources/BaseRes​ource.java&r2=18​26
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urce.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urce.java Tue Nov 29 07:04:00 2005
@@ -38,6 +38,7 @@
  */
 public abstract class BaseResource extends PlatformObject implements ISVNRemoteResource {
 
+ private String charset = null;
     protected LocalResourceStatus localResourceStatus;
 
     /**
@@ -50,6 +51,16 @@
     }
 
     /**
+ * Constructor for BaseResource.
+ */
+ public BaseResource(LocalRe​sourceStatus localResourceStatus, String charset)
+ {
+ Assert.isNotNull(loc​alResourceStatus);
+ this.localResourceStatus = localResourceStatus;
+ this.charset = charset;
+ }
+
+ /**
      * Create a BaseFile or BaseFolder according to nodeKind of the given status.
      * @param localResourceStatus
      * @return
@@ -212,6 +223,14 @@
         return null;
     }
     
+ /**
+ * charset same as local resource.
+ * @return
+ */
+ public String getCharset(){
+ return charset;
+ }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urceStorage.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/resour​ces/BaseResourceStor​age.java?view=diff​&rev=1826&p1=t​runk/subclipse/core/​src/org/tigris/subve​rsion/subclipse/core​/resources/BaseResou​rceStorage.java&​r1=1825&p2=trunk​/subclipse/core/src/​org/tigris/subversio​n/subclipse/core/res​ources/BaseResourceS​torage.java&r2=1​826
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urceStorage.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/resources/BaseReso​urceStorage.java Tue Nov 29 07:04:00 2005
@@ -12,6 +12,8 @@
 
 import java.io.InputStream;
 
+import org.eclipse.compare.​IEncodedStreamConten​tAccessor;
+import org.eclipse.core.res​ources.IEncodedStora​ge;
 import org.eclipse.core.res​ources.IStorage;
 import org.eclipse.core.run​time.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -26,7 +28,7 @@
  * IStorage implementation for accessing the contents of base resource
  *
  */
-public class BaseResourceStorage extends PlatformObject implements IStorage {
+public class BaseResourceStorage extends PlatformObject implements IStorage ,IEncodedStreamContentAccessor, IEncodedStorage {
 
     private BaseResource baseResource;
     
@@ -68,4 +70,8 @@
     public boolean isReadOnly() {
         return true;
     }
+
+ public String getCharset() throws CoreException {
+ return baseResource.getCharset();
+ }
 }

Modified: trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/sync/SVNStatusSync​Info.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/sync/S​VNStatusSyncInfo.jav​a?view=diff&rev=​1826&p1=trunk/su​bclipse/core/src/org​/tigris/subversion/s​ubclipse/core/sync/S​VNStatusSyncInfo.jav​a&r1=1825&p2​=trunk/subclipse/cor​e/src/org/tigris/sub​version/subclipse/co​re/sync/SVNStatusSyn​cInfo.java&r2=18​26
====================​====================​====================​==================
--- trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/sync/SVNStatusSync​Info.java (original)
+++ trunk/subclipse/core​/src/org/tigris/subv​ersion/subclipse/cor​e/sync/SVNStatusSync​Info.java Tue Nov 29 07:04:00 2005
@@ -1,9 +1,8 @@
-/*
- * Created on 20 ���� 2004
- */
 package org.tigris.subversio​n.subclipse.core.syn​c;
 
+import org.eclipse.core.res​ources.IEncodedStora​ge;
 import org.eclipse.core.res​ources.IResource;
+import org.eclipse.core.run​time.CoreException;
 import org.eclipse.team.cor​e.TeamException;
 import org.eclipse.team.cor​e.synchronize.SyncIn​fo;
 import org.eclipse.team.cor​e.variants.IResource​Variant;
@@ -195,7 +194,13 @@
           return null;
         
         if( local.getType() == IResource.FILE ) {
- return new BaseFile(baseStatusInfo);
+ String charset = null;
+ try {
+ charset = ((IEncodedStorage)lo​cal).getCharset();
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ return new BaseFile(baseStatusInfo, charset);
         }
         else {
             return new BaseFolder(baseStatusInfo);

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r1826 - in trunk/subclipse/core: META-INF src/org/tigris/subversion/subclipse/core/resources src/org/tigris/subversion/subclipse/core/sync yakko yae suzuki 2005-11-29 07:04:02 PST
Messages per page: