MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Kendos-Kenlen/intellij-community into Kendos-Kenlen-master

Browse Source
This commit is contained in:
Dmitry Avdeev
2016-07-13 20:40:41 +03:00
parent a4cd531e39 78b41927b5
commit e6c688ea65
4 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
+7 -2
View File
@@ -204,6 +204,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));
@@ -213,8 +215,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());
@@ -251,7 +256,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
private void validateRecentNames() {
final Collection<FileTemplateBase> allTemplates = myDefaultTemplatesManager.getAllTemplates(false);
final List<String> allNames = new ArrayList<String>(allTemplates.size());
final List<String> allNames = new ArrayList<>(allTemplates.size());
for (FileTemplate fileTemplate : allTemplates) {
allNames.add(fileTemplate.getName());
}
@@ -468,7 +473,7 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers
}
public static class State {
public List<String> RECENT_TEMPLATES = new ArrayList<String>();
public List<String> RECENT_TEMPLATES = new ArrayList<>();
public String SCHEME = FileTemplatesScheme.DEFAULT.getName();
public void addName(@NotNull @NonNls String name) {
resources-en/src/fileTemplates/default.html
+11 -1
View File
@@ -69,6 +69,16 @@
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">current day of the month</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DAY_NAME_SHORT}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">first 3 letters of the current day name. Example: Mon, Tue, etc.</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DAY_NAME_FULL}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">full name of the current day. Example: Monday, Tuesday, etc.</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${HOUR}</b></font></nobr></td>
<td width="10">&nbsp;</td>
@@ -86,4 +96,4 @@
</tr>
</table>
</body>
</html>
</html>
resources-en/src/fileTemplates/includes/File Header.java.html
+11 -1
View File
@@ -58,6 +58,16 @@
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">current day of the month</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DAY_NAME_SHORT}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">first 3 letters of the current day name. Example: Mon, Tue, etc.</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DAY_NAME_FULL}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">full name of the current day. Example: Monday, Tuesday, etc.</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${HOUR}</b></font></nobr></td>
<td width="10">&nbsp;</td>
@@ -75,4 +85,4 @@
</tr>
</table>
</body>
</html>
</html>
resources-en/src/fileTemplates/includes/default.html
+11 -1
View File
@@ -59,6 +59,16 @@
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">current day of the month</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DAY_NAME_SHORT}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">first 3 letters of the current day name. Example: Mon, Tue, etc.</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${DAY_NAME_FULL}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td width="100%" valign="top"><font face="verdana" size="-1">full name of the current day. Example: Monday, Tuesday, etc.</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2"><b>${HOUR}</b></font></nobr></td>
<td width="10">&nbsp;</td>
@@ -76,4 +86,4 @@
</tr>
</table>
</body>
</html>
</html>