jdb/timestamper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored code packages, com.jdbernard -> com.jdblabs

Browse Source 
* Updated contact info, package declarations, and config to match.
* Removed com.jdbernard.timestamper.core, it is becoming a seperate library
  project.
This commit is contained in:
Jonathan Bernard
2011-06-16 12:33:54 -05:00
parent d08d054fbe
commit 98071f270d
30 changed files with 82 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
griffon-app/conf/Application.groovy
View File

@@ -5,23 +5,23 @@ application {
}
mvcGroups {
LogDialog {
model="com.jdbernard.timestamper.LogDialogModel"
controller="com.jdbernard.timestamper.LogDialogController"
view="com.jdbernard.timestamper.LogDialogView"
model="com.jdblabs.timestamper.gui.LogDialogModel"
controller="com.jdblabs.timestamper.gui.LogDialogController"
view="com.jdblabs.timestamper.gui.LogDialogView"
}
TimeStamperMain {
model="com.jdbernard.timestamper.TimeStamperMainModel"
view="com.jdbernard.timestamper.TimeStamperMainView"
controller="com.jdbernard.timestamper.TimeStamperMainController"
model="com.jdblabs.timestamper.gui.TimeStamperMainModel"
view="com.jdblabs.timestamper.gui.TimeStamperMainView"
controller="com.jdblabs.timestamper.gui.TimeStamperMainController"
}
PunchcardDialog {
model="com.jdbernard.timestamper.PunchcardDialogModel"
view="com.jdbernard.timestamper.PunchcardDialogView"
controller="com.jdbernard.timestamper.PunchcardDialogController"
model="com.jdblabs.timestamper.gui.PunchcardDialogModel"
view="com.jdblabs.timestamper.gui.PunchcardDialogView"
controller="com.jdblabs.timestamper.gui.PunchcardDialogController"
}
NotesDialog {
model="com.jdbernard.timestamper.NotesDialogModel"
view="com.jdbernard.timestamper.NotesDialogView"
controller="com.jdbernard.timestamper.NotesDialogController"
model="com.jdblabs.timestamper.gui.NotesDialogModel"
view="com.jdblabs.timestamper.gui.NotesDialogView"
controller="com.jdblabs.timestamper.gui.NotesDialogController"
}
}

4
griffon-app/controllers/com/jdbernard/timestamper/LogDialogController.groovy → griffon-app/controllers/com/jdblabs/timestamper/gui/LogDialogController.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
class LogDialogController {
// these will be injected by Griffon
@@ -13,4 +13,4 @@ class LogDialogController {
def action = { evt = null ->
}
*/
}
}

2
griffon-app/controllers/com/jdbernard/timestamper/NotesDialogController.groovy → griffon-app/controllers/com/jdblabs/timestamper/gui/NotesDialogController.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import java.awt.Point

2
griffon-app/controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy → griffon-app/controllers/com/jdblabs/timestamper/gui/PunchcardDialogController.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import java.awt.Point

8
griffon-app/controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy → griffon-app/controllers/com/jdblabs/timestamper/gui/TimeStamperMainController.groovy
View File

