Attachment 32903 Details for Bug 122885 – Suppress templates from comparison and state serialization (exploratory)

[patch] Suppress templates from comparison and state serialization (exploratory)

org.eclipse.jdt.core_whole_01_HEAD.txt (text/plain), 2.73 KB, created by Maxime Daniel

on 2006-01-12 06:42:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Daniel

Created: 2006-01-12 06:42:27 EST

Size: 2.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/builder/State.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java,v
>retrieving revision 1.53
>diff -u -r1.53 State.java
>--- model/org/eclipse/jdt/internal/core/builder/State.java	5 Jan 2006 16:59:12 -0000	1.53
>+++ model/org/eclipse/jdt/internal/core/builder/State.java	12 Jan 2006 11:35:27 -0000
>@@ -43,7 +43,7 @@
> private StringSet structurallyChangedTypes;
> public static int MaxStructurallyChangedTypes = 100; // keep track of ? structurally changed types, otherwise consider all to be changed
> 
>-public static final byte VERSION = 0x0015; // changed access rule presentation
>+public static final byte VERSION = 0x0016; // removed templates from access rules set
> 
> static final byte SOURCE_FOLDER = 1;
> static final byte BINARY_FOLDER = 2;
>@@ -330,12 +330,7 @@
> 		int problemId = in.readInt();
> 		accessRules[i] = new ClasspathAccessRule(pattern, problemId);
> 	}
>-	String[] messageTemplates = new String[AccessRuleSet.MESSAGE_TEMPLATES_LENGTH];
>-	for (int i = 0; i < AccessRuleSet.MESSAGE_TEMPLATES_LENGTH; i++) {
>-		messageTemplates[i] = in.readUTF();
>-	}
> 	AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules);
>-	accessRuleSet.messageTemplates = messageTemplates;
> 	return accessRuleSet;
> }
> 
>@@ -604,8 +599,6 @@
> 				writeName(accessRule.pattern, out);
> 				out.writeInt(accessRule.problemId);
> 			}
>-			for (int i = 0; i < AccessRuleSet.MESSAGE_TEMPLATES_LENGTH; i++)
>-				out.writeUTF(accessRuleSet.messageTemplates[i]);
> 		}
> 	}
> }
>Index: compiler/org/eclipse/jdt/internal/compiler/env/AccessRuleSet.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/AccessRuleSet.java,v
>retrieving revision 1.9
>diff -u -r1.9 AccessRuleSet.java
>--- compiler/org/eclipse/jdt/internal/compiler/env/AccessRuleSet.java	4 Jan 2006 13:31:52 -0000	1.9
>+++ compiler/org/eclipse/jdt/internal/compiler/env/AccessRuleSet.java	12 Jan 2006 11:35:26 -0000
>@@ -53,12 +53,6 @@
> 		if (!(object instanceof AccessRuleSet))
> 			return false;
> 		AccessRuleSet otherRuleSet = (AccessRuleSet) object;
>-		if (this.messageTemplates.length != MESSAGE_TEMPLATES_LENGTH ||
>-				otherRuleSet.messageTemplates.length != MESSAGE_TEMPLATES_LENGTH)
>-			return false; // guard
>-		for (int i = 0; i < MESSAGE_TEMPLATES_LENGTH; i++) 
>-			if (!this.messageTemplates[i].equals(otherRuleSet.messageTemplates[i])) 
>-				return false;
> 		int rulesLength = this.accessRules.length;
> 		if (rulesLength != otherRuleSet.accessRules.length) return false;
> 		for (int i = 0; i < rulesLength; i++)

Actions: View | Diff

Attachments on bug 122885: 32903 | 65148 | 74675 | 79952 | 79953 | 79955