Skip to content

Commit

Permalink
Updated copyright year
Browse files Browse the repository at this point in the history
  • Loading branch information
schuemie committed Feb 18, 2016
1 parent e698933 commit 3ca19bd
Show file tree
Hide file tree
Showing 46 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion src/org/ohdsi/databases/DbType.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/databases/RichConnection.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/ooxml/CustomXWPFDocument.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/ooxml/ReadXlsxFileWithHeader.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/Arrow.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/DetailsListener.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/DetailsPanel.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/ETLDocumentGenerator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/FetchCDMModelFromServer.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/FlexTable.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/LabeledRectangle.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/MappingComponent.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
24 changes: 12 additions & 12 deletions src/org/ohdsi/rabbitInAHat/MappingPanel.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down Expand Up @@ -170,7 +170,7 @@ private void renderModel() {
cdmComponents.add(component);
}
for (ItemToItemMap map : mapping.getSourceToTargetMaps()) {
Arrow component = new Arrow(getComponentWithItem(map.getSourceItem(), sourceComponents), getComponentWithItem(map.getTargetItem(), cdmComponents), map);
Arrow component = new Arrow(getComponentWithItem(map.getSourceItem(), sourceComponents), getComponentWithItem(map.getTargetItem(), cdmComponents), map);
arrows.add(component);
}
layoutItems();
Expand Down Expand Up @@ -214,7 +214,7 @@ private void layoutItems() {
if (minimized) { // Only update x coordinate
for (LabeledRectangle targetComponent : getVisibleTargetComponents()){
targetComponent.setLocation(cdmX, targetComponent.getY());
}
}
} else {
setLabeledRectanglesLocation(getVisibleSourceComponents(),sourceX);
setLabeledRectanglesLocation(getVisibleTargetComponents(),cdmX);
Expand All @@ -234,17 +234,17 @@ private void setLabeledRectanglesLocation(List<LabeledRectangle> components, int

if (dragRectangle == null || item != dragRectangle) {
item.setLocation(xpos, y);
y += MARGIN + ITEM_HEIGHT;
y += MARGIN + ITEM_HEIGHT;
}

}
}

public Dimension getMinimumSize() {
Dimension dimension = new Dimension();
dimension.width = 2 * (ITEM_WIDTH + MARGIN) + MIN_SPACE_BETWEEN_COLUMNS;
dimension.width = 2 * (ITEM_WIDTH + MARGIN) + MIN_SPACE_BETWEEN_COLUMNS;
dimension.height = Math.min(HEADER_HEIGHT + HEADER_TOP_MARGIN + Math.max(sourceComponents.size(), cdmComponents.size()) * (ITEM_HEIGHT + MARGIN), maxHeight);


return dimension;
}

Expand Down Expand Up @@ -313,8 +313,8 @@ public void paint(Graphics g) {
for (LabeledRectangle component : getVisibleSourceComponents())
if (component != dragRectangle)
component.paint(g2d);

for (LabeledRectangle component : getVisibleTargetComponents())

for (LabeledRectangle component : getVisibleTargetComponents())
if (component != dragRectangle)
component.paint(g2d);

Expand Down Expand Up @@ -371,7 +371,7 @@ public void mouseClicked(MouseEvent event) {
if (event.getX() > sourceX && event.getX() < sourceX + ITEM_WIDTH) { // Source component
LabeledRectangleClicked(event, getVisibleSourceComponents());
}else if (event.getX() > cdmX && event.getX() < cdmX + ITEM_WIDTH) { // target component
LabeledRectangleClicked(event, getVisibleTargetComponents());
LabeledRectangleClicked(event, getVisibleTargetComponents());
}else if (event.getX() > sourceX + ITEM_WIDTH && event.getX() < cdmX) { // Arrows
lastSelectedRectangle = null;
Arrow clickedArrow = null;
Expand Down Expand Up @@ -555,8 +555,8 @@ public void mousePressed(MouseEvent event) {
break;
}
}

for (LabeledRectangle item : getVisibleTargetComponents()) {

for (LabeledRectangle item : getVisibleTargetComponents()) {
if (item.contains(event.getPoint()) && !isBeingFiltered()) {
dragRectangle = item;
dragOffsetY = event.getY() - item.getY();
Expand All @@ -582,7 +582,7 @@ public void mouseReleased(MouseEvent event) {
layoutItems();
} else if (dragArrow != null) { // dragging arrow to set source and target
if (event.getX() > cdmX - ARROW_START_WIDTH && event.getX() < cdmX + ITEM_WIDTH)


for (LabeledRectangle component : getVisibleRectangles(cdmComponents)) {
if (component.contains(event.getPoint(),ARROW_START_WIDTH,0)) {
dragArrow.setTarget(component);
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/ResizeListener.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/dataModel/Database.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/dataModel/ETL.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/dataModel/Field.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/dataModel/ItemToItemMap.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/dataModel/MappableItem.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
4 changes: 2 additions & 2 deletions src/org/ohdsi/rabbitInAHat/dataModel/Mapping.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down Expand Up @@ -94,7 +94,7 @@ public ItemToItemMap getSourceToTargetMap(MappableItem sourceItem, MappableItem

public ItemToItemMap getSourceToTargetMapByName(MappableItem sourceItem, MappableItem targetItem) {
Iterator<ItemToItemMap> iterator = sourceToCdmMaps.iterator();


while (iterator.hasNext()) {
ItemToItemMap sourceToTargetMap = iterator.next();
if (sourceToTargetMap.getSourceItem().getName().equals(sourceItem.getName()) && sourceToTargetMap.getTargetItem().getName().equals(targetItem.getName()))
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/dataModel/Table.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/DirectoryUtilities.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/RandomUtilities.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/SimpleCounter.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/StringUtilities.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/collections/CountingSet.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/collections/IntegerComparator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/collections/LongComparator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/collections/OneToManyList.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/collections/OneToManySet.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/collections/Pair.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/MultiRowIterator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/QuickAndDirtyXlsxReader.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/ReadTextFile.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/Row.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/RowUtilities.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/StringIdComparator.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/utilities/files/WriteTextFile.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/whiteRabbit/Console.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/whiteRabbit/DbSettings.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/whiteRabbit/ErrorReport.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/whiteRabbit/ObjectExchange.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
2 changes: 1 addition & 1 deletion src/org/ohdsi/whiteRabbit/WhiteRabbitMain.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright 2014 Observational Health Data Sciences and Informatics
* Copyright 2016 Observational Health Data Sciences and Informatics
*
* This file is part of WhiteRabbit
*
Expand Down
Loading

0 comments on commit 3ca19bd

Please sign in to comment.