Skip to content
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.

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

Allow creating classifier when setting subcomponent or feature classifier #1944

Merged

Conversation

philip-alldredge
Copy link
Collaborator

1198 create classifier when setting classifier

Closes #1198

1198_create_classifier_when_setting_classifier

Conflicts:
	ge/org.osate.ge/src/org/osate/ge/internal/ui/properties/SetFeatureClassifierPropertySection.java
	ge/org.osate.ge/src/org/osate/ge/internal/ui/properties/SetSubcomponentClassifierPropertySection.java
@lwrage
Copy link
Contributor

lwrage commented Aug 14, 2019

The code uses Optional.isEmpty(). This doesn't exist in Java 8: org/osate/ge/internal/util/EditingUtil.java:[240]

@philip-alldredge
Copy link
Collaborator Author

Fixed and I've updated my dev environment to ensure it's using JDK 8.

@philip-alldredge
Copy link
Collaborator Author

@RyanMcilnay fixed issue that you raised and merged master into the branch.

Copy link
Contributor

@RyanMcilnay RyanMcilnay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@@ -61,6 +63,18 @@ public AgeBusinessObjectSelection(final Collection<? extends BusinessObjectConte
modify(boc -> c.cast(boc.getBusinessObject()), (bo, boc) -> modifier.accept(bo));
}

@Override
public <T extends EObject, O> void modifyWithOperation(final OperationBuilder<O> opBuilder, Class<T> c,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add final to parameters

@philip-alldredge philip-alldredge merged commit d7d1296 into master Aug 14, 2019
@philip-alldredge philip-alldredge deleted the 1198_create_classifier_when_setting_classifier branch August 14, 2019 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow creating classifier when setting classifier
3 participants