Rewrite PropertyMetadata to Kotlin

This commit is contained in:
Alexander Udalov
2013-12-19 20:26:19 +04:00
parent bcfc67a3a6
commit a59565bfa8
6 changed files with 26 additions and 58 deletions
+2
View File
@@ -515,7 +515,9 @@
<target name="runtime">
<cleandir dir="${output}/classes/runtime"/>
<javac2 destdir="${output}/classes/runtime" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false" source="${java.target}" target="${java.target}">
<withKotlin/>
<src path="${basedir}/runtime/src"/>
<src path="${basedir}/runtime/kt"/>
</javac2>
<cleandir dir="${output}/classes/stdlib"/>
+16
View File
@@ -33,6 +33,7 @@
<delete dir="${basedir}/target/copied-sources" failonerror="false" />
<copy todir="${basedir}/target/copied-sources">
<fileset dir="${basedir}/../../../runtime/src"/>
<fileset dir="${basedir}/../../../runtime/kt"/>
</copy>
</target>
</configuration>
@@ -75,6 +76,21 @@
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${project.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
+7
View File
@@ -0,0 +1,7 @@
package jet
public trait PropertyMetadata {
public val name: String
}
public class PropertyMetadataImpl(public override val name: String): PropertyMetadata
+1
View File
@@ -4,6 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/kt" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
-25
View File
@@ -1,25 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package jet;
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
@AssertInvisibleInResolver
public interface PropertyMetadata {
public String getName();
}
-33
View File
@@ -1,33 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package jet;
import org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver;
@AssertInvisibleInResolver
public class PropertyMetadataImpl implements PropertyMetadata {
private final String name;
public PropertyMetadataImpl(String name) {
this.name = name;
}
@Override
public String getName() {
return name;
}
}