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

Issue #686 Fixed #717

Merged
merged 7 commits into from
Feb 8, 2016
Merged

Issue #686 Fixed #717

merged 7 commits into from
Feb 8, 2016

Conversation

Shikib
Copy link
Member

@Shikib Shikib commented Feb 8, 2016

Fixed all of the false positive issues with warning 1012 (invalid code injection). Doesn't falsely generate a warning message for situations where a class is attempting to inject into an extended method.

@vahdat-ab
Copy link
Member

@Shikib
I wonder if you get the following warnings as well?
[java] Warning 1012 on line 490 of file "Umple.ump":
[java] Method 'setPackageName' cannot be found. Injection was ignored.
[java] Warning 1012 on line 491 of file "Umple.ump":
[java] Method 'addDepend' cannot be found. Injection was ignored.
[java] Warning 1012 on line 563 of file "Umple.ump":
[java] Method 'addDepend' cannot be found. Injection was ignored.
[java] Warning 1012 on line 565 of file "Umple.ump":
[java] Method 'setImmutable' cannot be found. Injection was ignored.
[java] Warning 1012 on line 571 of file "Umple.ump":
[java] Method 'addStateMachine' cannot be found. Injection was ignored.
[java] Warning 1012 on line 643 of file "Umple.ump":
[java] Method 'setImmutable' cannot be found. Injection was ignored.
[java] Warning 1012 on line 647 of file "Umple.ump":
[java] Method 'setExtendsTrait' cannot be found. Injection was ignored.
[java] Warning 1012 on line 649 of file "Umple.ump":
[java] Method 'addStateMachine' cannot be found. Injection was ignored.
[java] Warning 1012 on line 762 of file "Umple.ump":
[java] Method 'setType' cannot be found. Injection was ignored.
[java] Warning 1012 on line 763 of file "Umple.ump":
[java] Method 'setType' cannot be found. Injection was ignored.
[java] Warning 1012 on line 891 of file "Umple.ump":
[java] Method 'setUmpleClass' cannot be found. Injection was ignored.
[java] Warning 1012 on line 60 of file "Structure.ump":
[java] Method 'setUmpleClass' cannot be found. Injection was ignored.

@Shikib
Copy link
Member Author

Shikib commented Feb 8, 2016

The previously compiled jar isn't what's used during the umpleSelf section of the build. To see what the build would look like after the merge, what you should do is java -jar dist/umple.jar cruise.umple/src/Master.ump. During a full build, I believe the previously downloaded version of umple is used.

@TimLethbridge
Copy link
Member

Yes exactly; you won't see the effect of this PR until it is merged unless you prevent the built jar from being downloaded during the build.

@vahdat-ab
Copy link
Member

so I'm merging

vahdat-ab added a commit that referenced this pull request Feb 8, 2016
@vahdat-ab vahdat-ab merged commit e8cc020 into umple:master Feb 8, 2016
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.

3 participants