From 01d2f2bc361b6a5851b68fddda2c08ad66ada478 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 13 Dec 2012 12:33:33 +0100 Subject: [PATCH] EA-42066 (do not load JNA prematurely) --- .../src/com/intellij/idea/MainImpl.java | 4 +-- .../intellij/util/text/DateFormatUtilRt.java | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 platform/util-rt/src/com/intellij/util/text/DateFormatUtilRt.java diff --git a/platform/platform-main/src/com/intellij/idea/MainImpl.java b/platform/platform-main/src/com/intellij/idea/MainImpl.java index 89633ed7f735..4e86563d7da5 100644 --- a/platform/platform-main/src/com/intellij/idea/MainImpl.java +++ b/platform/platform-main/src/com/intellij/idea/MainImpl.java @@ -22,7 +22,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.impl.ApplicationInfoImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.ui.AppUIUtil; -import com.intellij.util.text.DateFormatUtil; +import com.intellij.util.text.DateFormatUtilRt; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -72,7 +72,7 @@ public class MainImpl { final ApplicationInfo appInfo = ApplicationInfoImpl.getShadowInstance(); final ApplicationNamesInfo namesInfo = ApplicationNamesInfo.getInstance(); LOG.info("IDE: " + namesInfo.getFullProductName() + " (build #" + appInfo.getBuild() + ", " + - DateFormatUtil.formatBuildDate(appInfo.getBuildDate()) + ")"); + DateFormatUtilRt.formatBuildDate(appInfo.getBuildDate()) + ")"); LOG.info("JRE: " + System.getProperty("java.runtime.version", "-") + " (" + System.getProperty("java.vendor", "-") + ")"); LOG.info("JVM: " + System.getProperty("java.vm.version", "-") + " (" + System.getProperty("java.vm.vendor", "-") + ")"); diff --git a/platform/util-rt/src/com/intellij/util/text/DateFormatUtilRt.java b/platform/util-rt/src/com/intellij/util/text/DateFormatUtilRt.java new file mode 100644 index 000000000000..c7fbdd9c36ca --- /dev/null +++ b/platform/util-rt/src/com/intellij/util/text/DateFormatUtilRt.java @@ -0,0 +1,31 @@ +/* + * Copyright 2000-2012 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 com.intellij.util.text; + +import org.jetbrains.annotations.NotNull; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; + +public class DateFormatUtilRt { + private static final SimpleDateFormat BUILD_DATE_FORMAT = new SimpleDateFormat("dd MMM yyyy HH:ss", Locale.US); + + @NotNull + public static String formatBuildDate(@NotNull Calendar cal) { + return BUILD_DATE_FORMAT.format(cal.getTime()); + } +}