@@ -1,8 +1,8 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import com.jdbernard.util.SmartConfig
import com.jdbernard.timestamper.core.TimelineMarker
import com.jdbernard.timestamper.core.TimelineProperties
import com.jdblabs.util.SmartConfig
import com.jdblabs.timestamper.core.TimelineMarker
import com.jdblabs.timestamper.core.TimelineProperties
class TimeStamperMainController {
// these will be injected by Griffon

2
griffon-app/models/com/jdbernard/timestamper/LogDialogModel.groovy → griffon-app/models/com/jdblabs/timestamper/gui/LogDialogModel.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import groovy.beans.Bindable

2
griffon-app/models/com/jdbernard/timestamper/NotesDialogModel.groovy → griffon-app/models/com/jdblabs/timestamper/gui/NotesDialogModel.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import groovy.beans.Bindable

2
griffon-app/models/com/jdbernard/timestamper/PunchcardDialogModel.groovy → griffon-app/models/com/jdblabs/timestamper/gui/PunchcardDialogModel.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import groovy.beans.Bindable

10
griffon-app/models/com/jdbernard/timestamper/TimeStamperMainModel.groovy → griffon-app/models/com/jdblabs/timestamper/gui/TimeStamperMainModel.groovy
View File

@@ -1,13 +1,13 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import groovy.beans.Bindable
import java.awt.Point
import java.awt.Rectangle
import java.util.Properties
import com.jdbernard.util.SmartConfig
import com.jdbernard.timestamper.core.Timeline
import com.jdbernard.timestamper.core.TimelineMarker
import com.jdbernard.timestamper.core.TimelineProperties
import com.jdblabs.util.SmartConfig
import com.jdblabs.timestamper.core.Timeline
import com.jdblabs.timestamper.core.TimelineMarker
import com.jdblabs.timestamper.core.TimelineProperties
class TimeStamperMainModel {
@Bindable TimelineMarker currentMarker

2
griffon-app/resources/logback.groovy
View File

@@ -17,4 +17,4 @@ appender("FILE", FileAppender) {
}
root(WARN, ["CONSOLE"])
logger("com.jdbernard.*", TRACE, ["FILE"], false)
logger("com.jdblabs.*", TRACE, ["FILE"], false)

66
griffon-app/session.vim
View File

@@ -42,32 +42,32 @@ if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
let s:wipebuf = bufnr('%')
endif
set shortmess=aoO
badd +88 views/com/jdbernard/timestamper/TimeStamperMainView.groovy
badd +24 models/com/jdbernard/timestamper/TimeStamperMainModel.groovy
badd +64 controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy
badd +1 views/com/jdbernard/timestamper/NotesDialogView.groovy
badd +8 models/com/jdbernard/timestamper/NotesDialogModel.groovy
badd +1 controllers/com/jdbernard/timestamper/NotesDialogController.groovy
badd +1 views/com/jdbernard/timestamper/PunchcardDialogView.groovy
badd +7 models/com/jdbernard/timestamper/PunchcardDialogModel.groovy
badd +1 controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy
badd +215 ../src/main/com/jdbernard/timestamper/gui/TimelineDayDisplay.java
badd +8 ../src/main/com/jdbernard/timestamper/gui/WindowInformation.groovy
badd +88 views/com/jdblabs/timestamper/TimeStamperMainView.groovy
badd +24 models/com/jdblabs/timestamper/TimeStamperMainModel.groovy
badd +64 controllers/com/jdblabs/timestamper/TimeStamperMainController.groovy
badd +1 views/com/jdblabs/timestamper/NotesDialogView.groovy
badd +8 models/com/jdblabs/timestamper/NotesDialogModel.groovy
badd +1 controllers/com/jdblabs/timestamper/NotesDialogController.groovy
badd +1 views/com/jdblabs/timestamper/PunchcardDialogView.groovy
badd +7 models/com/jdblabs/timestamper/PunchcardDialogModel.groovy
badd +1 controllers/com/jdblabs/timestamper/PunchcardDialogController.groovy
badd +215 ../src/main/com/jdblabs/timestamper/gui/TimelineDayDisplay.java
badd +8 ../src/main/com/jdblabs/timestamper/gui/WindowInformation.groovy
badd +28 conf/Application.groovy
badd +1 conf/Builder.groovy
badd +1 conf/Config.groovy
badd +1 actions/com/jdbernard/timestamper/NotesDialogActions.groovy
badd +1 actions/com/jdbernard/timestamper/TimeStamperMainActions.groovy
badd +1 actions/com/jdblabs/timestamper/NotesDialogActions.groovy
badd +1 actions/com/jdblabs/timestamper/TimeStamperMainActions.groovy
badd +24 lifecycle/Initialize.groovy
badd +1 conf/Events.groovy
badd +13 resources/log4j.properties
badd +1 ../src/main/com/jdbernard/timestamper/GUIUtil.groovy
badd +1 controllers/com/jdbernard/timestamper/LogDialogController.groovy
badd +1 models/com/jdbernard/timestamper/LogDialogModel.groovy
badd +0 views/com/jdbernard/timestamper/LogDialogView.groovy
badd +0 ../src/main/com/jdbernard/GUIUtil.groovy
args views/com/jdbernard/timestamper/TimeStamperMainView.groovy
edit views/com/jdbernard/timestamper/TimeStamperMainView.groovy
badd +1 ../src/main/com/jdblabs/timestamper/GUIUtil.groovy
badd +1 controllers/com/jdblabs/timestamper/LogDialogController.groovy
badd +1 models/com/jdblabs/timestamper/LogDialogModel.groovy
badd +0 views/com/jdblabs/timestamper/LogDialogView.groovy
badd +0 ../src/main/com/jdblabs/GUIUtil.groovy
args views/com/jdblabs/timestamper/TimeStamperMainView.groovy
edit views/com/jdblabs/timestamper/TimeStamperMainView.groovy
set splitbelow splitright
wincmd _ | wincmd |
vsplit
@@ -190,7 +190,7 @@ normal! zt
normal! 011l
wincmd w
argglobal
edit models/com/jdbernard/timestamper/TimeStamperMainModel.groovy
edit models/com/jdblabs/timestamper/TimeStamperMainModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -294,7 +294,7 @@ normal! zt
normal! 0
wincmd w
argglobal
edit controllers/com/jdbernard/timestamper/TimeStamperMainController.groovy
edit controllers/com/jdblabs/timestamper/TimeStamperMainController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -403,7 +403,7 @@ exe '2resize ' . ((&lines * 23 + 40) / 81)
exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
exe '3resize ' . ((&lines * 54 + 40) / 81)
exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
tabedit views/com/jdbernard/timestamper/NotesDialogView.groovy
tabedit views/com/jdblabs/timestamper/NotesDialogView.groovy
set splitbelow splitright
wincmd _ | wincmd |
vsplit
@@ -526,7 +526,7 @@ normal! zt
normal! 025l
wincmd w
argglobal
edit models/com/jdbernard/timestamper/NotesDialogModel.groovy
edit models/com/jdblabs/timestamper/NotesDialogModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -630,7 +630,7 @@ normal! zt
normal! 0
wincmd w
argglobal
edit controllers/com/jdbernard/timestamper/NotesDialogController.groovy
edit controllers/com/jdblabs/timestamper/NotesDialogController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -739,7 +739,7 @@ exe '2resize ' . ((&lines * 12 + 40) / 81)
exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
exe '3resize ' . ((&lines * 65 + 40) / 81)
exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
tabedit views/com/jdbernard/timestamper/PunchcardDialogView.groovy
tabedit views/com/jdblabs/timestamper/PunchcardDialogView.groovy
set splitbelow splitright
wincmd _ | wincmd |
vsplit
@@ -862,7 +862,7 @@ normal! zt
normal! 011l
wincmd w
argglobal
edit models/com/jdbernard/timestamper/PunchcardDialogModel.groovy
edit models/com/jdblabs/timestamper/PunchcardDialogModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -966,7 +966,7 @@ normal! zt
normal! 07l
wincmd w
argglobal
edit controllers/com/jdbernard/timestamper/PunchcardDialogController.groovy
edit controllers/com/jdblabs/timestamper/PunchcardDialogController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -1075,7 +1075,7 @@ exe '2resize ' . ((&lines * 12 + 40) / 81)
exe 'vert 2resize ' . ((&columns * 91 + 91) / 182)
exe '3resize ' . ((&lines * 65 + 40) / 81)
exe 'vert 3resize ' . ((&columns * 91 + 91) / 182)
tabedit views/com/jdbernard/timestamper/LogDialogView.groovy
tabedit views/com/jdblabs/timestamper/LogDialogView.groovy
set splitbelow splitright
wincmd _ | wincmd |
vsplit
@@ -1198,7 +1198,7 @@ normal! zt
normal! 04l
wincmd w
argglobal
edit models/com/jdbernard/timestamper/LogDialogModel.groovy
edit models/com/jdblabs/timestamper/LogDialogModel.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -1302,7 +1302,7 @@ normal! zt
normal! 014l
wincmd w
argglobal
edit controllers/com/jdbernard/timestamper/LogDialogController.groovy
edit controllers/com/jdblabs/timestamper/LogDialogController.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent
@@ -1633,7 +1633,7 @@ wincmd w
3wincmd w
exe 'vert 1resize ' . ((&columns * 91 + 91) / 182)
exe 'vert 2resize ' . ((&columns * 90 + 91) / 182)
tabedit ../src/main/com/jdbernard/timestamper/gui/TimelineDayDisplay.java
tabedit ../src/main/com/jdblabs/timestamper/gui/TimelineDayDisplay.java
set splitbelow splitright
wincmd _ | wincmd |
vsplit
@@ -1758,7 +1758,7 @@ normal! zt
normal! 0
wincmd w
argglobal
edit ../src/main/com/jdbernard/GUIUtil.groovy
edit ../src/main/com/jdblabs/GUIUtil.groovy
setlocal keymap=
setlocal noarabic
setlocal autoindent

2
griffon-app/views/com/jdbernard/timestamper/LogDialogView.groovy → griffon-app/views/com/jdblabs/timestamper/gui/LogDialogView.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import javax.swing.JDialog

3
griffon-app/views/com/jdbernard/timestamper/NotesDialogView.groovy → griffon-app/views/com/jdblabs/timestamper/gui/NotesDialogView.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import java.awt.Color
import java.awt.Point
@@ -6,7 +6,6 @@ import java.awt.Rectangle
import java.awt.Toolkit
import javax.swing.BoxLayout
import javax.swing.JDialog
import com.jdbernard.GUIUtil
import net.miginfocom.swing.MigLayout
Point mousePressRelativeToDialog

5
griffon-app/views/com/jdbernard/timestamper/PunchcardDialogView.groovy → griffon-app/views/com/jdblabs/timestamper/gui/PunchcardDialogView.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import java.awt.Color
import java.awt.Point
@@ -8,8 +8,7 @@ import java.text.SimpleDateFormat
import javax.swing.JDialog
import java.util.Calendar
import javax.swing.SwingConstants
import com.jdbernard.GUIUtil
import com.jdbernard.timestamper.gui.TimelineDayDisplay
import com.jdblabs.timestamper.gui.TimelineDayDisplay
import com.toedter.calendar.JDateChooser
import net.miginfocom.swing.MigLayout

7
griffon-app/views/com/jdbernard/timestamper/TimeStamperMainView.groovy → griffon-app/views/com/jdblabs/timestamper/gui/TimeStamperMainView.groovy
View File

@@ -1,4 +1,4 @@
package com.jdbernard.timestamper
package com.jdblabs.timestamper.gui
import java.awt.Color
import java.awt.Font
@@ -11,8 +11,7 @@ import javax.swing.JDialog
import javax.swing.JFileChooser
import javax.swing.SwingConstants
import javax.swing.Timer
import com.jdbernard.GUIUtil
import com.jdbernard.timestamper.core.Timeline
import com.jdblabs.timestamper.core.Timeline
import net.miginfocom.swing.MigLayout
/* ========== *
@@ -199,7 +198,7 @@ aboutDialog = dialog(new JDialog(frame),
label(text: "version " + app.applicationProperties.'app.version'
+ " by Jonathan Bernard", constraints: 'growx, wrap',
horizontalAlignment: SwingConstants.CENTER)
textField(text: 'http://www.jdbernard.com/timestamper',
textField(text: 'http://www.jdb-labs.com/timestamper',
constraints: 'growx', foreground: [0,0,200], editable: false,
horizontalAlignment: SwingConstants.CENTER)
}