Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrganor2008-05-12 03:03:59 -0400
committerrganor2008-05-12 03:03:59 -0400
commit7b31bbf352ddf5aa7d4b9ec13a6c806a1c52056f (patch)
tree94deb7fef9c93d531961b1011885d38051b33f1b
parentc906b4ea7319717fb4680dc753173dbd7abfb8f6 (diff)
downloadorg.eclipse.pdt-7b31bbf352ddf5aa7d4b9ec13a6c806a1c52056f.tar.gz
org.eclipse.pdt-7b31bbf352ddf5aa7d4b9ec13a6c806a1c52056f.tar.xz
org.eclipse.pdt-7b31bbf352ddf5aa7d4b9ec13a6c806a1c52056f.zip
update to be compatible with Eclipse 3.4 M7 stream
-rw-r--r--plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/documentModel/partitioner/PHPStructuredTextPartitioner.java2
-rw-r--r--plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/resources/ExternalFileWrapper.java12
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/documentModel/partitioner/PHPStructuredTextPartitioner.java b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/documentModel/partitioner/PHPStructuredTextPartitioner.java
index cabc9372f..c286af793 100644
--- a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/documentModel/partitioner/PHPStructuredTextPartitioner.java
+++ b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/documentModel/partitioner/PHPStructuredTextPartitioner.java
@@ -62,7 +62,7 @@ public class PHPStructuredTextPartitioner extends StructuredTextPartitionerForHT
// in case we are in the end of document
// we return the partition of last region
int docLength = fStructuredDocument.getLength();
- if (offset == docLength) {
+ if (offset == docLength && offset > 0) {
return super.getPartition(offset - 1);
}
return super.getPartition(offset);
diff --git a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/resources/ExternalFileWrapper.java b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/resources/ExternalFileWrapper.java
index 45eedfc0e..c6f4228b1 100644
--- a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/resources/ExternalFileWrapper.java
+++ b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/resources/ExternalFileWrapper.java
@@ -16,6 +16,7 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.Reader;
import java.net.URI;
+import java.util.Map;
import org.eclipse.core.internal.resources.ICoreConstants;
import org.eclipse.core.internal.resources.WorkspaceRoot;
@@ -1114,4 +1115,15 @@ public class ExternalFileWrapper implements IFile, IAdaptable, IResource,
public void setHidden(boolean isHidden) throws CoreException {
file.setHidden(isHidden);
}
+
+ /**
+ * TODO: validate with Yaron about the new changes
+ */
+ public Map getPersistentProperties() throws CoreException {
+ return file.getPersistentProperties();
+ }
+
+ public Map getSessionProperties() throws CoreException {
+ return file.getSessionProperties();
+ }
}

Back to the top