Enum values in switch()

[fbaro]

When generating a switch on an enum, the case labels should not include the enum class name, but only the enum label.

    public enum E { A, B }
    ...
    switch (e) {
        case A: // Not case E.A
        ...
    }

It's an old issue with the original codemodel.
Unfortunately, I have no idea how to fix this with the generate() method architecture. I solved it on my local codemodel copy with an ugly instanceof in JCase.

[phax]

Being on vacation. Fixing this afterwards. Should be easy.

[phax]

Please verify if it works for you as well. I remove emitting the type in the JEnumConstant class only.

[mcoblenz]

Unfortunately this change breaks code generation in my project because it results in emitting an unscoped enum name in a case where the fully-qualified name is required. The generated code looks like this:

public class Simple4 {
  private State_Simple4 __state;

 private void __conserveFields(State_Simple4 nextState) {
        if (getState() == S1) { // need to be State_Simple4.S1
           …
        }
    }
    public enum State_Simple4 {
        S1,
        S2;
    }
}

[phax]

Agreed - had the same issue myself in other scenarios.

[phax]

Do you need it in the 2.8.x series, or can you use Java 8 with upcoming V3?

[mcoblenz]

V3 is probably fine. For now I'm using a locally-modified V3 and it seems to work okay otherwise. Thanks!

[phax]

So you basically reverted the changes mentioned in the above referenced commit - right?

[mcoblenz]

Yes, though I realize that's not the right fix. Presumably we need to check to see what scope the enum was defined in and emit the right thing?

[phax]

Yep :)