From cc7f57619fd09f68582b748a3580402717b84c50 Mon Sep 17 00:00:00 2001
From: david-PC\david <kimi42345@gmail.com>
Date: 星期二, 12 六月 2018 15:27:15 +0800
Subject: [PATCH] 停止跟踪项目文件

---
 source/my/frame/src/frame/data/convert/StringTranslator.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source/my/frame/src/frame/data/convert/StringTranslator.java b/source/my/frame/src/frame/data/convert/StringTranslator.java
index 6f688da..b8935e6 100644
--- a/source/my/frame/src/frame/data/convert/StringTranslator.java
+++ b/source/my/frame/src/frame/data/convert/StringTranslator.java
@@ -128,42 +128,42 @@
 		}
 		
 		String fomater = null;
-		String string = String.valueOf(object).replace('T', ' ');
+		String String = String.valueOf(object).replace('T', ' ');
 		
-		if (string.indexOf("/") == 4) {
+		if (String.indexOf("/") == 4) {
 			fomater = "yyyy/MM/dd";
 		}
-		else if (string.indexOf("/") == 2 || string.indexOf("/") == 1) {
+		else if (String.indexOf("/") == 2 || String.indexOf("/") == 1) {
 			fomater = "MM/dd/yyyy";			
 		}
-		else if (string.indexOf("-") == 2 || string.indexOf("-") == 1) {
+		else if (String.indexOf("-") == 2 || String.indexOf("-") == 1) {
 			fomater = "MM-dd-yyyy";		
 		}
-		else if (string.indexOf("-") == 4 && string.indexOf(":")<0) {
+		else if (String.indexOf("-") == 4 && String.indexOf(":")<0) {
 			fomater = "yyyy-MM-dd";				
 		}
-		else if (string.indexOf("-") == 4  && string.indexOf(":")>0) {
-			if(string.split(":").length == 3){
+		else if (String.indexOf("-") == 4  && String.indexOf(":")>0) {
+			if(String.split(":").length == 3){
 			   fomater = "yyyy-MM-dd HH:mm:ss";
 			}
 			else{
-				string = string + ":00";
+				String = String + ":00";
 				fomater = "yyyy-MM-dd HH:mm:00";
 			}
 						
 		}		
-		else if (string.indexOf(".") == 2 || string.indexOf(".") == 1) {
+		else if (String.indexOf(".") == 2 || String.indexOf(".") == 1) {
 			fomater = "MM.dd.yyyy";	
 		}
-		else if (string.indexOf(".") == 4) {
+		else if (String.indexOf(".") == 4) {
 			fomater = "yyyy.MM.dd";		
 		}
-		else if (string.indexOf("-") < 0 && string.indexOf("/") < 0) {
+		else if (String.indexOf("-") < 0 && String.indexOf("/") < 0) {
 			fomater = "yyyyMMdd";
 		}
 
 		DateFormat dateFormat = new SimpleDateFormat(fomater);
-		return dateFormat.parse(string);
+		return dateFormat.parse(String);
 	}
 
 	@Override

--
Gitblit v1.8.0