27 files changed, 78 insertions, 78 deletions
diff --git a/languages/java/app_templates/CMakeLists.txt b/languages/java/app_templates/CMakeLists.txt
index 34cc305c..f7e7d242 100644
--- a/languages/java/app_templates/CMakeLists.txt
+++ b/languages/java/app_templates/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( javahello )
-add_subdirectory( tdeappjava )
+add_subdirectory( kappjava )
 add_subdirectory( superwaba )
 
 install( FILES
diff --git a/languages/java/app_templates/Makefile.am b/languages/java/app_templates/Makefile.am
index f30aefdb..fe3931a3 100644
--- a/languages/java/app_templates/Makefile.am
+++ b/languages/java/app_templates/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = javahello tdeappjava superwaba
+SUBDIRS = javahello kappjava superwaba
 profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE
 profiles_DATA = java.appwizard
diff --git a/languages/java/app_templates/java.appwizard b/languages/java/app_templates/java.appwizard
index f4f8d6ba..087d6c0c 100644
--- a/languages/java/app_templates/java.appwizard
+++ b/languages/java/app_templates/java.appwizard
@@ -1,2 +1,2 @@
 [General]
-List=javahello,tdeappjava,superwaba
+List=javahello,kappjava,superwaba
diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index 04fd4963..8129bbc1 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( javahello.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/javahello.tar.gz javahello.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    javahello.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    javahello.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index e3e3be27..f47e7056 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
 templateName= javahello
 
 ### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/javahello/javahello.filelist b/languages/java/app_templates/javahello/javahello.filelist
index b9ce43ab..97da44be 100644
--- a/languages/java/app_templates/javahello/javahello.filelist
+++ b/languages/java/app_templates/javahello/javahello.filelist
@@ -1,2 +1,2 @@
-# TDevelop Custom Project File List
+# KDevelop Custom Project File List
 Main.java
diff --git a/languages/java/app_templates/javahello/javahello.tdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate
index 62fcffc5..62fcffc5 100644
--- a/languages/java/app_templates/javahello/javahello.tdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.kdevtemplate
diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.tdevelop
index ade81a9a..a41fae72 100644
--- a/languages/java/app_templates/javahello/javahello.tdevelop
+++ b/languages/java/app_templates/javahello/javahello.tdevelop
@@ -7,15 +7,15 @@
     <projectmanagement>KDevAntProject</projectmanagement>
     <primarylanguage>Java</primarylanguage>
     <ignoreparts>
-      <part>TDevDebugger</part>
+      <part>KDevDebugger</part>
     </ignoreparts>
   </general>
-  <tdevcustomproject>
+  <kdevcustomproject>
     <build>
       <buildtool>ant</buildtool>
     </build>
-  </tdevcustomproject>
- <tdevdoctreeview>
+  </kdevcustomproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -59,11 +59,11 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfileview>
+ </kdevdoctreeview>
+  <kdevfileview>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </tdevfileview>
+  </kdevfileview>
 </tdevelop>
diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
new file mode 100644
index 00000000..042872fd
--- /dev/null
+++ b/languages/java/app_templates/kappjava/CMakeLists.txt
@@ -0,0 +1,26 @@
+#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_custom_target( kappjava.tar.gz ALL
+  COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    app.java pref.java appview.java app_client.java appui.rc
+    src-Makefile.am kappjava.png app.tdevelop subdirs
+)
+
+
+install( FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/kappjava.tar.gz kappjava.png
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+
+
+install( FILES
+    kappjava.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/tdeappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am
index 889abb5a..edbd4468 100644
--- a/languages/java/app_templates/tdeappjava/Makefile.am
+++ b/languages/java/app_templates/kappjava/Makefile.am
@@ -1,12 +1,12 @@
 dataFiles = app.java pref.java appview.java  app_client.java appui.rc \
-	src-Makefile.am tdeappjava.png app.tdevelop subdirs
-templateName = tdeappjava
+	src-Makefile.am kappjava.png app.tdevelop subdirs
+templateName = kappjava
 
 ### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/tdeappjava/app.desktop b/languages/java/app_templates/kappjava/app.desktop
index 3cc75ad8..3cc75ad8 100644
--- a/languages/java/app_templates/tdeappjava/app.desktop
+++ b/languages/java/app_templates/kappjava/app.desktop
diff --git a/languages/java/app_templates/tdeappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 40bc6b93..40bc6b93 100644
--- a/languages/java/app_templates/tdeappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
diff --git a/languages/java/app_templates/tdeappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.tdevelop
index 1e07dec0..7ee74558 100644
--- a/languages/java/app_templates/tdeappjava/app.tdevelop
+++ b/languages/java/app_templates/kappjava/app.tdevelop
@@ -13,15 +13,15 @@
    <keyword>KDE</keyword>
   </keywords>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <activetarget>src/java</activetarget>
   </general>
   <run>
    <mainprogram>src/%{APPNAMELC}</mainprogram>
   </run>
- </tdevautoproject>
- <tdevfileview>
+ </kdevautoproject>
+ <kdevfileview>
   <groups>
    <group pattern="*.java" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -29,12 +29,12 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdebugger>
+ </kdevfileview>
+ <kdevdebugger>
   <general>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -79,10 +79,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/languages/java/app_templates/tdeappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java
index 9648cfad..9648cfad 100644
--- a/languages/java/app_templates/tdeappjava/app_client.java
+++ b/languages/java/app_templates/kappjava/app_client.java
diff --git a/languages/java/app_templates/tdeappjava/appui.rc b/languages/java/app_templates/kappjava/appui.rc
index ceb4f14e..ceb4f14e 100644
--- a/languages/java/app_templates/tdeappjava/appui.rc
+++ b/languages/java/app_templates/kappjava/appui.rc
diff --git a/languages/java/app_templates/tdeappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index 347ff58f..347ff58f 100644
--- a/languages/java/app_templates/tdeappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
diff --git a/languages/java/app_templates/tdeappjava/tdeappjava b/languages/java/app_templates/kappjava/kappjava
index a62edafa..e199ac25 100644
--- a/languages/java/app_templates/tdeappjava/tdeappjava
+++ b/languages/java/app_templates/kappjava/kappjava
@@ -2,7 +2,7 @@
 [General]
 Name=Application framework
 Name[fr]=Squelette d'application
-Icon=tdeappjava.png
+Icon=kappjava.png
 Category=Java/KDE
 Comment=Generates a simple Java KDE application with one toplevel window, menus and  toolbars.
 Comment[fr]=G�n�re une simple application KDE dans le language JAVA avec une fen�tre principale, des menus, et des barres d'outils.
diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
index b5b35e33..92cf4710 100644
--- a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate
+++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
@@ -30,7 +30,7 @@ Name[sv]=Programramverk
 Name[tr]=Uygulama Çatısı
 Name[zh_CN]=应用程序框架
 Name[zh_TW]=應用程式框架
-Icon=tdeappjava.png
+Icon=kappjava.png
 Category=Java/KDE
 Comment=Generates a simple Java KDE application with one toplevel window, menus and  toolbars.
 Comment[ca]=Genera una simple aplicació per al KDE en Java amb una finestra principal, menús i barres d'eines.
@@ -61,19 +61,19 @@ Comment[zh_CN]=生成一个简单的带有顶级窗口、菜单和工具栏的 J
 Comment[zh_TW]=產生一個簡單的 Java KDE 應用程式，內含頂層視窗、選單與工具列。
 FileTemplates=java,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAME}View.java
-Archive=tdeappjava.tar.gz
+Archive=kappjava.tar.gz
 
 [ADMIN]
 Type=include
-File=%{tdevelop}/template-common/admin.tdevtemplate
+File=%{tdevelop}/template-common/admin.kdevtemplate
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
 [DOCBOOK]
 Type=include
-File=%{tdevelop}/template-common/dockbook.tdevtemplate
+File=%{tdevelop}/template-common/dockbook.kdevtemplate
 
 [FILE4]
 Type=install
diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.png b/languages/java/app_templates/kappjava/kappjava.png
index 913ebb87..913ebb87 100644
--- a/languages/java/app_templates/tdeappjava/tdeappjava.png
+++ b/languages/java/app_templates/kappjava/kappjava.png
diff --git a/languages/java/app_templates/tdeappjava/pref.java b/languages/java/app_templates/kappjava/pref.java
index a50fdb31..a50fdb31 100644
--- a/languages/java/app_templates/tdeappjava/pref.java
+++ b/languages/java/app_templates/kappjava/pref.java
diff --git a/languages/java/app_templates/tdeappjava/src-Makefile.am b/languages/java/app_templates/kappjava/src-Makefile.am
index 6468994c..6468994c 100644
--- a/languages/java/app_templates/tdeappjava/src-Makefile.am
+++ b/languages/java/app_templates/kappjava/src-Makefile.am
diff --git a/languages/java/app_templates/tdeappjava/subdirs b/languages/java/app_templates/kappjava/subdirs
index 0e678106..0e678106 100644
--- a/languages/java/app_templates/tdeappjava/subdirs
+++ b/languages/java/app_templates/kappjava/subdirs
diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt
index ea9517be..58932352 100644
--- a/languages/java/app_templates/superwaba/CMakeLists.txt
+++ b/languages/java/app_templates/superwaba/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( superwaba.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/superwaba.tar.gz superwaba.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    superwaba.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    superwaba.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am
index c9c6aa99..bc706fe6 100644
--- a/languages/java/app_templates/superwaba/Makefile.am
+++ b/languages/java/app_templates/superwaba/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
 templateName = superwaba
 
 ### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/java/app_templates/superwaba/superwaba.tdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
index e792af35..27257770 100644
--- a/languages/java/app_templates/superwaba/superwaba.tdevtemplate
+++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
@@ -162,5 +162,5 @@ Archive=superwaba.tar.gz
 
 [GNU]
 Type=include
-File=%{tdevelop}/template-common/gnu.tdevtemplate
+File=%{tdevelop}/template-common/gnu.kdevtemplate
 
diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.tdevelop
index 029d3af3..11db7411 100644
--- a/languages/java/app_templates/superwaba/sw.tdevelop
+++ b/languages/java/app_templates/superwaba/sw.tdevelop
@@ -4,17 +4,17 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
     <ignoreparts>
-      <part>TDevDebugger</part>
+      <part>KDevDebugger</part>
     </ignoreparts>
   <keywords>
    <keyword>Java</keyword>
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
     <run>
       <mainprogram>make test</mainprogram>
       <programargs/>
@@ -34,14 +34,14 @@
       <envvars/>
     </make>
     <makeenvvars/>
- </tdevcustomproject>
- <tdevfileview>
+ </kdevcustomproject>
+ <kdevfileview>
     <groups>
       <group pattern="Makefile" name="Build" />
       <group pattern="*.java" name="Source" />
     </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -85,10 +85,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="java"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/languages/java/app_templates/tdeappjava/CMakeLists.txt b/languages/java/app_templates/tdeappjava/CMakeLists.txt
deleted file mode 100644
index 578b6e9d..00000000
--- a/languages/java/app_templates/tdeappjava/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-add_custom_target( tdeappjava.tar.gz ALL
-  COMMAND tar zcf tdeappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.java pref.java appview.java app_client.java appui.rc
-    src-Makefile.am tdeappjava.png app.tdevelop subdirs
-)
-
-
-install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/tdeappjava.tar.gz tdeappjava.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
-
-
-install( FILES
-    tdeappjava.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )