فهرست منبع

removed jre.compilation.profile = J2SE-1.5 from build.properties

Andreas Mülder 10 سال پیش
والد
کامیت
d10f7fe5f0

+ 14 - 14
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/FlowCode.xtend

@@ -38,7 +38,7 @@ class FlowCode {
 		//ERROR: FlowCode for Step '«getClass().name»' not defined
 	'''
 	
-	def dispatch code(StateSwitch it) '''
+	def dispatch CharSequence code(StateSwitch it) '''
 		«IF historyRegion != null»
 			switch(historyVector[«historyRegion.historyVector.offset»]) {
 		«ELSE»
@@ -55,32 +55,32 @@ class FlowCode {
 		}
 	'''
 	
-	def dispatch code(ScheduleTimeEvent it) '''
+	def dispatch CharSequence code(ScheduleTimeEvent it) '''
 		«stepComment»
 		
 		timer.setTimer(this, «getTimeEvents.indexOf(timeEvent)», «timeValue.code», «IF timeEvent.periodic»true«ELSE»false«ENDIF»);
 	'''
 	
-	def dispatch code(UnscheduleTimeEvent it) '''
+	def dispatch CharSequence code(UnscheduleTimeEvent it) '''
 		«stepComment»
 		timer.unsetTimer(this, «getTimeEvents.indexOf(timeEvent)»);
 	'''
 	
-	def dispatch code(Execution it) {
+	def dispatch CharSequence code(Execution it) {
 		'''
 		«statement.code»;
 		'''
 	}
 	
-	def dispatch code(Call it) '''
+	def dispatch CharSequence code(Call it) '''
 		«step.functionName()»();
 	'''
 	
-	def dispatch code(Sequence it) {
+	def dispatch CharSequence code(Sequence it) {
 		steps.map[code].join('\n')
 	}
 	
-	def dispatch code(Check it) '''
+	def dispatch CharSequence code(Check it) '''
 		«IF this != null»
 			«condition.code()»
 		«ELSE»
@@ -88,7 +88,7 @@ class FlowCode {
  		«ENDIF»
 	'''
 	
-	def dispatch code(CheckRef it) '''
+	def dispatch CharSequence code(CheckRef it) '''
 		«IF check != null»
 			«comment»
 			«check.functionName()»()
@@ -97,11 +97,11 @@ class FlowCode {
 		«ENDIF»
 	'''
 	
-	def dispatch code(Reaction it) {
+	def dispatch CharSequence code(Reaction it) {
 		effect.code
 	}
 	
-	def dispatch code(If it) '''
+	def dispatch CharSequence code(If it) '''
 		«stepComment»
 		if («check.code») { 
 			«thenStep.code»
@@ -113,19 +113,19 @@ class FlowCode {
 		«ENDIF»
 	'''
 	
-	def dispatch code(EnterState it) '''
+	def dispatch CharSequence code(EnterState it) '''
 		«stepComment»
 		nextStateIndex = «state.stateVector.offset»;
 		stateVector[«state.stateVector.offset»] = State.«state.stateName.asEscapedIdentifier»;
 	'''
 	
-	def dispatch code(ExitState it) '''
+	def dispatch CharSequence code(ExitState it) '''
 		«stepComment»
 		nextStateIndex = «state.stateVector.offset»;
 		stateVector[«state.stateVector.offset»] = State.«getNullStateName()»;
 	'''
 	
-	def dispatch code(HistoryEntry it) '''
+	def dispatch CharSequence code(HistoryEntry it) '''
 		«stepComment»
 		if (historyVector[«region.historyVector.offset»] != State.$NullState$) {
 			«historyStep.code»
@@ -134,7 +134,7 @@ class FlowCode {
 		} «ENDIF»
 	'''
 	
-	def dispatch code(SaveHistory it) '''
+	def dispatch CharSequence code(SaveHistory it) '''
 		«stepComment»
 		historyVector[«region.historyVector.offset»] = stateVector[«region.stateVector.offset»];
 	'''

+ 0 - 2
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/Naming.xtend

@@ -19,8 +19,6 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition
 
 class Naming implements JavaKeywords {
 	
-	@Inject extension Navigation
-
 	@Inject extension INamingService namingService;	
 	@Inject StextNameProvider provider;
 	

+ 0 - 1
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/StatemachineInterface.xtend

@@ -143,7 +143,6 @@ class StatemachineInterface {
 		'''
 			«FOR event : scope.eventDefinitions»
 				«IF event.direction == Direction::IN»
-					««« IMPORTANT: An event not specifying a type is regarded to have a void type
 				«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
 						public void raise«event.name.asName»(«event.type.targetLanguageName» value);
 					«ELSE»

+ 2 - 2
plugins/org.yakindu.sct.model.sexec/build.properties

@@ -8,9 +8,9 @@ bin.includes = .,\
                model/,\
                META-INF/,\
                plugin.xml,\
-               .project
+               .project,\
+               plugin.properties
 jars.compile.order = .
-jre.compilation.profile = J2SE-1.5
 output.. = bin/
 source.. = src/,\
 		xtend-gen/

+ 0 - 1
plugins/org.yakindu.sct.model.sgraph.edit/build.properties

@@ -15,5 +15,4 @@ bin.includes = .,\
 jars.compile.order = .
 source.. = src/
 output.. = bin/
-jre.compilation.profile = J2SE-1.5
 src.includes = icons/

+ 0 - 1
plugins/org.yakindu.sct.model.sgraph.ui/build.properties

@@ -2,4 +2,3 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .
-jre.compilation.profile = J2SE-1.5

+ 2 - 2
plugins/org.yakindu.sct.model.sgraph/build.properties

@@ -10,9 +10,9 @@
 bin.includes = .,\
                model/,\
                META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               plugin.properties
 jars.compile.order = .
-jre.compilation.profile = J2SE-1.5
 source.. = src/
 output.. = bin/
 src.excludes = model/

+ 0 - 1
plugins/org.yakindu.sct.model.stext/build.properties

@@ -12,7 +12,6 @@ bin.includes = .,\
                plugin.xml,\
                model/,\
                .project
-jre.compilation.profile = J2SE-1.5
 output.. = bin/
 source.. = src/,\
            src-gen/,\