mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-12 19:45:22 +02:00
Code Issues Wiki Activity

[331109] Applied Nikita's patch that adds support of the iso time format.

Browse source
This commit is contained in:
Anna Dushistova 2010-11-29 19:33:04 +00:00
parent 31174587f1
commit 691d28e12a
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rse/plugins/org.eclipse.rse.subsystems.files.scp/src/org/eclipse/rse/internal/subsystems/files/scp/ScpFileAttr.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* Nikita Shulga - initial API and implementation * Nikita Shulga - initial API and implementation
* Nikita Shulga (Mentor Graphics) - [331109] Added long-iso time format support
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.subsystems.files.scp; package org.eclipse.rse.internal.subsystems.files.scp;
@ -144,6 +145,13 @@ public class ScpFileAttr {
final static DateFormat moreThanSixMonthOldFormat = new SimpleDateFormat( final static DateFormat moreThanSixMonthOldFormat = new SimpleDateFormat(
"MMM dd yyyy"); //$NON-NLS-1$ "MMM dd yyyy"); //$NON-NLS-1$
/*
* ls ISO date format
*/
final static DateFormat isoDateFormat = new SimpleDateFormat(
"yyyy-MM-dd HH:mm"); //$NON-NLS-1$
/** /**
* Parses date time string returned by ls command * Parses date time string returned by ls command
* *
@ -166,6 +174,12 @@ public class ScpFileAttr {
return d.getTime() / 1000; return d.getTime() / 1000;
} catch (Exception e) { } catch (Exception e) {
} }
try {
Date d = isoDateFormat.parse(date);
return d.getTime() / 1000;
} catch (Exception e) {
}
return 0; return 0;
} }
@ -209,17 +223,21 @@ public class ScpFileAttr {
fields.pop(); fields.pop();
} }
/* Date always takes three fields */ /* Short date formats always take three fields, long(iso) date format takes only two */
if (fields.empty()) if (fields.empty())
return; return;
String dateField = fields.pop(); String dateField = fields.pop();
if (fields.empty()) if (fields.empty())
return; return;
dateField = dateField + " " + fields.pop(); //$NON-NLS-1$ dateField = dateField + " " + fields.pop(); //$NON-NLS-1$
/*Long date format contains two dashes and colon*/
/*If that's not the case - parse last chunk of short date format*/
if (dateField.lastIndexOf('-')==dateField.indexOf('-') || dateField.indexOf(':') == -1) {
if (fields.empty()) if (fields.empty())
return; return;
dateField = dateField + " " + fields.pop(); //$NON-NLS-1$ dateField = dateField + " " + fields.pop(); //$NON-NLS-1$
}
mTime = parseDateTime(dateField); mTime = parseDateTime(dateField);
/* The rest of the entry is name ( and may be symlink ) */ /* The rest of the entry is name ( and may be symlink ) */
String[] namesplit = Pattern.compile( String[] namesplit = Pattern.compile(