diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TimestampRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TimestampRenderer.java
new file mode 100644
index 000000000000..729ac01667c4
--- /dev/null
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TimestampRenderer.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2000-2015 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.debugger.ui.tree.render;
+
+import com.intellij.debugger.DebuggerContext;
+import com.intellij.debugger.engine.evaluation.EvaluateException;
+import com.intellij.debugger.engine.evaluation.EvaluationContext;
+import com.intellij.debugger.ui.tree.DebuggerTreeNode;
+import com.intellij.debugger.ui.tree.NodeDescriptor;
+import com.intellij.debugger.ui.tree.ValueDescriptor;
+import com.intellij.psi.PsiExpression;
+import com.sun.jdi.*;
+
+import java.sql.Timestamp;
+
+/**
+ * @author egor
+ */
+public class TimestampRenderer extends NodeRendererImpl {
+ @Override
+ public String calcLabel(ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener)
+ throws EvaluateException {
+ Value value = descriptor.getValue();
+ if (value == null) {
+ return "null";
+ }
+ else if (value instanceof LongValue) {
+ return new Timestamp(((LongValue)value).longValue()).toString();
+ }
+ return null;
+ }
+
+ @Override
+ public void buildChildren(Value value, ChildrenBuilder builder, EvaluationContext evaluationContext) {}
+
+ @Override
+ public PsiExpression getChildValueExpression(DebuggerTreeNode node, DebuggerContext context) throws EvaluateException {
+ return null;
+ }
+
+ @Override
+ public boolean isExpandable(Value value, EvaluationContext evaluationContext, NodeDescriptor parentDescriptor) {
+ return false;
+ }
+
+ @Override
+ public String getName() {
+ return "Timestamp";
+ }
+
+ @Override
+ public String getUniqueId() {
+ return "TimestampRenderer";
+ }
+
+ @Override
+ public boolean isApplicable(Type t) {
+ return t instanceof LongType;
+ }
+}
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index a7af72384acb..324c80dabdc3 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1500,6 +1500,7 @@
+