From 4eec3465ef877d3ed46a2198738463d006b67105 Mon Sep 17 00:00:00 2001 From: Gauthier POGAM--LE MONTAGNER Date: Mon, 16 May 2016 00:03:36 +0200 Subject: [PATCH 1/2] New FileTemplate time variables --- .../ide/fileTemplates/impl/FileTemplateManagerImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java index 6bbd1d9e0cb1..d58a3f3c2b53 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java @@ -198,6 +198,8 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers Date date = myTestDate == null ? calendar.getTime() : myTestDate; SimpleDateFormat sdfMonthNameShort = new SimpleDateFormat("MMM"); SimpleDateFormat sdfMonthNameFull = new SimpleDateFormat("MMMM"); + SimpleDateFormat sdfDayNameShort = new SimpleDateFormat("EEE"); + SimpleDateFormat sdfDayNameFull = new SimpleDateFormat("EEEE"); SimpleDateFormat sdfYearFull = new SimpleDateFormat("yyyy"); props.setProperty("DATE", DateFormatUtil.formatDate(date)); @@ -207,8 +209,11 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers props.setProperty("MONTH_NAME_SHORT", sdfMonthNameShort.format(date)); props.setProperty("MONTH_NAME_FULL", sdfMonthNameFull.format(date)); props.setProperty("DAY", getCalendarValue(calendar, Calendar.DAY_OF_MONTH)); + props.setProperty("DAY_NAME_SHORT", sdfDayNameShort.format(date)); + props.setProperty("DAY_NAME_FULL", sdfDayNameFull.format(date)); props.setProperty("HOUR", getCalendarValue(calendar, Calendar.HOUR_OF_DAY)); props.setProperty("MINUTE", getCalendarValue(calendar, Calendar.MINUTE)); + props.setProperty("SECOND", getCalendarValue(calendar, Calendar.SECOND)); props.setProperty("USER", SystemProperties.getUserName()); props.setProperty("PRODUCT_NAME", ApplicationNamesInfo.getInstance().getFullProductName()); @@ -245,7 +250,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers private void validateRecentNames() { final Collection allTemplates = myDefaultTemplatesManager.getAllTemplates(false); - final List allNames = new ArrayList(allTemplates.size()); + final List allNames = new ArrayList<>(allTemplates.size()); for (FileTemplate fileTemplate : allTemplates) { allNames.add(fileTemplate.getName()); } @@ -462,7 +467,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers } public static class State { - public List RECENT_TEMPLATES = new ArrayList(); + public List RECENT_TEMPLATES = new ArrayList<>(); public String SCHEME = FileTemplatesScheme.DEFAULT.getName(); public void addName(@NotNull @NonNls String name) { From 78b41927b5b0c86a707997bc572e912c3a37b447 Mon Sep 17 00:00:00 2001 From: Gauthier POGAM--LE MONTAGNER Date: Mon, 16 May 2016 11:52:39 +0200 Subject: [PATCH 2/2] Documentation for variables --- resources-en/src/fileTemplates/default.html | 12 +++++++++++- .../src/fileTemplates/includes/File Header.java.html | 12 +++++++++++- resources-en/src/fileTemplates/includes/default.html | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/resources-en/src/fileTemplates/default.html b/resources-en/src/fileTemplates/default.html index 3fca66292fa5..ce83fff93f14 100644 --- a/resources-en/src/fileTemplates/default.html +++ b/resources-en/src/fileTemplates/default.html @@ -69,6 +69,16 @@   current day of the month + + ${DAY_NAME_SHORT} +   + first 3 letters of the current day name. Example: Mon, Tue, etc. + + + ${DAY_NAME_FULL} +   + full name of the current day. Example: Monday, Tuesday, etc. + ${HOUR}   @@ -86,4 +96,4 @@ - \ No newline at end of file + diff --git a/resources-en/src/fileTemplates/includes/File Header.java.html b/resources-en/src/fileTemplates/includes/File Header.java.html index 4a6dd7d50fa1..4912e1694046 100644 --- a/resources-en/src/fileTemplates/includes/File Header.java.html +++ b/resources-en/src/fileTemplates/includes/File Header.java.html @@ -58,6 +58,16 @@   current day of the month + + ${DAY_NAME_SHORT} +   + first 3 letters of the current day name. Example: Mon, Tue, etc. + + + ${DAY_NAME_FULL} +   + full name of the current day. Example: Monday, Tuesday, etc. + ${HOUR}   @@ -75,4 +85,4 @@ - \ No newline at end of file + diff --git a/resources-en/src/fileTemplates/includes/default.html b/resources-en/src/fileTemplates/includes/default.html index 12c6b46bb26c..7e217a4b6827 100644 --- a/resources-en/src/fileTemplates/includes/default.html +++ b/resources-en/src/fileTemplates/includes/default.html @@ -59,6 +59,16 @@   current day of the month + + ${DAY_NAME_SHORT} +   + first 3 letters of the current day name. Example: Mon, Tue, etc. + + + ${DAY_NAME_FULL} +   + full name of the current day. Example: Monday, Tuesday, etc. + ${HOUR}   @@ -76,4 +86,4 @@ - \ No newline at end of file +