Skip to content

Persist the sequence number if it changes to the document #1542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laeubi wants to merge 1 commit into from
Closed

Persist the sequence number if it changes to the document #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public class TargetDefinition implements ITargetDefinition {
private TargetFeature[] fFeatures;
private TargetBundle[] fOtherBundles;

private int fSequenceNumber = -1;
private int fSequenceNumber;

/**
* Constructs a target definition based on the given handle.
Expand Down Expand Up @@ -1123,7 +1123,8 @@ public int getSequenceNumber() {
* @return the current sequence number after it has been increased
*/
public int incrementSequenceNumber() {
return ++fSequenceNumber;
setSequenceNumber(getSequenceNumber() + 1);
return getSequenceNumber();
}

/**
Expand All @@ -1132,7 +1133,16 @@ public int incrementSequenceNumber() {
* @param value value to set the sequence number to
*/
void setSequenceNumber(int value) {
fSequenceNumber = value;
if (value != fSequenceNumber) {
fSequenceNumber = value;
if (fRoot != null) {
if (value > 0) {
fRoot.setAttribute(TargetDefinitionPersistenceHelper.ATTR_SEQUENCE_NUMBER, Integer.toString(value));
} else {
fRoot.removeAttribute(TargetDefinitionPersistenceHelper.ATTR_SEQUENCE_NUMBER);
}
}
}
}

private void removeElement(String... childNames) {
Expand Down
16 changes: 9 additions & 7 deletions ....eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence36Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,15 @@ public static void initFromDoc(ITargetDefinition definition, Element root) throw
}
}
}

// Set the sequence number at the very end
String sequenceNumber = root.getAttribute(TargetDefinitionPersistenceHelper.ATTR_SEQUENCE_NUMBER);
try {
((TargetDefinition) definition).setSequenceNumber(Integer.parseInt(sequenceNumber));
} catch (NumberFormatException e) {
((TargetDefinition) definition).setSequenceNumber(0);
if (definition instanceof TargetDefinition impl) {
// Set the sequence number at the very end
String sequenceNumber = root.getAttribute(TargetDefinitionPersistenceHelper.ATTR_SEQUENCE_NUMBER);
try {
if (!sequenceNumber.isBlank()) {
impl.setSequenceNumber(Integer.parseInt(sequenceNumber));
}
} catch (NumberFormatException e) {
}
}
}

Expand Down
16 changes: 9 additions & 7 deletions ....eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPersistence38Helper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,15 @@ public static void initFromDoc(ITargetDefinition definition, Element root) {
}
}
}

// Set the sequence number at the very end
String sequenceNumber = root.getAttribute(TargetDefinitionPersistenceHelper.ATTR_SEQUENCE_NUMBER);
try {
((TargetDefinition) definition).setSequenceNumber(Integer.parseInt(sequenceNumber));
} catch (NumberFormatException e) {
((TargetDefinition) definition).setSequenceNumber(0);
if (definition instanceof TargetDefinition impl) {
// Set the sequence number at the very end
String sequenceNumber = root.getAttribute(TargetDefinitionPersistenceHelper.ATTR_SEQUENCE_NUMBER);
try {
if (!sequenceNumber.isBlank()) {
impl.setSequenceNumber(Integer.parseInt(sequenceNumber));
}
} catch (NumberFormatException e) {
}
}
}

Expand Down
Loading