Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mhalverson wants to merge 1 commit into from
Closed

Add support for JodaTime DateTimes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/main/java/hrider/config/GlobalConfig.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

//region Constants
private static final String KEY_DATE_FORMAT = "global.dateFormat";
private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
}

/**
* Gets the date time format to be used to parse/convert JodaTime DateTime strings.
*
* @return A {@link String} representing date time format.
*/
public String getJodaDateFormat() {
return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
}

/**
* Gets an extension to be used for a file to be created for the external viewer.
*
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/hrider/data/ObjectType.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
Boolean,
Short,
DateTime,
JodaDateTime,
Xml,
Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
catch (ParseException ignored) {
return null;
}
case JodaDateTime:
String pattern = GlobalConfig.instance().getJodaDateFormat();
DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
jodaDF.withOffsetParsed();
try {
DateTime parsedValue = jodaDF.parseDateTime(value);
return parsedValue;
} catch (UnsupportedOperationException ignored) {
return null;
} catch (IllegalArgumentException ignored) {
return null;
}
case Xml:
case Json:
return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
return Bytes.toBytes(java.lang.Short.parseShort(value));
case DateTime:
return Bytes.toBytes(value);
case JodaDateTime:
return Bytes.toBytes(java.lang.Long.parseLong(value));
case Xml:
case Json:
return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
catch (ParseException ignored) {
return null;
}
case JodaDateTime:
return new DateTime(Bytes.toLong(value));
case Xml:
case Json:
return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
else {
return Bytes.toBytes((String)value);
}
case JodaDateTime:
return Bytes.toBytes(((DateTime)value).getMillis());
case Xml:
case Json:
return Bytes.toBytes((String)value);
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/hrider/data/TypedObject.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
return df.format((Date)this.value);
}
else if (this.type == ObjectType.JodaDateTime) {
String pattern = GlobalConfig.instance().getJodaDateFormat();
DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
return jodaDF.print((DateTime)this.value);
}
return this.value.toString();
}
return "";
Expand Down
1 change: 1 addition & 0 deletions src/main/java/hrider/ui/design/EditorType.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
*/
public enum EditorType {
Date,
JodaDate,
Text,
Xml,
Json
Expand Down
33 changes: 33 additions & 0 deletions src/main/java/hrider/ui/design/JCellEditor.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
//region Variables
private JTextField textEditor;
private DatePicker dateEditor;
private DatePicker jodaDateEditor;
private XmlEditor xmlEditor;
private JsonEditor jsonEditor;
private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
this.dateEditor.setFieldEditable(canEdit);
this.jodaDateEditor = new DatePicker(null);
this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
this.jodaDateEditor.setFieldEditable(canEdit);
this.xmlEditor = new XmlEditor();
this.xmlEditor.setEditable(canEdit);
this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
if (type == ObjectType.DateTime) {
this.editorType = EditorType.Date;
}
else if (type == ObjectType.JodaDateTime) {
this.editorType = EditorType.JodaDate;
}
else if (type == ObjectType.Xml) {
this.editorType = EditorType.Xml;
}
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
text = df.format(date);
}
break;
case JodaDate:
// Try parsing it, just to make sure it won't get accidentally set to null
// if there's text but it has a typo.
Date jodaDate = this.jodaDateEditor.getDate();
if (jodaDate != null) {
String pattern = GlobalConfig.instance().getJodaDateFormat();
DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
jodaDF.withOffsetParsed();
text = jodaDF.print(new DateTime(jodaDate));
}
break;
case Text:
text = this.textEditor.getText().trim();
break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
catch (PropertyVetoException ignore) {
}
break;
case JodaDate:
try {
if (this.cell != null) {
this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
}
}
catch (PropertyVetoException ignore) {
}
break;
case Text:
if (value != null) {
this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
switch (this.editorType) {
case Date:
return this.dateEditor;
case JodaDate:
return this.jodaDateEditor;
case Text:
return this.textEditor;
case Xml:
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add support for JodaTime DateTimes#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mhalverson
wants to merge
1
commit into

from

 Closed


Add support for JodaTime DateTimes
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
src/main/java/hrider/config/GlobalConfig.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,12 +24,14 @@ public class GlobalConfig extends PropertiesConfig {

 //region Constants
 private static final String KEY_DATE_FORMAT = "global.dateFormat";
 private static final String KEY_JODATIME_DATE_FORMAT = "global.jodaTimeDateFormat";
 private static final String KEY_EXTERNAL_VIEWER_FILE_EXTENSION = "global.externalViewerFileExtension";
 private static final String KEY_EXTERNAL_VIEWER_DELIMETER = "global.externalViewerDelimiter";
 private static final String KEY_BATCH_READ_SIZE = "global.batch.readSize";
 private static final String KEY_BATCH_WRITE_SIZE = "global.batch.writeSize";

 private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 private static final String DEFAULT_JODATIME_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS ZZ";
 private static final String DEFAULT_EXTERNAL_VIEWER_FILE_EXTENSION = ".csv";
 private static final String DEFAULT_EXTERNAL_VIEWER_DELIMETER = ",";
 private static final String DEFAULT_BATCH_READ_SIZE = "1000";
Expand DownExpand Up@@ -68,6 +70,15 @@ public String getDateFormat() {
 return get(String.class, KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT);
 }

 /**
 * Gets the date time format to be used to parse/convert JodaTime DateTime strings.
 *
 * @return A {@link String} representing date time format.
 */
 public String getJodaDateFormat() {
 return get(String.class, KEY_JODATIME_DATE_FORMAT, DEFAULT_JODATIME_DATE_FORMAT);
 }

 /**
 * Gets an extension to be used for a file to be created for the external viewer.
 *
Expand Down

22 changes: 22 additions & 0 deletions
src/main/java/hrider/data/ObjectType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,9 @@

import hrider.config.GlobalConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.ParseException;
Expand DownExpand Up@@ -41,6 +44,7 @@ public enum ObjectType {
 Boolean,
 Short,
 DateTime,
 JodaDateTime,
 Xml,
 Json;

Expand DownExpand Up@@ -98,6 +102,18 @@ public Object toObject(String value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 try {
 DateTime parsedValue = jodaDF.parseDateTime(value);
 return parsedValue;
 } catch (UnsupportedOperationException ignored) {
 return null;
 } catch (IllegalArgumentException ignored) {
 return null;
 }
 case Xml:
 case Json:
 return value;
Expand DownExpand Up@@ -136,6 +152,8 @@ public byte[] fromString(String value) {
 return Bytes.toBytes(java.lang.Short.parseShort(value));
 case DateTime:
 return Bytes.toBytes(value);
 case JodaDateTime:
 return Bytes.toBytes(java.lang.Long.parseLong(value));
 case Xml:
 case Json:
 return Bytes.toBytes(value);
Expand DownExpand Up@@ -180,6 +198,8 @@ public Object fromByteArray(byte[] value) {
 catch (ParseException ignored) {
 return null;
 }
 case JodaDateTime:
 return new DateTime(Bytes.toLong(value));
 case Xml:
 case Json:
 return Bytes.toString(value);
Expand DownExpand Up@@ -224,6 +244,8 @@ public byte[] fromObject(Object value) {
 else {
 return Bytes.toBytes((String)value);
 }
 case JodaDateTime:
 return Bytes.toBytes(((DateTime)value).getMillis());
 case Xml:
 case Json:
 return Bytes.toBytes((String)value);
Expand Down

8 changes: 8 additions & 0 deletions
src/main/java/hrider/data/TypedObject.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
package hrider.data;

import hrider.config.GlobalConfig;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
Expand DownExpand Up@@ -162,6 +165,11 @@ public String toString() {
 DateFormat df = new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH);
 return df.format((Date)this.value);
 }
 else if (this.type == ObjectType.JodaDateTime) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 return jodaDF.print((DateTime)this.value);
 }
 return this.value.toString();
 }
 return "";
Expand Down

1 change: 1 addition & 0 deletions
src/main/java/hrider/ui/design/EditorType.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
 */
public enum EditorType {
 Date,
 JodaDate,
 Text,
 Xml,
 Json
Expand Down

33 changes: 33 additions & 0 deletions
src/main/java/hrider/ui/design/JCellEditor.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@
import hrider.ui.ChangeTracker;
import hrider.ui.controls.json.JsonEditor;
import hrider.ui.controls.xml.XmlEditor;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import javax.swing.*;
import javax.swing.table.TableCellEditor;
Expand DownExpand Up@@ -47,6 +50,7 @@ public class JCellEditor extends AbstractCellEditor implements TableCellEditor {
 //region Variables
 private JTextField textEditor;
 private DatePicker dateEditor;
 private DatePicker jodaDateEditor;
 private XmlEditor xmlEditor;
 private JsonEditor jsonEditor;
 private DataCell cell;
Expand All@@ -70,6 +74,10 @@ public JCellEditor(ChangeTracker changeTracker, int typeColumn, boolean canEdit)
 this.dateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.dateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getDateFormat(), Locale.ENGLISH));
 this.dateEditor.setFieldEditable(canEdit);
 this.jodaDateEditor = new DatePicker(null);
 this.jodaDateEditor.setBorder(BorderFactory.createEmptyBorder());
 this.jodaDateEditor.setDateFormat(new SimpleDateFormat(GlobalConfig.instance().getJodaDateFormat(), Locale.ENGLISH));
 this.jodaDateEditor.setFieldEditable(canEdit);
 this.xmlEditor = new XmlEditor();
 this.xmlEditor.setEditable(canEdit);
 this.jsonEditor = new JsonEditor();
Expand DownExpand Up@@ -111,6 +119,9 @@ public Component getTableCellEditorComponent(JTable table, Object value, boolean
 if (type == ObjectType.DateTime) {
 this.editorType = EditorType.Date;
 }
 else if (type == ObjectType.JodaDateTime) {
 this.editorType = EditorType.JodaDate;
 }
 else if (type == ObjectType.Xml) {
 this.editorType = EditorType.Xml;
 }
Expand DownExpand Up@@ -141,6 +152,17 @@ public Object getCellEditorValue() {
 text = df.format(date);
 }
 break;
 case JodaDate:
 // Try parsing it, just to make sure it won't get accidentally set to null
 // if there's text but it has a typo.
 Date jodaDate = this.jodaDateEditor.getDate();
 if (jodaDate != null) {
 String pattern = GlobalConfig.instance().getJodaDateFormat();
 DateTimeFormatter jodaDF = DateTimeFormat.forPattern(pattern);
 jodaDF.withOffsetParsed();
 text = jodaDF.print(new DateTime(jodaDate));
 }
 break;
 case Text:
 text = this.textEditor.getText().trim();
 break;
Expand DownExpand Up@@ -190,6 +212,15 @@ private void initializeEditor(Object value) {
 catch (PropertyVetoException ignore) {
 }
 break;
 case JodaDate:
 try {
 if (this.cell != null) {
 this.jodaDateEditor.setDate(((DateTime)this.cell.getTypedValue().getValue()).toDate());
 }
 }
 catch (PropertyVetoException ignore) {
 }
 break;
 case Text:
 if (value != null) {
 this.textEditor.setText(value.toString());
Expand DownExpand Up@@ -226,6 +257,8 @@ private Component getEditor() {
 switch (this.editorType) {
 case Date:
 return this.dateEditor;
 case JodaDate:
 return this.jodaDateEditor;
 case Text:
 return this.textEditor;
 case Xml:
Expand Down