diff --git a/core-js/pom.xml b/core-js/pom.xml index 4e27000e..7ecbdab4 100644 --- a/core-js/pom.xml +++ b/core-js/pom.xml @@ -9,8 +9,11 @@ org.wisemapping wisemapping ../pom.xml - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT + + scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git + @@ -32,6 +35,12 @@ + + org.apache.maven.plugins + maven-release-plugin + 2.5 + + net.alchim31.maven yuicompressor-maven-plugin diff --git a/mindplot/pom.xml b/mindplot/pom.xml index 1ddf1632..16570a26 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js index 45ee8011..7b03cc9b 100644 --- a/mindplot/src/main/javascript/Designer.js +++ b/mindplot/src/main/javascript/Designer.js @@ -510,6 +510,11 @@ mindplot.Designer = new Class({ if(borderColor){ targetModel.setBorderColor(borderColor) } + + var backgroundColor = sourceModel.getBackgroundColor(); + if(backgroundColor){ + targetModel.setBackgroundColor(backgroundColor) + } }, _createChildModel:function (topic, mousePos) { diff --git a/mindplot/src/main/javascript/widget/LinkIconTooltip.js b/mindplot/src/main/javascript/widget/LinkIconTooltip.js index e4b6925d..2dcaae38 100644 --- a/mindplot/src/main/javascript/widget/LinkIconTooltip.js +++ b/mindplot/src/main/javascript/widget/LinkIconTooltip.js @@ -62,7 +62,7 @@ mindplot.widget.LinkIconTooltip = new Class({ }); var img = $('') - .prop('src', 'http://immediatenet.com/t/m?Size=1024x768&URL=' + linkIcon.getModel().getUrl()) + .prop('src', 'https://api.thumbalizr.com/?url=' + linkIcon.getModel().getUrl() + '&width=250') .prop('img', linkIcon.getModel().getUrl()) .prop('alt', linkIcon.getModel().getUrl()); diff --git a/pom.xml b/pom.xml index bce1d823..1c365129 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT ${project.basedir}/wise-webapps @@ -12,7 +12,7 @@ org.wisemapping wisemapping WiseMapping Project - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT pom diff --git a/web2d/pom.xml b/web2d/pom.xml index 8fe54faf..4cec1193 100644 --- a/web2d/pom.xml +++ b/web2d/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/wise-editor/pom.xml b/wise-editor/pom.xml index 9f6efa4f..de7a9128 100644 --- a/wise-editor/pom.xml +++ b/wise-editor/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index bd44eeae..1acbbc7f 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -9,7 +9,7 @@ org.wisemapping wisemapping ../pom.xml - 3.1-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java index 2026135b..18e1354a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java @@ -21,6 +21,7 @@ package com.wisemapping.exporter; public class ExportProperties { private ExportFormat format; private String baseImgPath; + private String version; public ExportFormat getFormat() { return format; @@ -40,6 +41,14 @@ public class ExportProperties { return result; } + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + static public class GenericProperties extends ExportProperties { private GenericProperties(ExportFormat format) { super(format); diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java index f019051c..716dc2bf 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java @@ -18,6 +18,7 @@ package com.wisemapping.exporter; +import com.wisemapping.importer.VersionNumber; import org.apache.batik.parser.AWTTransformProducer; import org.apache.batik.parser.ParseException; import org.apache.batik.parser.TransformListParser; @@ -142,6 +143,7 @@ public class ExporterFactory { } case FREEMIND: { final FreemindExporter exporter = new FreemindExporter(); + exporter.setVersion(new VersionNumber(properties.getVersion())); exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output); break; } diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java index ea6fe517..fdb8cfcc 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java @@ -19,6 +19,8 @@ package com.wisemapping.exporter; +import com.wisemapping.importer.VersionNumber; +import com.wisemapping.importer.freemind.FreemindConstant; import com.wisemapping.importer.freemind.FreemindIconConverter; import com.wisemapping.jaxb.wisemap.Note; import com.wisemapping.model.Mindmap; @@ -42,6 +44,7 @@ import java.io.OutputStream; import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; import java.math.BigInteger; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -49,12 +52,10 @@ import java.util.Map; public class FreemindExporter implements Exporter { - private static final String FREE_MIND_VERSION = "0.9.0"; - private static final String POSITION_LEFT = "left"; - private static final String POSITION_RIGHT = "right"; + private com.wisemapping.jaxb.freemind.ObjectFactory objectFactory; - private static final String EMPTY_FONT_STYLE = ";;;;;"; private Map nodesMap = null; + private VersionNumber version = FreemindConstant.SUPPORTED_FREEMIND_VERSION; public void export(Mindmap map, OutputStream outputStream) throws ExportException { export(map.getUnzipXml(), outputStream); @@ -71,7 +72,7 @@ public class FreemindExporter mindmapMap = (com.wisemapping.jaxb.wisemap.Map) JAXBUtils.getMapObject(stream, "com.wisemapping.jaxb.wisemap"); final com.wisemapping.jaxb.freemind.Map freemindMap = objectFactory.createMap(); - freemindMap.setVersion(FREE_MIND_VERSION); + freemindMap.setVersion(this.getVersionNumber()); final List topics = mindmapMap.getTopic(); @@ -98,8 +99,9 @@ public class FreemindExporter final List relationships = mindmapMap.getRelationship(); for (RelationshipType relationship : relationships) { - Node srcNode = nodesMap.get(relationship.getSrcTopicId()); - Node dstNode = nodesMap.get(relationship.getDestTopicId()); + // FIXME:invert srcNode and dstNode to correct a bug in the wise mind map representation + Node srcNode = nodesMap.get(relationship.getDestTopicId()); + Node dstNode = nodesMap.get(relationship.getSrcTopicId()); // Workaround for nodes without relationship associated ... @@ -136,6 +138,7 @@ public class FreemindExporter private void addNodeFromTopic(@NotNull final TopicType mainTopic, @NotNull final Node destNode) throws IOException, SAXException, ParserConfigurationException { final List currentTopic = mainTopic.getTopic(); + Collections.sort(currentTopic, new VerticalPositionComparator()); for (TopicType topicType : currentTopic) { final Node newNode = objectFactory.createNode(); nodesMap.put(topicType.getId(), newNode); @@ -149,9 +152,9 @@ public class FreemindExporter if (position != null) { String xPos = position.split(",")[0]; int x = Integer.valueOf(xPos); - newNode.setPOSITION((x < 0 ? POSITION_LEFT : POSITION_RIGHT)); + newNode.setPOSITION((x < 0 ? FreemindConstant.POSITION_LEFT : FreemindConstant.POSITION_RIGHT)); } else { - newNode.setPOSITION(POSITION_LEFT); + newNode.setPOSITION(FreemindConstant.POSITION_LEFT); } } } @@ -174,17 +177,23 @@ public class FreemindExporter } } - freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor()); + String wiseShape = mindmapTopic.getShape(); + if (wiseShape != null && !ShapeStyle.LINE.equals(ShapeStyle.fromValue(wiseShape))) { + freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor()); + } final String shape = mindmapTopic.getShape(); if (shape != null && !shape.isEmpty()) { if (isRoot && !ShapeStyle.ROUNDED_RECTANGLE.getStyle().endsWith(shape) || !isRoot && !ShapeStyle.LINE.getStyle().endsWith(shape)) { String style = shape; - if (ShapeStyle.ROUNDED_RECTANGLE.getStyle().equals(shape)) { + if (ShapeStyle.ROUNDED_RECTANGLE.getStyle().equals(shape) || ShapeStyle.ELLIPSE.getStyle().equals(shape)) { style = "bubble"; } freemindNode.setSTYLE(style); } + } else if (!isRoot) { + String style = "fork"; + freemindNode.setSTYLE(style); } addIconNode(freemindNode, mindmapTopic); @@ -274,15 +283,15 @@ public class FreemindExporter final Font font = objectFactory.createFont(); final String[] part = fontStyle.split(";", 6); int countParts = part.length; - boolean updated = false; + boolean fontNodeNeeded = false; - if (!fontStyle.endsWith(EMPTY_FONT_STYLE)) { + if (!fontStyle.endsWith(FreemindConstant.EMPTY_FONT_STYLE)) { int idx = 0; // Font name if (idx < countParts && part[idx].length() != 0) { font.setNAME(part[idx]); - updated = true; + fontNodeNeeded = true; } idx++; @@ -290,11 +299,11 @@ public class FreemindExporter if (idx < countParts && part[idx].length() != 0) { final String size = part[idx]; if (size != null && !size.isEmpty()) { - int freeSize = Integer.parseInt(size); - Integer fsize = wiseToFreeFontSize.get(freeSize); - if(fsize!=null){ - font.setSIZE(BigInteger.valueOf(fsize)); - updated = true; + int wiseSize = Integer.parseInt(size); + Integer freeSize = wiseToFreeFontSize.get(wiseSize); + if(freeSize!=null){ + font.setSIZE(BigInteger.valueOf(freeSize)); + fontNodeNeeded = true; } } } @@ -303,23 +312,26 @@ public class FreemindExporter // Font Color if (idx < countParts && part[idx].length() != 0) { freemindNode.setCOLOR(part[idx]); - updated = true; } idx++; // Font Styles if (idx < countParts && part[idx].length() != 0) { font.setBOLD(Boolean.TRUE.toString()); - updated = true; + fontNodeNeeded = true; } idx++; if (idx < countParts && part[idx].length() != 0) { font.setITALIC(Boolean.TRUE.toString()); - updated = true; + fontNodeNeeded = true; } - if (updated) { + if (fontNodeNeeded) { + // font size should be set if freemind node has font properties note + if (font.getSIZE() == null) { + font.setSIZE(BigInteger.valueOf(wiseToFreeFontSize.get(8))); + } freemindNode.getArrowlinkOrCloudOrEdge().add(font); } } @@ -342,4 +354,15 @@ public class FreemindExporter } + public VersionNumber getVersion() { + return version; + } + + public void setVersion(VersionNumber version) { + this.version = version; + } + + public String getVersionNumber() { + return this.getVersion().getVersion(); + } } diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/VerticalPositionComparator.java b/wise-webapp/src/main/java/com/wisemapping/exporter/VerticalPositionComparator.java new file mode 100644 index 00000000..dfda0adc --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/VerticalPositionComparator.java @@ -0,0 +1,26 @@ +package com.wisemapping.exporter; + +import com.wisemapping.jaxb.wisemap.TopicType; + +import java.util.Comparator; + +public class VerticalPositionComparator implements Comparator { + + @Override + public int compare(TopicType o1, TopicType o2) { + final String myPosition = o1.getPosition(); + final String otherPosition = o2.getPosition(); + int result; + if (otherPosition == null) { + result = -1; + } else if (myPosition == null) { + result = 1; + } else { + int myPositionY = Integer.parseInt(myPosition.split(",")[1]); + int otherPositionY = Integer.parseInt(otherPosition.split(",")[1]); + result = myPositionY - otherPositionY; + } + return result; + } + +} diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java new file mode 100644 index 00000000..7c8f7d35 --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindConstant.java @@ -0,0 +1,34 @@ +package com.wisemapping.importer.freemind; + +import com.wisemapping.importer.VersionNumber; + +import java.nio.charset.Charset; + +public interface FreemindConstant { + + public static final String LAST_SUPPORTED_FREEMIND_VERSION = "1.0.1"; + public static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber(LAST_SUPPORTED_FREEMIND_VERSION); + public static final String CODE_VERSION = "tango"; + + public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25; + public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT; + public static final int CENTRAL_TO_TOPIC_DISTANCE = 200; + public static final int TOPIC_TO_TOPIC_DISTANCE = 90; + + public static final int FONT_SIZE_HUGE = 15; + public static final int FONT_SIZE_LARGE = 10; + public static final int FONT_SIZE_NORMAL = 8; + public static final int FONT_SIZE_SMALL = 6; + + public static final String NODE_TYPE = "NODE"; + public static final String BOLD = "bold"; + public static final String ITALIC = "italic"; + public static final String EMPTY_FONT_STYLE = ";;;;;"; + public static final String EMPTY_NOTE = ""; + + public static final String POSITION_LEFT = "left"; + public static final String POSITION_RIGHT = "right"; + + public final static Charset UTF_8_CHARSET = Charset.forName("UTF-8"); + +} diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java index 15bed398..52af8997 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java @@ -33,9 +33,7 @@ import com.wisemapping.jaxb.wisemap.Link; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jsoup.Jsoup; -import org.jsoup.nodes.*; import org.jsoup.nodes.Document; -import org.w3c.dom.*; import org.w3c.dom.Element; import javax.xml.bind.JAXBException; @@ -46,37 +44,17 @@ import java.io.InputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringWriter; -import java.nio.charset.Charset; import java.util.*; import java.math.BigInteger; public class FreemindImporter implements Importer { - public static final String CODE_VERSION = "tango"; - public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25; - public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT; - public static final int CENTRAL_TO_TOPIC_DISTANCE = 200; - public static final int TOPIC_TO_TOPIC_DISTANCE = 90; - public static final String NODE_TYPE = "NODE"; private com.wisemapping.jaxb.wisemap.ObjectFactory mindmapObjectFactory; - private static final String POSITION_LEFT = "left"; - private static final String BOLD = "bold"; - private static final String ITALIC = "italic"; - private static final String EMPTY_NOTE = ""; private java.util.Map nodesMap = null; private List relationships = null; - private static final String EMPTY_FONT_STYLE = ";;;;;"; - private final static Charset UTF_8_CHARSET = Charset.forName("UTF-8"); - private final static int ORDER_SEPARATION_FACTOR = 2; - private static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber("0.9.0"); - private int currentId; - private static final int FONT_SIZE_HUGE = 15; - private static final int FONT_SIZE_LARGE = 10; - public static final int FONT_SIZE_NORMAL = 8; - private static final int FONT_SIZE_SMALL = 6; public static void main(String argv[]) { @@ -120,13 +98,8 @@ public class FreemindImporter final String version = freemindMap.getVersion(); if (version != null) { - // Is freemind mindmap ? - if (version.charAt(0) != '0') { - throw new ImporterException("Mindmap is not a FreeMind document. Document type info " + version); - } - final VersionNumber mapVersion = new VersionNumber(version); - if (SUPPORTED_FREEMIND_VERSION.isGreaterThan(mapVersion)) { + if (mapVersion.isGreaterThan(FreemindConstant.SUPPORTED_FREEMIND_VERSION)) { throw new ImporterException("FreeMind version " + mapVersion.getVersion() + " is not supported."); } } @@ -135,7 +108,7 @@ public class FreemindImporter final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final com.wisemapping.jaxb.wisemap.Map mindmapMap = mindmapObjectFactory.createMap(); - mindmapMap.setVersion(CODE_VERSION); + mindmapMap.setVersion(FreemindConstant.CODE_VERSION); currentId = 0; final Node freeNode = freemindMap.getNode(); @@ -156,7 +129,7 @@ public class FreemindImporter addRelationships(mindmapMap); JAXBUtils.saveMap(mindmapMap, baos); - wiseXml = new String(baos.toByteArray(), UTF_8_CHARSET); + wiseXml = new String(baos.toByteArray(), FreemindConstant.UTF_8_CHARSET); result.setXmlStr(wiseXml); result.setTitle(mapName); result.setDescription(description); @@ -235,6 +208,8 @@ public class FreemindImporter TopicType currentWiseTopic = wiseParent; int order = 0; + int firstLevelRightOrder = 0; + int firstLevelLeftOrder = 1; for (Object element : freeChilden) { if (element instanceof Node) { @@ -252,13 +227,19 @@ public class FreemindImporter if (depth != 1) { norder = order++; } else { - norder = calcFirstLevelOrder(freeChilden, freeChild); + if (freeChild.getPOSITION() != null && freeChild.getPOSITION().equals(FreemindConstant.POSITION_LEFT)) { + norder = firstLevelLeftOrder; + firstLevelLeftOrder = firstLevelLeftOrder + 2; + } else { + norder = firstLevelRightOrder; + firstLevelRightOrder = firstLevelRightOrder + 2; + } } wiseChild.setOrder(norder); // Convert node position - int childrenCount = freeChilden.size(); - final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount); + int childrenCountSameSide = getChildrenCountSameSide(freeChilden, freeChild); + final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCountSameSide); wiseChild.setPosition(position); // Convert the rest of the node properties ... @@ -297,7 +278,7 @@ public class FreemindImporter String textNote = hook.getText(); if (textNote == null) // It is not a note is a BlinkingNodeHook or AutomaticLayout Hook { - textNote = EMPTY_NOTE; + textNote = FreemindConstant.EMPTY_NOTE; mindmapNote.setValue(textNote); currentWiseTopic.setNote(mindmapNote); } @@ -305,13 +286,13 @@ public class FreemindImporter final Richcontent content = (Richcontent) element; final String type = content.getTYPE(); - if (type.equals(NODE_TYPE)) { + if (type.equals(FreemindConstant.NODE_TYPE)) { String text = html2text(content); currentWiseTopic.setText(text); } else { String text = html2text(content); final com.wisemapping.jaxb.wisemap.Note mindmapNote = new com.wisemapping.jaxb.wisemap.Note(); - text = text != null ? text : EMPTY_NOTE; + text = text != null ? text : FreemindConstant.EMPTY_NOTE; mindmapNote.setValue(text); currentWiseTopic.setNote(mindmapNote); @@ -320,8 +301,9 @@ public class FreemindImporter final Arrowlink arrow = (Arrowlink) element; RelationshipType relt = mindmapObjectFactory.createRelationshipType(); String destId = arrow.getDESTINATION(); - relt.setSrcTopicId(freeParent.getID()); - relt.setDestTopicId(destId); + // FIXME: invert srcTopic and dstTopic to correct a bug in the wise mind map representation + relt.setSrcTopicId(destId); + relt.setDestTopicId(freeParent.getID()); final String endinclination = arrow.getENDINCLINATION(); if (endinclination != null) { String[] inclination = endinclination.split(";"); @@ -348,50 +330,27 @@ public class FreemindImporter } } - /** - * Sort the freemind node following this pattern: - * - * 0 -> 3 - * 1 -> 1 - * 2 -> 0 - * 3 -> 2 - * 4 -> 4 - */ - private int calcFirstLevelOrder(@NotNull List freeChilden, @Nullable Node freeChild) { - final List nodes = new ArrayList(); - int result; + private int getChildrenCountSameSide(@NotNull List freeChildren, Node freeChild) { + int result = 0; + String childSide = freeChild.getPOSITION(); + if (childSide == null) { + childSide = FreemindConstant.POSITION_RIGHT; + } - // Collect all the nodes of the same side ... - for (Object child : freeChilden) { + // Count all the nodes of the same side ... + for (Object child : freeChildren) { if (child instanceof Node) { Node node = (Node) child; - final String side = node.getPOSITION(); - if (side == freeChild.getPOSITION() || freeChild.getPOSITION().equals(side)) { - nodes.add(node); + String side = node.getPOSITION(); + if (side == null) { + side = FreemindConstant.POSITION_RIGHT; + } + if (childSide.equals(side)) { + result++; } } } - - // What is the index of the current node ? - int nodeIndex = 0; - for (Node node : nodes) { - if (node == freeChild) { - break; - } - nodeIndex++; - } - - int size = nodes.size(); - int center = (size - 1) / 2; - result = nodeIndex - center; - - if (result < 0) { - result = (result * ORDER_SEPARATION_FACTOR * -2) - 1; - - } else { - result = result * ORDER_SEPARATION_FACTOR * 2; - } return result; } @@ -410,11 +369,11 @@ public class FreemindImporter // Problem on setting X position: // Text Size is not taken into account ... - int x = CENTRAL_TO_TOPIC_DISTANCE + ((depth - 1) * TOPIC_TO_TOPIC_DISTANCE); + int x = FreemindConstant.CENTRAL_TO_TOPIC_DISTANCE + ((depth - 1) * FreemindConstant.TOPIC_TO_TOPIC_DISTANCE); if (depth == 1) { final String side = freeChild.getPOSITION(); - x = x * (side != null && POSITION_LEFT.equals(side) ? -1 : 1); + x = x * (side != null && FreemindConstant.POSITION_LEFT.equals(side) ? -1 : 1); } else { final Coord coord = Coord.parse(wiseParent.getPosition()); x = x * (coord.isOnLeftSide() ? -1 : 1); @@ -425,23 +384,21 @@ public class FreemindImporter int y; if (depth == 1) { - // Follow the following algorithm ... - // Order: 3 = -100 1 - // Order: 1 = -50 2 - // Order: 0 = 0 3 - // Order: 2 = 50 4 - // Order: 4 = 100 5 + // pair order numbers represent nodes at the right + // odd order numbers represent nodes at the left if (order % 2 == 0) { - y = ROOT_LEVEL_TOPIC_HEIGHT * order; + int multiplier = ((order + 1) - childrenCount) * 2; + y = multiplier * FreemindConstant.ROOT_LEVEL_TOPIC_HEIGHT; } else { - y = -ROOT_LEVEL_TOPIC_HEIGHT * (order + 1); + int multiplier = (order - childrenCount) * 2; + y = multiplier * FreemindConstant.ROOT_LEVEL_TOPIC_HEIGHT; } } else { // Problem: What happen if the node is more tall than what is defined here. Coord coord = Coord.parse(wiseParent.getPosition()); int parentY = coord.y; - y = parentY - ((childrenCount / 2) * SECOND_LEVEL_TOPIC_HEIGHT - (order * SECOND_LEVEL_TOPIC_HEIGHT)); + y = parentY - ((childrenCount / 2) * FreemindConstant.SECOND_LEVEL_TOPIC_HEIGHT - (order * FreemindConstant.SECOND_LEVEL_TOPIC_HEIGHT)); } @@ -573,14 +530,14 @@ public class FreemindImporter // 10 Large // 15 Huge if (font != null) { - final int fontSize = ((font.getSIZE() == null || font.getSIZE().intValue() < 8) ? BigInteger.valueOf(FONT_SIZE_NORMAL) : font.getSIZE()).intValue(); - int wiseFontSize = FONT_SIZE_SMALL; + final int fontSize = ((font.getSIZE() == null || font.getSIZE().intValue() < 8) ? BigInteger.valueOf(FreemindConstant.FONT_SIZE_NORMAL) : font.getSIZE()).intValue(); + int wiseFontSize = FreemindConstant.FONT_SIZE_SMALL; if (fontSize >= 24) { - wiseFontSize = FONT_SIZE_HUGE; + wiseFontSize = FreemindConstant.FONT_SIZE_HUGE; } else if (fontSize >= 16) { - wiseFontSize = FONT_SIZE_LARGE; + wiseFontSize = FreemindConstant.FONT_SIZE_LARGE; } else if (fontSize >= 12) { - wiseFontSize = FONT_SIZE_NORMAL; + wiseFontSize = FreemindConstant.FONT_SIZE_NORMAL; } fontStyle.append(wiseFontSize); @@ -597,19 +554,19 @@ public class FreemindImporter // Bold ... if (font != null) { boolean hasBold = Boolean.parseBoolean(font.getBOLD()); - fontStyle.append(hasBold ? BOLD : ""); + fontStyle.append(hasBold ? FreemindConstant.BOLD : ""); } fontStyle.append(";"); // Italic ... if (font != null) { boolean hasItalic = Boolean.parseBoolean(font.getITALIC()); - fontStyle.append(hasItalic ? ITALIC : ""); + fontStyle.append(hasItalic ? FreemindConstant.ITALIC : ""); } fontStyle.append(";"); final String result = fontStyle.toString(); - return result.equals(EMPTY_FONT_STYLE) ? null : result; + return result.equals(FreemindConstant.EMPTY_FONT_STYLE) ? null : result; } private diff --git a/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java b/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java index 0681807d..21afdaf2 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java @@ -23,7 +23,8 @@ public enum ShapeStyle LINE("line"), ROUNDED_RECTANGLE("rounded rectagle"), RECTANGLE("rectagle"), - ELLIPSE("elipse"); + ELLIPSE("elipse"), + IMAGE("image"); private String style; @@ -35,5 +36,14 @@ public enum ShapeStyle public String getStyle() { return style; - } + } + + public static ShapeStyle fromValue(String value) { + for (ShapeStyle shapeStyle : ShapeStyle.values()) { + if (shapeStyle.getStyle().equals(value)) { + return shapeStyle; + } + } + throw new IllegalArgumentException("Shape value \"" + value + "\" doesn't match with a value shape style."); + } } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index 89d79f5d..86f1a816 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -114,13 +114,14 @@ public class MindmapController extends BaseController { return new ModelAndView("transformViewWise", values); } - @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"}) + @RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm","version"}) @ResponseBody - public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException, MapCouldNotFoundException { + public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id, @RequestParam(value = "version") String version) throws IOException, MapCouldNotFoundException { final Mindmap mindMap = findMindmapById(id); final Map values = new HashMap(); values.put("content", mindMap.getXmlStr()); values.put("filename", mindMap.getTitle()); + values.put("version", version); return new ModelAndView("transformViewFreemind", values); } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java index 26becdee..4c754537 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java @@ -56,6 +56,7 @@ public class TransformView extends AbstractView { final String content = (String) viewMap.get("content"); final String filename = (String) viewMap.get("filename"); + final String version = (String) viewMap.get("version"); // Build format properties ... final ExportProperties properties = ExportProperties.create(exportFormat); @@ -63,6 +64,9 @@ public class TransformView extends AbstractView { final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties; imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE); } + if (version != null) { + properties.setVersion(version); + } // Set format content type... final String contentType = exportFormat.getContentType(); diff --git a/wise-webapp/src/main/resources/messages_ca.properties b/wise-webapp/src/main/resources/messages_ca.properties index e8244e85..9b499c7e 100644 --- a/wise-webapp/src/main/resources/messages_ca.properties +++ b/wise-webapp/src/main/resources/messages_ca.properties @@ -35,7 +35,8 @@ EXPORT=Exportar SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) IMG_EXPORT_FORMAT=Imatge(PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) DELETE=Esborrar LOGIN_ERROR=El nom d'usuari o la contrasenya no són correctes USER_INACTIVE=Perdo, el seu compre encara no ha estar activar. Rebrà un correu amb les dades d'activació. @@ -162,7 +163,7 @@ ADD_MESSAGE=Afegir un missatge WHO_CAN_ACCESS=Qui pot accedir IS_OWNER=És propietari OPTIONAL_CUSTOM_MESSAGE=Opcional\: Incloure un missatge personalitzat -IMPORT_MINDMAP_INFO=És possible importar mapes en format FreeMind 0.9 i WiseMapping. Seleccioni el fitxer a importar. +IMPORT_MINDMAP_INFO=És possible importar mapes en format FreeMind 1.0.1 i WiseMapping. Seleccioni el fitxer a importar. VIEW=veure YOU=Vostè INFO_UPDATE_SUCCESS=La seva informació s'ha actualitzat correctament. diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-webapp/src/main/resources/messages_de.properties index ab854356..a59d134a 100644 --- a/wise-webapp/src/main/resources/messages_de.properties +++ b/wise-webapp/src/main/resources/messages_de.properties @@ -38,7 +38,8 @@ EXPORT=Exportieren SVG_EXPORT_FORMAT=Skalierbare Vektor Graphik (SVG) PDF_EXPORT_FORMAT=Portables Dokumenten Format (PDF) IMG_EXPORT_FORMAT=Bilddatei (PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) WISEMAPPING_EXPORT_FORMAT = WiseMapping LAST_UPDATE=Zuletzt geändert LAST_UPDATE_BY=Zuletzt geändert von @@ -99,7 +100,7 @@ UNEXPECTED_ERROR=Outch!!. Ein unerwarteter Fehler ist aufgetreten. UNEXPECTED_ERROR_DETAILS=Es tut uns Leid! Es ist ein Fehler aufgetreten der es uns nicht ermöglicht Ihre Anfrage zu bearbeiten. Bitte versuchen Sie es noch einmal oder gehen Sie zur Anfangsseite. NO_ENOUGH_PERMISSIONS=Outch!!. Diese map ist nicht mehr verfügbar. NO_ENOUGH_PERMISSIONS_DETAILS=Sie haben nicht die erforderlichen Rechte, um sich diese map anzusehen. Diese map ist entweder privat oder wurde gelöscht. -IMPORT_MINDMAP_INFO=Sie können FreeMind 0.9 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import. +IMPORT_MINDMAP_INFO=Sie können FreeMind 1.0.1 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import. PRINT=Drucken IMPORT_MAP_ERROR=FreeMind Datei konnte nicht importiert werden. {0} MAP_TITLE_ALREADY_EXISTS=Sie haben schon eine map mit identischem Namen. diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 0ce64939..1d5427f4 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -40,7 +40,8 @@ EXPORT=Export SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) IMG_EXPORT_FORMAT=Image File (PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) WISEMAPPING_EXPORT_FORMAT = WiseMapping LAST_UPDATE=Last Update LAST_UPDATE_BY=Last Update By @@ -103,7 +104,7 @@ UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, click below on "Raise An Issue" to open a ticket. NO_ENOUGH_PERMISSIONS=Outch!!. This map is not available anymore. NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted. -IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import. +IMPORT_MINDMAP_INFO=You can import FreeMind 1.0.1 and WiseMapping maps to your list of maps. Select the file you want to import. PRINT=Print IMPORT_MAP_ERROR=FreeMind file could not be imported. {0} MAP_TITLE_ALREADY_EXISTS=You have already a map with the same name diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 596a3ddc..ac2848e3 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -35,7 +35,8 @@ EXPORT=Exportar SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) IMG_EXPORT_FORMAT=Imagen (PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) DELETE=Borrar LOGIN_ERROR=El nombre de usuario o la contraseña introducidos no son correctos. USER_INACTIVE=Disculpe, su cuenta aun no ha sido activada. Usted recibirá una notificación por email tan pronto la activemos. @@ -66,7 +67,7 @@ ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar. SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) es un XML markup language para describir gráficos vectoriale de dos dimensiones. Este formato le permitira imprimir sus mapas sin perdida de calidad o resolución. PDF_EXPORT_FORMAT_DETAILS=Obtenga su mapa como un documento (PDF) para compartirlo y usarlo en sus presentaciones. IMG_EXPORT_FORMAT_DETAILS=Obtenga una representación gráfica de su mapa incluyendo todo los colores y formas para reusarlo en documentos o para ser archivado -FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind un aplicación de escritorio gratuita de diseno de mapas mentales +FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind una aplicación de escritorio gratuita de diseño de mapas mentales TERMSOFUSE=Términos de uso PRIVACYPOLICY= Politica de privacidad EXPORT_DETAILS=Exporte el mapa en el formato que desee y comience a utilizarlo en sus presentaciones @@ -164,7 +165,7 @@ ADD_MESSAGE=Agregar un mensaje WHO_CAN_ACCESS=Quienes pueden acceder IS_OWNER=Es dueño OPTIONAL_CUSTOM_MESSAGE=Opcional\: Incluir un mensaje personalizado -IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 0.9 y WiseMapping. Seleccione el archivo a importar. +IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 1.0.1 y WiseMapping. Seleccione el archivo a importar. VIEW=ver YOU=Vos INFO_UPDATE_SUCCESS=Your info has been changed successfully diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties index 37499b38..cab4963e 100644 --- a/wise-webapp/src/main/resources/messages_fr.properties +++ b/wise-webapp/src/main/resources/messages_fr.properties @@ -43,7 +43,8 @@ EXPORT=Exporter SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) IMG_EXPORT_FORMAT=Fichier Graphique (PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) WISEMAPPING_EXPORT_FORMAT = WiseMapping LAST_UPDATE=Date dernière modification LAST_UPDATE_BY=Dernière modification par @@ -104,7 +105,7 @@ UNEXPECTED_ERROR=Aïe!!. Une erreur inattendue est survenue. UNEXPECTED_ERROR_DETAILS=Désolé, une erreur s'est produite et nous ne pouvons pas exécuter votre demande. Essayez à nouveau, ou retournez à la page d'accueil. NO_ENOUGH_PERMISSIONS=Aïe!!. Cette carte n'est plus accessible. NO_ENOUGH_PERMISSIONS_DETAILS=Vous n'avez pas les droits d'accès suffisants pour voir cette carte. Cette carte est devenue privée, ou a été détruite. -IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 0.9 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer. +IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 1.0.1 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer. PRINT=Imprimer IMPORT_MAP_ERROR=Le fichier FreeMind n'a pas pu être importé. {0} MAP_TITLE_ALREADY_EXISTS=Vous avez déjà une carte portant le même nom. diff --git a/wise-webapp/src/main/resources/messages_it.properties b/wise-webapp/src/main/resources/messages_it.properties index f1886328..44868599 100644 --- a/wise-webapp/src/main/resources/messages_it.properties +++ b/wise-webapp/src/main/resources/messages_it.properties @@ -38,7 +38,8 @@ EXPORT=Esporta SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG) PDF_EXPORT_FORMAT=Portable Document Format (PDF) IMG_EXPORT_FORMAT=File Immagine (PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (versione 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) WISEMAPPING_EXPORT_FORMAT = WiseMapping LAST_UPDATE=Ultimo Aggiornamento LAST_UPDATE_BY=Ultimo aggiornamento da @@ -99,7 +100,7 @@ UNEXPECTED_ERROR=Oops!! Si è verificato un errore inaspettato. UNEXPECTED_ERROR_DETAILS=Siamo spiacenti, si è verificato un errore e non possiamo procedere nella tua richiesta. Prego, provare più tardi o torna alla home page. NO_ENOUGH_PERMISSIONS=Oops!!. Questa mappa non è più disponibile. NO_ENOUGH_PERMISSIONS_DETAILS=Non hai sufficienti diritti per visualizzare questa mappa. Il suo stato è cambiato in Privato oppure è stata eliminata. -IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 0.9 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare. +IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 1.0.1 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare. PRINT=Stampa IMPORT_MAP_ERROR=Il file FreeMind non può essere importato. {0} MAP_TITLE_ALREADY_EXISTS=Esiste già una mappa con lo stesso nome diff --git a/wise-webapp/src/main/resources/messages_pt_BR.properties b/wise-webapp/src/main/resources/messages_pt_BR.properties index 0fcd3c98..b4d3b90d 100644 --- a/wise-webapp/src/main/resources/messages_pt_BR.properties +++ b/wise-webapp/src/main/resources/messages_pt_BR.properties @@ -36,7 +36,8 @@ EXPORT=Exportar SVG_EXPORT_FORMAT=Gráfico Vetorial Escalável (SVG) PDF_EXPORT_FORMAT=Formato de Documento Portável (PDF) IMG_EXPORT_FORMAT=Arquivo de Imagem (PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Exportar para o Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Exportar para o Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Exportar para o Freemind (version 1.0.1) WISEMAPPING_EXPORT_FORMAT = WiseMapping LAST_UPDATE=Última Atualização LAST_UPDATE_BY=Última Atualização @@ -97,7 +98,7 @@ UNEXPECTED_ERROR=Opa!!. Ocorreu um erro inesperado. UNEXPECTED_ERROR_DETAILS=Lamentamos, ocorreu um erro e não podemos processar a sua solicitação. Por favor, tente novamente ou vá para a página Inicial. NO_ENOUGH_PERMISSIONS=Opa!!. Este mapa não está mais disponível. NO_ENOUGH_PERMISSIONS_DETAILS=Você não tem privilégios suficientes para ver este mapa. Este mapa foi alterado para privado ou deletado. -IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 0.9 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar. +IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 1.0.1 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar. PRINT=Imprimir IMPORT_MAP_ERROR=O arquivo FreeMind não pode ser importado. {0} MAP_TITLE_ALREADY_EXISTS=Você já tem um mapa com o mesmo nome diff --git a/wise-webapp/src/main/resources/messages_zh_CN.properties b/wise-webapp/src/main/resources/messages_zh_CN.properties index d1ce031a..688c392f 100644 --- a/wise-webapp/src/main/resources/messages_zh_CN.properties +++ b/wise-webapp/src/main/resources/messages_zh_CN.properties @@ -99,7 +99,7 @@ UNEXPECTED_ERROR=晕!!不可预知的错误。 UNEXPECTED_ERROR_DETAILS=抱歉,突遭错误,我们无法处理你的请求。 请重试或者访问首页。 NO_ENOUGH_PERMISSIONS=晕!!此图不可访问。 NO_ENOUGH_PERMISSIONS_DETAILS=你没有权限访问这张图。此图已修改访问权限或者已删除。 -IMPORT_MINDMAP_INFO=你可以导入 FreeMind 0.9 和 WiseMapping 格式的思维导图。选择你想要导入的文件。 +IMPORT_MINDMAP_INFO=你可以导入 FreeMind 1.0.1 和 WiseMapping 格式的思维导图。选择你想要导入的文件。 PRINT=打印 IMPORT_MAP_ERROR=FreeMind 文件不能导入。 MAP_TITLE_ALREADY_EXISTS=已有同名称图 diff --git a/wise-webapp/src/main/resources/messages_zh_TW.properties b/wise-webapp/src/main/resources/messages_zh_TW.properties index 55845eb1..7b4441aa 100644 --- a/wise-webapp/src/main/resources/messages_zh_TW.properties +++ b/wise-webapp/src/main/resources/messages_zh_TW.properties @@ -38,7 +38,8 @@ EXPORT=導出 SVG_EXPORT_FORMAT=可縮放向量圖形(SVG) PDF_EXPORT_FORMAT=便攜檔格式(PDF) IMG_EXPORT_FORMAT=圖像檔(PNG/JPEG) -FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0) +FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1) WISEMAPPING_EXPORT_FORMAT = WiseMapping LAST_UPDATE=最近更新 LAST_UPDATE_BY=最近更新者 @@ -99,7 +100,7 @@ UNEXPECTED_ERROR=暈!!不可預知的錯誤。 UNEXPECTED_ERROR_DETAILS=抱歉,突遭錯誤,我們無法處理你的請求。 請重試或者訪問首頁。 NO_ENOUGH_PERMISSIONS=暈!!此圖不可訪問。 NO_ENOUGH_PERMISSIONS_DETAILS=你沒有許可權訪問這張圖。此圖已修改訪問許可權或者已刪除。 -IMPORT_MINDMAP_INFO=你可以導入 FreeMind 0.9 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。 +IMPORT_MINDMAP_INFO=你可以導入 FreeMind 1.0.1 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。 PRINT=列印 IMPORT_MAP_ERROR=FreeMind 檔不能導入。 MAP_TITLE_ALREADY_EXISTS=已有同名稱圖 diff --git a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp index efca321f..d240fb4c 100644 --- a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp +++ b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp @@ -26,6 +26,7 @@ var svgXml = context.method == "POST" ? window.document.getElementById('workspaceContainer').innerHTML : ""; $('svgXml').setAttribute('value', svgXml); $('download').setAttribute('value', context.formatType); + $('version').setAttribute('value', context.version); iframeForm.submit(); } if (MooDialog.Request.active) { @@ -44,4 +45,5 @@ enctype="application/x-www-form-urlencoded" id="iframeExportForm"> + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp index b183ab15..17f1159e 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp @@ -10,10 +10,16 @@ enctype="application/x-www-form-urlencoded" id="dialogMainForm"> + - + + + + + + @@ -98,7 +104,7 @@ // No way to obtain map svg. Hide panels.. if (window.location.pathname.match(/\/[0-9]+\/edit/)) { $('#exportInfo').hide(); - $('#freemind,#pdf,#svg,#odt,#txt,#xls,#mmap').click('click', function (event) { + $('#freemind,#freemind09,#pdf,#svg,#odt,#txt,#xls,#mmap').click('click', function (event) { $('#imgFormat').hide(); }); @@ -114,7 +120,6 @@ // If the map is opened, use the latest model ... var formatType = $('#dialogMainForm input:checked').attr('value'); var form = $('#dialogMainForm'); - // Restore default .. form.attr('action', 'c/restful/maps/${mindmap.id}.' + formatType); @@ -134,6 +139,11 @@ } + var version = $('#dialogMainForm input:checked').attr('version'); + if (version) { + $('#dialogMainForm input[name=version]').attr('value', version); + } + $('#dialogMainForm input[name=download]').attr('value', formatType); form.submit(); diff --git a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp index d9c84cbd..ff0d6846 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp @@ -25,7 +25,7 @@ : - " class="form-control" maxlength="255"> @@ -46,12 +46,46 @@ $('#dialogMainForm').submit(function (event) { // Load form parameters ... - var title = $('#dialogMainForm #title').attr('value'); + var title = $('#dialogMainForm #title').val(); title = title == undefined ? "" : title; - var description = $('#dialogMainForm #description').attr('value'); + var description = $('#dialogMainForm #description').val(); description = description == undefined ? "" : description; + var onSuccess = function (data, textStatus, jqXHR) { + var resourceId = data.getResponseHeader("ResourceId"); + window.location = "c/maps/" + resourceId + "/edit"; + }; + + var onError = function (jqXHR, textStatus, errorThrown) { + if (jqXHR.status == 400) { + var errors = JSON.parse(jqXHR.responseText); + // Mark fields with errors ... + var fieldErrors = errors.fieldErrors; + if (fieldErrors) { + for (var fieldName in fieldErrors) { + // Mark the field with errors ... + var message = fieldErrors[fieldName]; + var inputField = $("#dialogMainForm input[name='" + fieldName + "']"); + $("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger"); + inputField.parent().addClass('error'); + } + } + var globalErrors = errors.globalErrors; + if (globalErrors) { + for (var error in globalErrors) { + // Mark the field with errors ... + $("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger"); + inputField.parent().addClass('error'); + } + } + } else { + console.log(errorThrown); + console.log(jqXHR); + $('#messagesPanel div').text(errorThrown).parent().show(); + } + }; + // Save status on click ... jQuery.ajax("c/restful/maps?title=" + encodeURI(title) + "&description=" + encodeURI(description), { @@ -60,37 +94,10 @@ type:'POST', dataType:'json', contentType:contentType, - success:function (data, textStatus, jqXHR) { - var resourceId = jqXHR.getResponseHeader("ResourceId"); - window.location = "c/maps/" + resourceId + "/edit"; - }, - error:function (jqXHR, textStatus, errorThrown) { - if (jqXHR.status == 400) { - var errors = JSON.parse(jqXHR.responseText); - // Mark fields with errors ... - var fieldErrors = errors.fieldErrors; - if (fieldErrors) { - for (var fieldName in fieldErrors) { - // Mark the field with errors ... - var message = fieldErrors[fieldName]; - var inputField = $("#dialogMainForm input[name='" + fieldName + "']"); - $("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger"); - inputField.parent().addClass('error'); - } - } - var globalErrors = errors.globalErrors; - if (globalErrors) { - for (var error in globalErrors) { - // Mark the field with errors ... - $("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger"); - inputField.parent().addClass('error'); - } - } - } else { - console.log(errorThrown); - console.log(jqXHR); - $('#messagesPanel div').text(errorThrown).parent().show(); - } + statusCode: { + 201: onSuccess, + 400: onError, + default: onError } }); event.preventDefault(); diff --git a/wise-webapp/src/test/java/com/wisemapping/test/importer/VersionComparisonTest.java b/wise-webapp/src/test/java/com/wisemapping/test/importer/VersionComparisonTest.java new file mode 100644 index 00000000..8a9b89d8 --- /dev/null +++ b/wise-webapp/src/test/java/com/wisemapping/test/importer/VersionComparisonTest.java @@ -0,0 +1,29 @@ +package com.wisemapping.test.importer; + +import com.wisemapping.importer.ImporterException; +import com.wisemapping.importer.VersionNumber; +import org.testng.Assert; +import org.testng.annotations.Test; + +@Test +public class VersionComparisonTest { + + @Test + public void compareVersionTest() throws ImporterException { + + final VersionNumber greatest = new VersionNumber("1.0.1"); + final VersionNumber smaller = new VersionNumber("0.9.0"); + final VersionNumber intermediate = new VersionNumber("1.0.0"); + + Assert.assertTrue(smaller.isSmallerThan(intermediate)); + Assert.assertFalse(greatest.isSmallerThan(intermediate)); + + Assert.assertTrue(greatest.isGreaterThan(smaller)); + Assert.assertFalse(intermediate.isGreaterThan(greatest)); + + Assert.assertTrue(intermediate.equals(intermediate)); + Assert.assertFalse(greatest.equals(smaller)); + + } + +} diff --git a/wise-webapp/src/test/resources/data/export/bigmap.csv b/wise-webapp/src/test/resources/data/export/bigmap.csv index fd9d2343..3ff5e552 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.csv +++ b/wise-webapp/src/test/resources/data/export/bigmap.csv @@ -1,601 +1,105 @@ corona -, - Modelo in world -, - , - International market protected Modelo from unstable peso -, - , - Fifth largest distributor in world -, - , - , - Can they sustain that trend -, - , - , - in 12 years -, - , - One of top 10 breweries in world -, - Carloz Fernandez CEO -, - , - CEO Since 1997 -, - , - , - 29 years old -, - , - , - , - working there since 13 -, - , - vision: top five brewers -, - , - , - International Business model -, - , - , - , - experienced local distributors -, - , - , - , - Growing international demand -, - , - , - , - Capitalize on NAFTA -, - , - , - top 10 beer producers in world -, - , - , - , - 7.8 % sales growth compounded over ten years -, - , - , - , - 2005 -, - , - , - , - , - 12.3 % exports -, - , - , - , - , - 4% increase domestically -, - , - , - , - , - export sales 30% -, - , - , - , - Corona Extra -, - , - , - , - , - worlds fourth best selling beer -, - , - , - , - , - 56% shar of domestic market -, - , - , - , - , - Since 1997 #1 import in US -, - , - , - , - , - , - outsold competitor by 50% -, - , - Expanding production -, - , - , - renovate facility in Zacatecas -, - , - , - 300 million investment -, - US Beer Market -, - , - 2nd largest nest to China -, - , - Consumption six times higher per cap -, - , - Groth expectations reduced -, - , - 80% of market -, - , - , - AB -, - , - , - , - 75% of industry profits -, - , - , - adolf coors -, - , - , - Miller -, - , - dense network of regional craft brewing -, - , - volume main driver -, - Modelo in Mexico -, - , - History to 1970 -, - , - , - formed in 1922 -, - , - , - , - Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr -, - , - , - , - Iriarte died in 1932 -, - , - , - , - Diez sole owner 1936 -, - , - , - , - Fernandez Family Sole owner since 1936 -, - , - , - focus on Mexico City -, - , - , - Modelo 1st Brand -, - , - , - Corona 2nd Brand -, - , - , - , - Clear Glass Customers preference -, - , - , - 1940s period of strong growth -, - , - , - , - concentrate domesti¬cally -, - , - , - , - improve distribution methods and produc¬tion facilities -, - , - , - , - , - distribution: direct with profit sharing -, - , - , - bought the brands and assets of the Toluca y Mexico Brewery -, - , - , - , - 1935 -, - , - , - , - country's oldest brand of beer -, - , - 1971, Antonino Fernandez was appointed CEO -, - , - , - Mexican Stock exchange in 1994 -, - , - , - Anheuser-Busch 17.7 % of the equity -, - , - , - , - The 50.2 % represented 43.9% voting -, - , - Largest Beer producer and distrubutor in Mexico -, - , - , - corona 56% share -, - Modelo in US -, - , - History -, - , - , - 1979 -, - , - , - Amalgamated Distillery Products Inc. ( -, - , - , - , - later renamed Barton Beers Ltd. -, - , - , - gained popularity in southern states -, - , - , - rapid growth 1980s -, - , - , - , - second most popular imported beer -, - , - , - 1991 -, - , - , - , - doubling of federal excise tax on beer -, - , - , - , - , - sales decrease of 15 percent -, - , - , - , - , - distributor absorb the tax 92 -, - , - , - , - distributors took the loss -, - , - 2007 5 beers to us -, - , - , - 3 of top 8 beers in US -, - , - , - Heineken -, - , - , - , - Main Import Comptitor -, - , - , - 131 million cases -, - , - Marketing -, - , - , - surfing mythology -, - , - , - not selling premium quality -, - , - , - not testosterone driven -, - , - , - found new following -, - , - , - beer for non beer drinkers -, - , - , - dependable second choise -, - , - , - Fun in the sun -, - , - , - , - Barton Beer's idea -, - , - , - , - escape -, - , - , - , - relaxation -, - , - , - 1996ad budget -, - , - , - , - Corona 5.1 mil -, - , - , - , - Heiniken 15 mil -, - , - , - , - an bsch 192 mil -, - , - Us dist contracts -, - , - , - importer/distributors -, - , - , - , - Local Companies -, - , - , - , - Autonomous -, - , - , - , - competitive relationship -, - , - , - , - transportation -, - , - , - , - insurance -, - , - , - , - pricing -, - , - , - , - customs -, - , - , - , - advertixing -, - , - , - procermex inc -, - , - , - , - Modelo us subsidiary -, - , - , - , - Support -, - , - , - , - Supervise -, - , - , - , - Coordinate -, - , - , - Modelo had final say on brand image -, - , - , - production in Mexico -, - , - , - Chicago based Barton Beers 1st -, - , - , - , - largest importer in 25 western states -, - , - , - Gambrinus -, - , - , - , - 1986 -, - , - , - , - eastern dist , The Beer market , , - traditionally a clustered market -, - , - many local breweries -, - , - no means of transport -, - , - colsolition happened in 1800s -, - , - different countries had different tastes -, - , - 90s national leaders expanded abroad -, - , - startup costs high + Future , , , - industry supported conectration -, - , - Interbrew + Sales were decreasing due to competitive media budgets , , , - Belgian -, - , - , - aquired breweries in 20 countries -, - , - , - sales in 110 countries -, - , - , - local managers controlling brands -, - , - , - flagship brand: Stella Artois -, - , - 2004 merger -, - , - , - #1 Interbrew -, - , - , - #5 Am Bev - Brazil -, - , - , - largest merge + Inbev in talks with Anh Bush , , , , - worth 12.8 billion + Two biggest companies will create huge company +, + , + , + other merger talks +, + , + , + domestic and foreign threats +, + , + Beer Marketing +, + , + , + People drink marketing , , 2007 , , , - inbev + Anh Bush , , , - SAP Miller + , + produces in foreign markets , , , Heineken +, + , + , + , + Dutch +, + , + , + , + reputation of top selling beer in world +, + , + , + , + marketing +, + , + , + , + , + 2006 aggressive marketing campaign +, + , + , + , + , + , + Heineken Premium Light +, + , + , + , + , + superior taste +, + , + , + , + , + no mythology +, + , + , + , + , + premium brand +, + , + , + , + , + premium beer , , , @@ -613,7 +117,7 @@ corona , , , - marketing + distribution , , , @@ -632,11 +136,6 @@ corona , , , - , - , - , - distribution -, , , , @@ -644,119 +143,243 @@ corona , , , + SAP Miller +, , , - premium beer + inbev +, + , + 2004 merger +, + , + , + largest merge +, + , + , + , + worth 12.8 billion +, + , + , + #5 Am Bev - Brazil +, + , + , + #1 Interbrew +, + , + Interbrew +, + , + , + flagship brand: Stella Artois +, + , + , + local managers controlling brands +, + , + , + sales in 110 countries +, + , + , + aquired breweries in 20 countries +, + , + , + Belgian +, + , + startup costs high +, + , + , + industry supported conectration +, + , + 90s national leaders expanded abroad +, + , + different countries had different tastes +, + , + colsolition happened in 1800s +, + , + no means of transport +, + , + many local breweries +, + , + traditionally a clustered market +, + Carloz Fernandez CEO +, + , + Expanding production +, + , + , + 300 million investment +, + , + , + renovate facility in Zacatecas +, + , + vision: top five brewers +, + , + , + top 10 beer producers in world +, + , + , + , + Corona Extra , , , , , - premium brand -, - , - , - , - , - no mythology -, - , - , - , - , - superior taste -, - , - , - , - , - 2006 aggressive marketing campaign + Since 1997 #1 import in US , , , , , , - Heineken Premium Light + outsold competitor by 50% , , , , - reputation of top selling beer in world + , + 56% shar of domestic market , , , , - Dutch -, , - , - Anh Bush + worlds fourth best selling beer , , , , - produces in foreign markets -, - , - Beer Marketing -, - , - , - People drink marketing -, - , - Future -, - , - , - domestic and foreign threats -, - , - , - other merger talks -, - , - , - Inbev in talks with Anh Bush + 2005 , , , , - Two biggest companies will create huge company + , + export sales 30% , , , - Sales were decreasing due to competitive media budgets + , + , + 4% increase domestically +, + , + , + , + , + 12.3 % exports +, + , + , + , + 7.8 % sales growth compounded over ten years +, + , + , + International Business model +, + , + , + , + Capitalize on NAFTA +, + , + , + , + Growing international demand +, + , + , + , + experienced local distributors +, + , + CEO Since 1997 +, + , + , + 29 years old +, + , + , + , + working there since 13 +, + Modelo in world +, + , + One of top 10 breweries in world +, + , + Fifth largest distributor in world +, + , + , + in 12 years +, + , + , + Can they sustain that trend +, + , + International market protected Modelo from unstable peso , Mexico Industry -, - , - has most trade agreements in world -, - , - one of the largest domestic beer markets -, - , - imported beer only 1% sales -, - , - , - half were anh bcsh dist by modelo -, - , - modelo -, - , - , - NAFTA S.A. An Bucsh -, - , - , - 62.8% of market , , FEMSA +, + , + , + foriegn market +, + , + , + , + Recently partnered with Heiniken for US market +, + , + , + , + , + 2005 18.7% growth +, + , + , + , + 90s entry to us market failed +, + , + , + , + Partnership Heiniken +, + , + , + , + , + Distribution in US , , , @@ -765,12 +388,23 @@ corona , , , - 37% of domestic market + NAFTA SACoca cola , , , , - production and distribution in Mexico: peso not a threat + , + Exclusive distributor +, + , + , + , + 997 to 2004 taking domestic market share +, + , + , + , + leads domestic premium beer market , , , @@ -786,51 +420,417 @@ corona , , , - leads domestic premium beer market + production and distribution in Mexico: peso not a threat , , , , - 997 to 2004 taking domestic market share + 37% of domestic market +, + , + modelo +, + , + , + 62.8% of market +, + , + , + NAFTA S.A. An Bucsh +, + , + imported beer only 1% sales +, + , + , + half were anh bcsh dist by modelo +, + , + one of the largest domestic beer markets +, + , + has most trade agreements in world +, + Modelo in Mexico +, + , + Largest Beer producer and distrubutor in Mexico +, + , + , + corona 56% share +, + , + 1971, Antonino Fernandez was appointed CEO +, + , + , + Anheuser-Busch 17.7 % of the equity , , , , - NAFTA SACoca cola + The 50.2 % represented 43.9% voting +, + , + , + Mexican Stock exchange in 1994 +, + , + History to 1970 +, + , + , + bought the brands and assets of the Toluca y Mexico Brewery +, + , + , + , + country's oldest brand of beer +, + , + , + , + 1935 +, + , + , + 1940s period of strong growth +, + , + , + , + improve distribution methods and produc¬tion facilities , , , , , - Exclusive distributor -, - , - , - foriegn market + distribution: direct with profit sharing , , , , - Partnership Heiniken + concentrate domesti¬cally +, + , + , + Corona 2nd Brand +, + , + , + , + Clear Glass Customers preference +, + , + , + Modelo 1st Brand +, + , + , + focus on Mexico City +, + , + , + formed in 1922 +, + , + , + , + Fernandez Family Sole owner since 1936 +, + , + , + , + Diez sole owner 1936 +, + , + , + , + Iriarte died in 1932 +, + , + , + , + Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr +, + US Beer Market +, + , + volume main driver +, + , + dense network of regional craft brewing +, + , + 80% of market +, + , + , + Miller +, + , + , + adolf coors +, + , + , + AB +, + , + , + , + 75% of industry profits +, + , + Groth expectations reduced +, + , + Consumption six times higher per cap +, + , + 2nd largest nest to China +, + Modelo in US +, + , + Us dist contracts +, + , + , + Gambrinus +, + , + , + , + eastern dist +, + , + , + , + 1986 +, + , + , + Chicago based Barton Beers 1st +, + , + , + , + largest importer in 25 western states +, + , + , + production in Mexico +, + , + , + Modelo had final say on brand image +, + , + , + procermex inc +, + , + , + , + Coordinate +, + , + , + , + Supervise +, + , + , + , + Support +, + , + , + , + Modelo us subsidiary +, + , + , + importer/distributors +, + , + , + , + advertixing +, + , + , + , + customs +, + , + , + , + pricing +, + , + , + , + insurance +, + , + , + , + transportation +, + , + , + , + competitive relationship +, + , + , + , + Autonomous +, + , + , + , + Local Companies +, + , + Marketing +, + , + , + 1996ad budget +, + , + , + , + an bsch 192 mil +, + , + , + , + Heiniken 15 mil +, + , + , + , + Corona 5.1 mil +, + , + , + Fun in the sun +, + , + , + , + relaxation +, + , + , + , + escape +, + , + , + , + Barton Beer's idea +, + , + , + dependable second choise +, + , + , + beer for non beer drinkers +, + , + , + found new following +, + , + , + not testosterone driven +, + , + , + not selling premium quality +, + , + , + surfing mythology +, + , + 2007 5 beers to us +, + , + , + 131 million cases +, + , + , + Heineken +, + , + , + , + Main Import Comptitor +, + , + , + 3 of top 8 beers in US +, + , + History +, + , + , + 1991 +, + , + , + , + distributors took the loss +, + , + , + , + doubling of federal excise tax on beer , , , , , - Distribution in US -, - , - , - , - 90s entry to us market failed -, - , - , - , - Recently partnered with Heiniken for US market + distributor absorb the tax 92 , , , , , - 2005 18.7% growth + sales decrease of 15 percent +, + , + , + rapid growth 1980s +, + , + , + , + second most popular imported beer +, + , + , + gained popularity in southern states +, + , + , + Amalgamated Distillery Products Inc. ( +, + , + , + , + later renamed Barton Beers Ltd. +, + , + , + 1979 diff --git a/wise-webapp/src/test/resources/data/export/bigmap.doc b/wise-webapp/src/test/resources/data/export/bigmap.doc index 25bc30b8..debdbe7d 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.doc +++ b/wise-webapp/src/test/resources/data/export/bigmap.doc @@ -267,7 +267,7 @@ -Modelo in world +The Beer market @@ -276,17 +276,7 @@ -International market protected Modelo from unstable peso - - - - - - - - - -Fifth largest distributor in world +Future @@ -295,7 +285,7 @@ -Can they sustain that trend +Sales were decreasing due to competitive media budgets @@ -305,7 +295,37 @@ -in 12 years +Inbev in talks with Anh Bush + + + + + + + + +Two biggest companies will create huge company + + + + + + + + + + +other merger talks + + + + + + + + + +domestic and foreign threats @@ -316,7 +336,395 @@ -One of top 10 breweries in world +Beer Marketing + + + + + + + + +People drink marketing + + + + + + + + + + +2007 + + + + + + + + +Anh Bush + + + + + + + + +produces in foreign markets + + + + + + + + + + +Heineken + + + + + + + + +Dutch + + + + + + + + + +reputation of top selling beer in world + + + + + + + + + +marketing + + + + + + + +2006 aggressive marketing campaign + + + + + + + +Heineken Premium Light + + + + + + + +superior taste + + + + + + + +no mythology + + + + + + + +premium brand + + + + + + + +premium beer + + + + + + + + + +produces beer domestically + + + + + + + +parent of local distributors + + + + + + + +distribution + + + + + + + +importing + + + + + + + +import taxes passed on to consumer + + + + + + + +marketing + + + + + + + + + + +SAP Miller + + + + + + + + + +inbev + + + + + + + + + + +2004 merger + + + + + + + + +largest merge + + + + + + + + +worth 12.8 billion + + + + + + + + + + +#5 Am Bev - Brazil + + + + + + + + + +#1 Interbrew + + + + + + + + + + +Interbrew + + + + + + + + +flagship brand: Stella Artois + + + + + + + + + +local managers controlling brands + + + + + + + + + +sales in 110 countries + + + + + + + + + +aquired breweries in 20 countries + + + + + + + + + +Belgian + + + + + + + + + + +startup costs high + + + + + + + + +industry supported conectration + + + + + + + + + + +90s national leaders expanded abroad + + + + + + + + + +different countries had different tastes + + + + + + + + + +colsolition happened in 1800s + + + + + + + + + +no means of transport + + + + + + + + + +many local breweries + + + + + + + + + +traditionally a clustered market @@ -336,6 +744,182 @@ +Expanding production + + + + + + + + +300 million investment + + + + + + + + + +renovate facility in Zacatecas + + + + + + + + + + +vision: top five brewers + + + + + + + + +top 10 beer producers in world + + + + + + + + +Corona Extra + + + + + + + +Since 1997 #1 import in US + + + + + + + +outsold competitor by 50% + + + + + + + +56% shar of domestic market + + + + + + + +worlds fourth best selling beer + + + + + + + + + +2005 + + + + + + + +export sales 30% + + + + + + + +4% increase domestically + + + + + + + +12.3 % exports + + + + + + + + + +7.8 % sales growth compounded over ten years + + + + + + + + + + +International Business model + + + + + + + + +Capitalize on NAFTA + + + + + + + + + +Growing international demand + + + + + + + + + +experienced local distributors + + + + + + + + + + + CEO Since 1997 @@ -360,13 +944,33 @@ + + + + + + + +Modelo in world + + -vision: top five brewers +One of top 10 breweries in world + + + + + + + + + +Fifth largest distributor in world @@ -375,39 +979,9 @@ -International Business model +in 12 years - - - - - - -experienced local distributors - - - - - - - - - -Growing international demand - - - - - - - - - -Capitalize on NAFTA - - - @@ -415,95 +989,9 @@ -top 10 beer producers in world +Can they sustain that trend - - - - - - -7.8 % sales growth compounded over ten years - - - - - - - - - -2005 - - - - - - - -12.3 % exports - - - - - - - -4% increase domestically - - - - - - - -export sales 30% - - - - - - - - - -Corona Extra - - - - - - - -worlds fourth best selling beer - - - - - - - -56% shar of domestic market - - - - - - - -Since 1997 #1 import in US - - - - - - - -outsold competitor by 50% - - - @@ -512,29 +1000,9 @@ -Expanding production +International market protected Modelo from unstable peso - - - - - - -renovate facility in Zacatecas - - - - - - - - - -300 million investment - - - @@ -543,7 +1011,7 @@ -US Beer Market +Mexico Industry @@ -552,37 +1020,7 @@ -2nd largest nest to China - - - - - - - - - -Consumption six times higher per cap - - - - - - - - - -Groth expectations reduced - - - - - - - - - -80% of market +FEMSA @@ -591,7 +1029,7 @@ -AB +foriegn market @@ -600,7 +1038,43 @@ -75% of industry profits +Recently partnered with Heiniken for US market + + + + + + + +2005 18.7% growth + + + + + + + + + +90s entry to us market failed + + + + + + + + + +Partnership Heiniken + + + + + + + +Distribution in US @@ -611,7 +1085,103 @@ -adolf coors +domestic market + + + + + + + + +NAFTA SACoca cola + + + + + + + +Exclusive distributor + + + + + + + + + +997 to 2004 taking domestic market share + + + + + + + + + +leads domestic premium beer market + + + + + + + + + +Owns Oxxo C + + + + + + + +CA largest chain of conv stores + + + + + + + + + +production and distribution in Mexico: peso not a threat + + + + + + + + + +37% of domestic market + + + + + + + + + + + +modelo + + + + + + + + +62.8% of market @@ -621,7 +1191,7 @@ -Miller +NAFTA S.A. An Bucsh @@ -632,7 +1202,27 @@ -dense network of regional craft brewing +imported beer only 1% sales + + + + + + + + +half were anh bcsh dist by modelo + + + + + + + + + + +one of the largest domestic beer markets @@ -642,7 +1232,7 @@ -volume main driver +has most trade agreements in world @@ -662,6 +1252,66 @@ +Largest Beer producer and distrubutor in Mexico + + + + + + + + +corona 56% share + + + + + + + + + + +1971, Antonino Fernandez was appointed CEO + + + + + + + + +Anheuser-Busch 17.7 % of the equity + + + + + + + + +The 50.2 % represented 43.9% voting + + + + + + + + + + +Mexican Stock exchange in 1994 + + + + + + + + + + History to 1970 @@ -671,7 +1321,7 @@ -formed in 1922 +bought the brands and assets of the Toluca y Mexico Brewery @@ -680,7 +1330,7 @@ -Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr +country's oldest brand of beer @@ -690,27 +1340,7 @@ -Iriarte died in 1932 - - - - - - - - - -Diez sole owner 1936 - - - - - - - - - -Fernandez Family Sole owner since 1936 +1935 @@ -721,20 +1351,38 @@ -focus on Mexico City +1940s period of strong growth + + + + + + + + +improve distribution methods and produc¬tion facilities + + + + + + + +distribution: direct with profit sharing - + -Modelo 1st Brand +concentrate domesti¬cally + @@ -761,37 +1409,9 @@ -1940s period of strong growth +Modelo 1st Brand - - - - - - -concentrate domesti¬cally - - - - - - - - - -improve distribution methods and produc¬tion facilities - - - - - - - -distribution: direct with profit sharing - - - @@ -799,7 +1419,17 @@ -bought the brands and assets of the Toluca y Mexico Brewery +focus on Mexico City + + + + + + + + + +formed in 1922 @@ -808,7 +1438,7 @@ -1935 +Fernandez Family Sole owner since 1936 @@ -818,7 +1448,107 @@ -country's oldest brand of beer +Diez sole owner 1936 + + + + + + + + + +Iriarte died in 1932 + + + + + + + + + +Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr + + + + + + + + + + + + +US Beer Market + + + + + + + + +volume main driver + + + + + + + + + +dense network of regional craft brewing + + + + + + + + + +80% of market + + + + + + + + +Miller + + + + + + + + + +adolf coors + + + + + + + + + +AB + + + + + + + + +75% of industry profits @@ -830,39 +1560,9 @@ -1971, Antonino Fernandez was appointed CEO +Groth expectations reduced - - - - - - -Mexican Stock exchange in 1994 - - - - - - - - - -Anheuser-Busch 17.7 % of the equity - - - - - - - - -The 50.2 % represented 43.9% voting - - - - @@ -870,19 +1570,19 @@ -Largest Beer producer and distrubutor in Mexico - - - - - - - - -corona 56% share +Consumption six times higher per cap + + + + + + +2nd largest nest to China + + @@ -900,7 +1600,7 @@ -History +Us dist contracts @@ -909,17 +1609,7 @@ -1979 - - - - - - - - - -Amalgamated Distillery Products Inc. ( +Gambrinus @@ -928,73 +1618,7 @@ -later renamed Barton Beers Ltd. - - - - - - - - - - -gained popularity in southern states - - - - - - - - - -rapid growth 1980s - - - - - - - - -second most popular imported beer - - - - - - - - - - -1991 - - - - - - - - -doubling of federal excise tax on beer - - - - - - - -sales decrease of 15 percent - - - - - - - -distributor absorb the tax 92 +eastern dist @@ -1004,11 +1628,341 @@ -distributors took the loss +1986 + + + + + + +Chicago based Barton Beers 1st + + + + + + + + +largest importer in 25 western states + + + + + + + + + + +production in Mexico + + + + + + + + + +Modelo had final say on brand image + + + + + + + + + +procermex inc + + + + + + + + +Coordinate + + + + + + + + + +Supervise + + + + + + + + + +Support + + + + + + + + + +Modelo us subsidiary + + + + + + + + + + +importer/distributors + + + + + + + + +advertixing + + + + + + + + + +customs + + + + + + + + + +pricing + + + + + + + + + +insurance + + + + + + + + + +transportation + + + + + + + + + +competitive relationship + + + + + + + + + +Autonomous + + + + + + + + + +Local Companies + + + + + + + + + + + +Marketing + + + + + + + + +1996ad budget + + + + + + + + +an bsch 192 mil + + + + + + + + + +Heiniken 15 mil + + + + + + + + + +Corona 5.1 mil + + + + + + + + + + +Fun in the sun + + + + + + + + +relaxation + + + + + + + + + +escape + + + + + + + + + +Barton Beer's idea + + + + + + + + + + +dependable second choise + + + + + + + + + +beer for non beer drinkers + + + + + + + + + +found new following + + + + + + + + + +not testosterone driven + + + + + + + + + +not selling premium quality + + + + + + + + + +surfing mythology + + + @@ -1025,7 +1979,7 @@ -3 of top 8 beers in US +131 million cases @@ -1055,7 +2009,7 @@ -131 million cases +3 of top 8 beers in US @@ -1066,7 +2020,7 @@ -Marketing +History @@ -1075,67 +2029,7 @@ -surfing mythology - - - - - - - - - -not selling premium quality - - - - - - - - - -not testosterone driven - - - - - - - - - -found new following - - - - - - - - - -beer for non beer drinkers - - - - - - - - - -dependable second choise - - - - - - - - - -Fun in the sun +1991 @@ -1144,7 +2038,7 @@ -Barton Beer's idea +distributors took the loss @@ -1154,527 +2048,7 @@ -escape - - - - - - - - - -relaxation - - - - - - - - - - -1996ad budget - - - - - - - - -Corona 5.1 mil - - - - - - - - - -Heiniken 15 mil - - - - - - - - - -an bsch 192 mil - - - - - - - - - - - -Us dist contracts - - - - - - - - -importer/distributors - - - - - - - - -Local Companies - - - - - - - - - -Autonomous - - - - - - - - - -competitive relationship - - - - - - - - - -transportation - - - - - - - - - -insurance - - - - - - - - - -pricing - - - - - - - - - -customs - - - - - - - - - -advertixing - - - - - - - - - - -procermex inc - - - - - - - - -Modelo us subsidiary - - - - - - - - - -Support - - - - - - - - - -Supervise - - - - - - - - - -Coordinate - - - - - - - - - - -Modelo had final say on brand image - - - - - - - - - -production in Mexico - - - - - - - - - -Chicago based Barton Beers 1st - - - - - - - - -largest importer in 25 western states - - - - - - - - - - -Gambrinus - - - - - - - - -1986 - - - - - - - - - -eastern dist - - - - - - - - - - - - -The Beer market - - - - - - - - -traditionally a clustered market - - - - - - - - - -many local breweries - - - - - - - - - -no means of transport - - - - - - - - - -colsolition happened in 1800s - - - - - - - - - -different countries had different tastes - - - - - - - - - -90s national leaders expanded abroad - - - - - - - - - -startup costs high - - - - - - - - -industry supported conectration - - - - - - - - - - -Interbrew - - - - - - - - -Belgian - - - - - - - - - -aquired breweries in 20 countries - - - - - - - - - -sales in 110 countries - - - - - - - - - -local managers controlling brands - - - - - - - - - -flagship brand: Stella Artois - - - - - - - - - - -2004 merger - - - - - - - - -#1 Interbrew - - - - - - - - - -#5 Am Bev - Brazil - - - - - - - - - -largest merge - - - - - - - - -worth 12.8 billion - - - - - - - - - - - -2007 - - - - - - - - -inbev - - - - - - - - - -SAP Miller - - - - - - - - - -Heineken - - - - - - - - -produces beer domestically +doubling of federal excise tax on beer @@ -1682,7 +2056,7 @@ -parent of local distributors +distributor absorb the tax 92 @@ -1690,109 +2064,7 @@ -marketing - - - - - - - -importing - - - - - - - -import taxes passed on to consumer - - - - - - - -distribution - - - - - - - - - -marketing - - - - - - - -premium beer - - - - - - - -premium brand - - - - - - - -no mythology - - - - - - - -superior taste - - - - - - - -2006 aggressive marketing campaign - - - - - - - -Heineken Premium Light - - - - - - - - - -reputation of top selling beer in world - - - - - - - - - -Dutch +sales decrease of 15 percent @@ -1803,7 +2075,7 @@ -Anh Bush +rapid growth 1980s @@ -1812,77 +2084,7 @@ -produces in foreign markets - - - - - - - - - - - -Beer Marketing - - - - - - - - -People drink marketing - - - - - - - - - - -Future - - - - - - - - -domestic and foreign threats - - - - - - - - - -other merger talks - - - - - - - - - -Inbev in talks with Anh Bush - - - - - - - - -Two biggest companies will create huge company +second most popular imported beer @@ -1893,77 +2095,7 @@ -Sales were decreasing due to competitive media budgets - - - - - - - - - - - -Mexico Industry - - - - - - - - -has most trade agreements in world - - - - - - - - - -one of the largest domestic beer markets - - - - - - - - - -imported beer only 1% sales - - - - - - - - -half were anh bcsh dist by modelo - - - - - - - - - - -modelo - - - - - - - - -NAFTA S.A. An Bucsh +gained popularity in southern states @@ -1973,27 +2105,7 @@ -62.8% of market - - - - - - - - - - -FEMSA - - - - - - - - -domestic market +Amalgamated Distillery Products Inc. ( @@ -2002,73 +2114,7 @@ -37% of domestic market - - - - - - - - - -production and distribution in Mexico: peso not a threat - - - - - - - - - -Owns Oxxo C - - - - - - - -CA largest chain of conv stores - - - - - - - - - -leads domestic premium beer market - - - - - - - - - -997 to 2004 taking domestic market share - - - - - - - - - -NAFTA SACoca cola - - - - - - - -Exclusive distributor +later renamed Barton Beers Ltd. @@ -2079,55 +2125,9 @@ -foriegn market +1979 - - - - - - -Partnership Heiniken - - - - - - - -Distribution in US - - - - - - - - - -90s entry to us market failed - - - - - - - - - -Recently partnered with Heiniken for US market - - - - - - - -2005 18.7% growth - - - diff --git a/wise-webapp/src/test/resources/data/export/bigmap.latex b/wise-webapp/src/test/resources/data/export/bigmap.latex index c883f7b6..151a7493 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.latex +++ b/wise-webapp/src/test/resources/data/export/bigmap.latex @@ -1,251 +1,251 @@ \chapter{corona}\label{ID_null} - \section{Modelo in world}\label{ID_null} - \subsection{International market protected Modelo from unstable peso}\label{ID_null} - \subsection{Fifth largest distributor in world}\label{ID_null} - \subsubsection{Can they sustain that trend}\label{ID_null} - \subsubsection{in 12 years}\label{ID_null} - \subsection{One of top 10 breweries in world}\label{ID_null} - \section{Carloz Fernandez CEO}\label{ID_null} - \subsection{CEO Since 1997}\label{ID_null} - \subsubsection{29 years old}\label{ID_null}working there since 13\par - - \subsection{vision: top five brewers}\label{ID_null} - \subsubsection{International Business model}\label{ID_null}\begin{itemize} - \item \label{ID_null}experienced local distributors\par - \item \label{ID_null}Growing international demand\par - \item \label{ID_null}Capitalize on NAFTA\par - - \end{itemize} - - \subsubsection{top 10 beer producers in world}\label{ID_null}\begin{itemize} - \item \label{ID_null}7.8 % sales growth compounded over ten years\par - \item \label{ID_null}2005\par - \begin{itemize} - \item \label{ID_null}12.3 % exports\par - \item \label{ID_null}4% increase domestically\par - \item \label{ID_null}export sales 30%\par - - \end{itemize} - \item \label{ID_null}Corona Extra\par - \begin{itemize} - \item \label{ID_null}worlds fourth best selling beer\par - \item \label{ID_null}56% shar of domestic market\par - \item \label{ID_null}Since 1997 #1 import in US\par - outsold competitor by 50%\par - - \end{itemize} - - \end{itemize} - - \subsection{Expanding production }\label{ID_null} - \subsubsection{renovate facility in Zacatecas}\label{ID_null} - \subsubsection{300 million investment}\label{ID_null} - \section{US Beer Market}\label{ID_null} - \subsection{2nd largest nest to China}\label{ID_null} - \subsection{Consumption six times higher per cap}\label{ID_null} - \subsection{Groth expectations reduced}\label{ID_null} - \subsection{80% of market}\label{ID_null} - \subsubsection{AB}\label{ID_null}75% of industry profits\par - - \subsubsection{adolf coors}\label{ID_null} - \subsubsection{Miller}\label{ID_null} - \subsection{dense network of regional craft brewing}\label{ID_null} - \subsection{volume main driver}\label{ID_null} - \section{Modelo in Mexico}\label{ID_null} - \subsection{History to 1970}\label{ID_null} - \subsubsection{formed in 1922}\label{ID_null}\begin{itemize} - \item \label{ID_null}Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr\par - \item \label{ID_null}Iriarte died in 1932\par - \item \label{ID_null}Diez sole owner 1936\par - \item \label{ID_null}Fernandez Family Sole owner since 1936\par - - \end{itemize} - - \subsubsection{focus on Mexico City}\label{ID_null} - \subsubsection{Modelo 1st Brand}\label{ID_null} - \subsubsection{Corona 2nd Brand}\label{ID_null}Clear Glass Customers preference\par - - \subsubsection{1940s period of strong growth }\label{ID_null}\begin{itemize} - \item \label{ID_null}concentrate domesti¬cally \par - \item \label{ID_null}improve distribution methods and produc¬tion facilities \par - distribution: direct with profit sharing\par - - \end{itemize} - - \subsubsection{bought the brands and assets of the Toluca y Mexico Brewery}\label{ID_null}\begin{itemize} - \item \label{ID_null}1935\par - \item \label{ID_null}country's oldest brand of beer\par - - \end{itemize} - - \subsection{1971, Antonino Fernandez was appointed CEO}\label{ID_null} - \subsubsection{Mexican Stock exchange in 1994}\label{ID_null} - \subsubsection{Anheuser-Busch 17.7 % of the equity}\label{ID_null}The 50.2 % represented 43.9% voting\par - - \subsection{Largest Beer producer and distrubutor in Mexico}\label{ID_null} - \subsubsection{corona 56% share}\label{ID_null} - \section{Modelo in US}\label{ID_null} - \subsection{History}\label{ID_null} - \subsubsection{1979}\label{ID_null} - \subsubsection{Amalgamated Distillery Products Inc. (}\label{ID_null}later renamed Barton Beers Ltd.\par - - \subsubsection{gained popularity in southern states}\label{ID_null} - \subsubsection{rapid growth 1980s}\label{ID_null}second most popular imported beer\par - - \subsubsection{1991}\label{ID_null}\begin{itemize} - \item \label{ID_null}doubling of federal excise tax on beer\par - \begin{itemize} - \item \label{ID_null}sales decrease of 15 percent\par - \item \label{ID_null}distributor absorb the tax 92\par - - \end{itemize} - \item \label{ID_null}distributors took the loss\par - - \end{itemize} - - \subsection{2007 5 beers to us}\label{ID_null} - \subsubsection{3 of top 8 beers in US}\label{ID_null} - \subsubsection{Heineken}\label{ID_null}Main Import Comptitor\par - - \subsubsection{131 million cases}\label{ID_null} - \subsection{Marketing}\label{ID_null} - \subsubsection{surfing mythology}\label{ID_null} - \subsubsection{not selling premium quality}\label{ID_null} - \subsubsection{not testosterone driven}\label{ID_null} - \subsubsection{found new following}\label{ID_null} - \subsubsection{beer for non beer drinkers}\label{ID_null} - \subsubsection{dependable second choise}\label{ID_null} - \subsubsection{Fun in the sun}\label{ID_null}\begin{itemize} - \item \label{ID_null}Barton Beer's idea\par - \item \label{ID_null}escape\par - \item \label{ID_null}relaxation\par - - \end{itemize} - - \subsubsection{1996ad budget}\label{ID_null}\begin{itemize} - \item \label{ID_null}Corona 5.1 mil\par - \item \label{ID_null}Heiniken 15 mil\par - \item \label{ID_null}an bsch 192 mil\par - - \end{itemize} - - \subsection{Us dist contracts}\label{ID_null} - \subsubsection{importer/distributors}\label{ID_null}\begin{itemize} - \item \label{ID_null}Local Companies\par - \item \label{ID_null}Autonomous\par - \item \label{ID_null}competitive relationship\par - \item \label{ID_null}transportation\par - \item \label{ID_null}insurance\par - \item \label{ID_null}pricing\par - \item \label{ID_null}customs\par - \item \label{ID_null}advertixing\par - - \end{itemize} - - \subsubsection{procermex inc}\label{ID_null}\begin{itemize} - \item \label{ID_null}Modelo us subsidiary\par - \item \label{ID_null}Support\par - \item \label{ID_null}Supervise\par - \item \label{ID_null}Coordinate\par - - \end{itemize} - - \subsubsection{Modelo had final say on brand image}\label{ID_null} - \subsubsection{production in Mexico}\label{ID_null} - \subsubsection{Chicago based Barton Beers 1st}\label{ID_null}largest importer in 25 western states\par - - \subsubsection{Gambrinus}\label{ID_null}\begin{itemize} - \item \label{ID_null}1986\par - \item \label{ID_null}eastern dist\par - - \end{itemize} - \section{The Beer market}\label{ID_null} - \subsection{traditionally a clustered market}\label{ID_null} - \subsection{many local breweries}\label{ID_null} - \subsection{no means of transport}\label{ID_null} - \subsection{colsolition happened in 1800s}\label{ID_null} - \subsection{different countries had different tastes}\label{ID_null} - \subsection{90s national leaders expanded abroad}\label{ID_null} - \subsection{startup costs high}\label{ID_null} - \subsubsection{industry supported conectration}\label{ID_null} - \subsection{Interbrew}\label{ID_null} - \subsubsection{Belgian}\label{ID_null} - \subsubsection{aquired breweries in 20 countries}\label{ID_null} - \subsubsection{sales in 110 countries}\label{ID_null} - \subsubsection{local managers controlling brands}\label{ID_null} - \subsubsection{flagship brand: Stella Artois}\label{ID_null} - \subsection{2004 merger}\label{ID_null} - \subsubsection{#1 Interbrew}\label{ID_null} - \subsubsection{#5 Am Bev - Brazil}\label{ID_null} - \subsubsection{largest merge}\label{ID_null}worth 12.8 billion\par + \subsection{Future}\label{ID_null} + \subsubsection{Sales were decreasing due to competitive media budgets}\label{ID_null} + \subsubsection{Inbev in talks with Anh Bush}\label{ID_null}Two biggest companies will create huge company\par + \subsubsection{other merger talks}\label{ID_null} + \subsubsection{domestic and foreign threats}\label{ID_null} + \subsection{Beer Marketing}\label{ID_null} + \subsubsection{People drink marketing}\label{ID_null} \subsection{2007}\label{ID_null} - \subsubsection{inbev}\label{ID_null} - \subsubsection{SAP Miller}\label{ID_null} + \subsubsection{Anh Bush}\label{ID_null}produces in foreign markets\par + \subsubsection{Heineken}\label{ID_null}\begin{itemize} + \item \label{ID_null}Dutch\par + \item \label{ID_null}reputation of top selling beer in world\par + \item \label{ID_null}marketing\par + \begin{itemize} + \item \label{ID_null}2006 aggressive marketing campaign\par + Heineken Premium Light\par + \item \label{ID_null}superior taste\par + \item \label{ID_null}no mythology\par + \item \label{ID_null}premium brand\par + \item \label{ID_null}premium beer\par + + \end{itemize} \item \label{ID_null}produces beer domestically\par parent of local distributors\par \begin{itemize} - \item \label{ID_null}marketing\par + \item \label{ID_null}distribution\par \item \label{ID_null}importing\par import taxes passed on to consumer\par - \item \label{ID_null}distribution\par - - \end{itemize} - \item \label{ID_null}marketing\par - \begin{itemize} - \item \label{ID_null}premium beer\par - \item \label{ID_null}premium brand\par - \item \label{ID_null}no mythology\par - \item \label{ID_null}superior taste\par - \item \label{ID_null}2006 aggressive marketing campaign\par - Heineken Premium Light\par - - \end{itemize} - \item \label{ID_null}reputation of top selling beer in world\par - \item \label{ID_null}Dutch\par + \item \label{ID_null}marketing\par \end{itemize} - \subsubsection{Anh Bush}\label{ID_null}produces in foreign markets\par + \end{itemize} + + \subsubsection{SAP Miller}\label{ID_null} + \subsubsection{inbev}\label{ID_null} + \subsection{2004 merger}\label{ID_null} + \subsubsection{largest merge}\label{ID_null}worth 12.8 billion\par - \subsection{Beer Marketing}\label{ID_null} - \subsubsection{People drink marketing}\label{ID_null} - \subsection{Future}\label{ID_null} - \subsubsection{domestic and foreign threats}\label{ID_null} - \subsubsection{other merger talks}\label{ID_null} - \subsubsection{Inbev in talks with Anh Bush}\label{ID_null}Two biggest companies will create huge company\par + \subsubsection{#5 Am Bev - Brazil}\label{ID_null} + \subsubsection{#1 Interbrew}\label{ID_null} + \subsection{Interbrew}\label{ID_null} + \subsubsection{flagship brand: Stella Artois}\label{ID_null} + \subsubsection{local managers controlling brands}\label{ID_null} + \subsubsection{sales in 110 countries}\label{ID_null} + \subsubsection{aquired breweries in 20 countries}\label{ID_null} + \subsubsection{Belgian}\label{ID_null} + \subsection{startup costs high}\label{ID_null} + \subsubsection{industry supported conectration}\label{ID_null} + \subsection{90s national leaders expanded abroad}\label{ID_null} + \subsection{different countries had different tastes}\label{ID_null} + \subsection{colsolition happened in 1800s}\label{ID_null} + \subsection{no means of transport}\label{ID_null} + \subsection{many local breweries}\label{ID_null} + \subsection{traditionally a clustered market}\label{ID_null} + \section{Carloz Fernandez CEO}\label{ID_null} + \subsection{Expanding production }\label{ID_null} + \subsubsection{300 million investment}\label{ID_null} + \subsubsection{renovate facility in Zacatecas}\label{ID_null} + \subsection{vision: top five brewers}\label{ID_null} + \subsubsection{top 10 beer producers in world}\label{ID_null}\begin{itemize} + \item \label{ID_null}Corona Extra\par + \begin{itemize} + \item \label{ID_null}Since 1997 #1 import in US\par + outsold competitor by 50%\par + \item \label{ID_null}56% shar of domestic market\par + \item \label{ID_null}worlds fourth best selling beer\par - \subsubsection{Sales were decreasing due to competitive media budgets}\label{ID_null} + \end{itemize} + \item \label{ID_null}2005\par + \begin{itemize} + \item \label{ID_null}export sales 30%\par + \item \label{ID_null}4% increase domestically\par + \item \label{ID_null}12.3 % exports\par + + \end{itemize} + \item \label{ID_null}7.8 % sales growth compounded over ten years\par + + \end{itemize} + + \subsubsection{International Business model}\label{ID_null}\begin{itemize} + \item \label{ID_null}Capitalize on NAFTA\par + \item \label{ID_null}Growing international demand\par + \item \label{ID_null}experienced local distributors\par + + \end{itemize} + + \subsection{CEO Since 1997}\label{ID_null} + \subsubsection{29 years old}\label{ID_null}working there since 13\par + + \section{Modelo in world}\label{ID_null} + \subsection{One of top 10 breweries in world}\label{ID_null} + \subsection{Fifth largest distributor in world}\label{ID_null} + \subsubsection{in 12 years}\label{ID_null} + \subsubsection{Can they sustain that trend}\label{ID_null} + \subsection{International market protected Modelo from unstable peso}\label{ID_null} \section{Mexico Industry}\label{ID_null} - \subsection{has most trade agreements in world}\label{ID_null} - \subsection{one of the largest domestic beer markets}\label{ID_null} - \subsection{imported beer only 1% sales}\label{ID_null} - \subsubsection{half were anh bcsh dist by modelo}\label{ID_null} - \subsection{modelo}\label{ID_null} - \subsubsection{NAFTA S.A. An Bucsh}\label{ID_null} - \subsubsection{62.8% of market}\label{ID_null} \subsection{FEMSA}\label{ID_null} + \subsubsection{foriegn market}\label{ID_null}\begin{itemize} + \item \label{ID_null}Recently partnered with Heiniken for US market\par + 2005 18.7% growth\par + \item \label{ID_null}90s entry to us market failed\par + \item \label{ID_null}Partnership Heiniken\par + Distribution in US\par + + \end{itemize} + \subsubsection{domestic market}\label{ID_null}\begin{itemize} - \item \label{ID_null}37% of domestic market\par - \item \label{ID_null}production and distribution in Mexico: peso not a threat\par + \item \label{ID_null}NAFTA SACoca cola\par + Exclusive distributor\par + \item \label{ID_null}997 to 2004 taking domestic market share\par + \item \label{ID_null}leads domestic premium beer market\par \item \label{ID_null}Owns Oxxo C\par CA largest chain of conv stores\par - \item \label{ID_null}leads domestic premium beer market\par - \item \label{ID_null}997 to 2004 taking domestic market share\par - \item \label{ID_null}NAFTA SACoca cola\par - Exclusive distributor\par + \item \label{ID_null}production and distribution in Mexico: peso not a threat\par + \item \label{ID_null}37% of domestic market\par \end{itemize} - \subsubsection{foriegn market}\label{ID_null}\begin{itemize} - \item \label{ID_null}Partnership Heiniken\par - Distribution in US\par - \item \label{ID_null}90s entry to us market failed\par - \item \label{ID_null}Recently partnered with Heiniken for US market\par - 2005 18.7% growth\par + \subsection{modelo}\label{ID_null} + \subsubsection{62.8% of market}\label{ID_null} + \subsubsection{NAFTA S.A. An Bucsh}\label{ID_null} + \subsection{imported beer only 1% sales}\label{ID_null} + \subsubsection{half were anh bcsh dist by modelo}\label{ID_null} + \subsection{one of the largest domestic beer markets}\label{ID_null} + \subsection{has most trade agreements in world}\label{ID_null} + \section{Modelo in Mexico}\label{ID_null} + \subsection{Largest Beer producer and distrubutor in Mexico}\label{ID_null} + \subsubsection{corona 56% share}\label{ID_null} + \subsection{1971, Antonino Fernandez was appointed CEO}\label{ID_null} + \subsubsection{Anheuser-Busch 17.7 % of the equity}\label{ID_null}The 50.2 % represented 43.9% voting\par + + \subsubsection{Mexican Stock exchange in 1994}\label{ID_null} + \subsection{History to 1970}\label{ID_null} + \subsubsection{bought the brands and assets of the Toluca y Mexico Brewery}\label{ID_null}\begin{itemize} + \item \label{ID_null}country's oldest brand of beer\par + \item \label{ID_null}1935\par \end{itemize} - \ No newline at end of file + + \subsubsection{1940s period of strong growth }\label{ID_null}\begin{itemize} + \item \label{ID_null}improve distribution methods and produc¬tion facilities \par + distribution: direct with profit sharing\par + \item \label{ID_null}concentrate domesti¬cally \par + + \end{itemize} + + \subsubsection{Corona 2nd Brand}\label{ID_null}Clear Glass Customers preference\par + + \subsubsection{Modelo 1st Brand}\label{ID_null} + \subsubsection{focus on Mexico City}\label{ID_null} + \subsubsection{formed in 1922}\label{ID_null}\begin{itemize} + \item \label{ID_null}Fernandez Family Sole owner since 1936\par + \item \label{ID_null}Diez sole owner 1936\par + \item \label{ID_null}Iriarte died in 1932\par + \item \label{ID_null}Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr\par + + \end{itemize} + + \section{US Beer Market}\label{ID_null} + \subsection{volume main driver}\label{ID_null} + \subsection{dense network of regional craft brewing}\label{ID_null} + \subsection{80% of market}\label{ID_null} + \subsubsection{Miller}\label{ID_null} + \subsubsection{adolf coors}\label{ID_null} + \subsubsection{AB}\label{ID_null}75% of industry profits\par + + \subsection{Groth expectations reduced}\label{ID_null} + \subsection{Consumption six times higher per cap}\label{ID_null} + \subsection{2nd largest nest to China}\label{ID_null} + \section{Modelo in US}\label{ID_null} + \subsection{Us dist contracts}\label{ID_null} + \subsubsection{Gambrinus}\label{ID_null}\begin{itemize} + \item \label{ID_null}eastern dist\par + \item \label{ID_null}1986\par + + \end{itemize} + + \subsubsection{Chicago based Barton Beers 1st}\label{ID_null}largest importer in 25 western states\par + + \subsubsection{production in Mexico}\label{ID_null} + \subsubsection{Modelo had final say on brand image}\label{ID_null} + \subsubsection{procermex inc}\label{ID_null}\begin{itemize} + \item \label{ID_null}Coordinate\par + \item \label{ID_null}Supervise\par + \item \label{ID_null}Support\par + \item \label{ID_null}Modelo us subsidiary\par + + \end{itemize} + + \subsubsection{importer/distributors}\label{ID_null}\begin{itemize} + \item \label{ID_null}advertixing\par + \item \label{ID_null}customs\par + \item \label{ID_null}pricing\par + \item \label{ID_null}insurance\par + \item \label{ID_null}transportation\par + \item \label{ID_null}competitive relationship\par + \item \label{ID_null}Autonomous\par + \item \label{ID_null}Local Companies\par + + \end{itemize} + + \subsection{Marketing}\label{ID_null} + \subsubsection{1996ad budget}\label{ID_null}\begin{itemize} + \item \label{ID_null}an bsch 192 mil\par + \item \label{ID_null}Heiniken 15 mil\par + \item \label{ID_null}Corona 5.1 mil\par + + \end{itemize} + + \subsubsection{Fun in the sun}\label{ID_null}\begin{itemize} + \item \label{ID_null}relaxation\par + \item \label{ID_null}escape\par + \item \label{ID_null}Barton Beer's idea\par + + \end{itemize} + + \subsubsection{dependable second choise}\label{ID_null} + \subsubsection{beer for non beer drinkers}\label{ID_null} + \subsubsection{found new following}\label{ID_null} + \subsubsection{not testosterone driven}\label{ID_null} + \subsubsection{not selling premium quality}\label{ID_null} + \subsubsection{surfing mythology}\label{ID_null} + \subsection{2007 5 beers to us}\label{ID_null} + \subsubsection{131 million cases}\label{ID_null} + \subsubsection{Heineken}\label{ID_null}Main Import Comptitor\par + + \subsubsection{3 of top 8 beers in US}\label{ID_null} + \subsection{History}\label{ID_null} + \subsubsection{1991}\label{ID_null}\begin{itemize} + \item \label{ID_null}distributors took the loss\par + \item \label{ID_null}doubling of federal excise tax on beer\par + \begin{itemize} + \item \label{ID_null}distributor absorb the tax 92\par + \item \label{ID_null}sales decrease of 15 percent\par + + \end{itemize} + + \end{itemize} + + \subsubsection{rapid growth 1980s}\label{ID_null}second most popular imported beer\par + + \subsubsection{gained popularity in southern states}\label{ID_null} + \subsubsection{Amalgamated Distillery Products Inc. (}\label{ID_null}later renamed Barton Beers Ltd.\par + + \subsubsection{1979}\label{ID_null} \ No newline at end of file diff --git a/wise-webapp/src/test/resources/data/export/bigmap.mm b/wise-webapp/src/test/resources/data/export/bigmap.mm index 6252a306..4ff96662 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.mm +++ b/wise-webapp/src/test/resources/data/export/bigmap.mm @@ -1,262 +1,262 @@ - + - - - - - - - - - - - - + + + + + + + - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - - + + + + - - - - - - - - + + + - - - - - - + + + + + - - - - - - - - - - + + + + + + + - - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wise-webapp/src/test/resources/data/export/bigmap.mmap b/wise-webapp/src/test/resources/data/export/bigmap.mmap index 94b3c7e8..9be4a731 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.mmap +++ b/wise-webapp/src/test/resources/data/export/bigmap.mmap @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/wise-webapp/src/test/resources/data/export/bigmap.odt b/wise-webapp/src/test/resources/data/export/bigmap.odt index de16a5bc..31ff1723 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.odt +++ b/wise-webapp/src/test/resources/data/export/bigmap.odt @@ -79,198 +79,198 @@ corona -Modelo in world -International market protected Modelo from unstable peso -Fifth largest distributor in world -Can they sustain that trend -in 12 years -One of top 10 breweries in world +The Beer market +Future +Sales were decreasing due to competitive media budgets +Inbev in talks with Anh Bush +Two biggest companies will create huge company +other merger talks +domestic and foreign threats +Beer Marketing +People drink marketing +2007 +Anh Bush +produces in foreign markets +Heineken +Dutch +reputation of top selling beer in world +marketing +2006 aggressive marketing campaign +Heineken Premium Light +superior taste +no mythology +premium brand +premium beer +produces beer domestically +parent of local distributors +distribution +importing +import taxes passed on to consumer +marketing +SAP Miller +inbev +2004 merger +largest merge +worth 12.8 billion +#5 Am Bev - Brazil +#1 Interbrew +Interbrew +flagship brand: Stella Artois +local managers controlling brands +sales in 110 countries +aquired breweries in 20 countries +Belgian +startup costs high +industry supported conectration +90s national leaders expanded abroad +different countries had different tastes +colsolition happened in 1800s +no means of transport +many local breweries +traditionally a clustered market Carloz Fernandez CEO +Expanding production +300 million investment +renovate facility in Zacatecas +vision: top five brewers +top 10 beer producers in world +Corona Extra +Since 1997 #1 import in US +outsold competitor by 50% +56% shar of domestic market +worlds fourth best selling beer +2005 +export sales 30% +4% increase domestically +12.3 % exports +7.8 % sales growth compounded over ten years +International Business model +Capitalize on NAFTA +Growing international demand +experienced local distributors CEO Since 1997 29 years old working there since 13 -vision: top five brewers -International Business model -experienced local distributors -Growing international demand -Capitalize on NAFTA -top 10 beer producers in world -7.8 % sales growth compounded over ten years -2005 -12.3 % exports -4% increase domestically -export sales 30% -Corona Extra -worlds fourth best selling beer -56% shar of domestic market -Since 1997 #1 import in US -outsold competitor by 50% -Expanding production -renovate facility in Zacatecas -300 million investment -US Beer Market -2nd largest nest to China -Consumption six times higher per cap -Groth expectations reduced -80% of market -AB -75% of industry profits -adolf coors -Miller -dense network of regional craft brewing -volume main driver -Modelo in Mexico -History to 1970 -formed in 1922 -Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr -Iriarte died in 1932 -Diez sole owner 1936 -Fernandez Family Sole owner since 1936 -focus on Mexico City -Modelo 1st Brand -Corona 2nd Brand -Clear Glass Customers preference -1940s period of strong growth -concentrate domesti¬cally -improve distribution methods and produc¬tion facilities -distribution: direct with profit sharing -bought the brands and assets of the Toluca y Mexico Brewery -1935 -country's oldest brand of beer -1971, Antonino Fernandez was appointed CEO -Mexican Stock exchange in 1994 -Anheuser-Busch 17.7 % of the equity -The 50.2 % represented 43.9% voting -Largest Beer producer and distrubutor in Mexico -corona 56% share -Modelo in US -History -1979 -Amalgamated Distillery Products Inc. ( -later renamed Barton Beers Ltd. -gained popularity in southern states -rapid growth 1980s -second most popular imported beer -1991 -doubling of federal excise tax on beer -sales decrease of 15 percent -distributor absorb the tax 92 -distributors took the loss -2007 5 beers to us -3 of top 8 beers in US -Heineken -Main Import Comptitor -131 million cases -Marketing -surfing mythology -not selling premium quality -not testosterone driven -found new following -beer for non beer drinkers -dependable second choise -Fun in the sun -Barton Beer's idea -escape -relaxation -1996ad budget -Corona 5.1 mil -Heiniken 15 mil -an bsch 192 mil -Us dist contracts -importer/distributors -Local Companies -Autonomous -competitive relationship -transportation -insurance -pricing -customs -advertixing -procermex inc -Modelo us subsidiary -Support -Supervise -Coordinate -Modelo had final say on brand image -production in Mexico -Chicago based Barton Beers 1st -largest importer in 25 western states -Gambrinus -1986 -eastern dist -The Beer market -traditionally a clustered market -many local breweries -no means of transport -colsolition happened in 1800s -different countries had different tastes -90s national leaders expanded abroad -startup costs high -industry supported conectration -Interbrew -Belgian -aquired breweries in 20 countries -sales in 110 countries -local managers controlling brands -flagship brand: Stella Artois -2004 merger -#1 Interbrew -#5 Am Bev - Brazil -largest merge -worth 12.8 billion -2007 -inbev -SAP Miller -Heineken -produces beer domestically -parent of local distributors -marketing -importing -import taxes passed on to consumer -distribution -marketing -premium beer -premium brand -no mythology -superior taste -2006 aggressive marketing campaign -Heineken Premium Light -reputation of top selling beer in world -Dutch -Anh Bush -produces in foreign markets -Beer Marketing -People drink marketing -Future -domestic and foreign threats -other merger talks -Inbev in talks with Anh Bush -Two biggest companies will create huge company -Sales were decreasing due to competitive media budgets +Modelo in world +One of top 10 breweries in world +Fifth largest distributor in world +in 12 years +Can they sustain that trend +International market protected Modelo from unstable peso Mexico Industry -has most trade agreements in world -one of the largest domestic beer markets -imported beer only 1% sales -half were anh bcsh dist by modelo -modelo -NAFTA S.A. An Bucsh -62.8% of market FEMSA -domestic market -37% of domestic market -production and distribution in Mexico: peso not a threat -Owns Oxxo C -CA largest chain of conv stores -leads domestic premium beer market -997 to 2004 taking domestic market share -NAFTA SACoca cola -Exclusive distributor foriegn market -Partnership Heiniken -Distribution in US -90s entry to us market failed Recently partnered with Heiniken for US market 2005 18.7% growth +90s entry to us market failed +Partnership Heiniken +Distribution in US +domestic market +NAFTA SACoca cola +Exclusive distributor +997 to 2004 taking domestic market share +leads domestic premium beer market +Owns Oxxo C +CA largest chain of conv stores +production and distribution in Mexico: peso not a threat +37% of domestic market +modelo +62.8% of market +NAFTA S.A. An Bucsh +imported beer only 1% sales +half were anh bcsh dist by modelo +one of the largest domestic beer markets +has most trade agreements in world +Modelo in Mexico +Largest Beer producer and distrubutor in Mexico +corona 56% share +1971, Antonino Fernandez was appointed CEO +Anheuser-Busch 17.7 % of the equity +The 50.2 % represented 43.9% voting +Mexican Stock exchange in 1994 +History to 1970 +bought the brands and assets of the Toluca y Mexico Brewery +country's oldest brand of beer +1935 +1940s period of strong growth +improve distribution methods and produc¬tion facilities +distribution: direct with profit sharing +concentrate domesti¬cally +Corona 2nd Brand +Clear Glass Customers preference +Modelo 1st Brand +focus on Mexico City +formed in 1922 +Fernandez Family Sole owner since 1936 +Diez sole owner 1936 +Iriarte died in 1932 +Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr +US Beer Market +volume main driver +dense network of regional craft brewing +80% of market +Miller +adolf coors +AB +75% of industry profits +Groth expectations reduced +Consumption six times higher per cap +2nd largest nest to China +Modelo in US +Us dist contracts +Gambrinus +eastern dist +1986 +Chicago based Barton Beers 1st +largest importer in 25 western states +production in Mexico +Modelo had final say on brand image +procermex inc +Coordinate +Supervise +Support +Modelo us subsidiary +importer/distributors +advertixing +customs +pricing +insurance +transportation +competitive relationship +Autonomous +Local Companies +Marketing +1996ad budget +an bsch 192 mil +Heiniken 15 mil +Corona 5.1 mil +Fun in the sun +relaxation +escape +Barton Beer's idea +dependable second choise +beer for non beer drinkers +found new following +not testosterone driven +not selling premium quality +surfing mythology +2007 5 beers to us +131 million cases +Heineken +Main Import Comptitor +3 of top 8 beers in US +History +1991 +distributors took the loss +doubling of federal excise tax on beer +distributor absorb the tax 92 +sales decrease of 15 percent +rapid growth 1980s +second most popular imported beer +gained popularity in southern states +Amalgamated Distillery Products Inc. ( +later renamed Barton Beers Ltd. +1979 diff --git a/wise-webapp/src/test/resources/data/export/bigmap.txt b/wise-webapp/src/test/resources/data/export/bigmap.txt index 28db9cff..bf11ed30 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.txt +++ b/wise-webapp/src/test/resources/data/export/bigmap.txt @@ -1,193 +1,193 @@ 1 corona - 1.1 Modelo in world - 1.1.1 International market protected Modelo from unstable peso - 1.1.2 Fifth largest distributor in world - 1.1.2.1 Can they sustain that trend - 1.1.2.2 in 12 years - 1.1.3 One of top 10 breweries in world + 1.1 The Beer market + 1.1.1 Future + 1.1.1.1 Sales were decreasing due to competitive media budgets + 1.1.1.2 Inbev in talks with Anh Bush + 1.1.1.2.1 Two biggest companies will create huge company + 1.1.1.3 other merger talks + 1.1.1.4 domestic and foreign threats + 1.1.2 Beer Marketing + 1.1.2.1 People drink marketing + 1.1.3 2007 + 1.1.3.1 Anh Bush + 1.1.3.1.1 produces in foreign markets + 1.1.3.2 Heineken + 1.1.3.2.1 Dutch + 1.1.3.2.2 reputation of top selling beer in world + 1.1.3.2.3 marketing + 1.1.3.2.3.1 2006 aggressive marketing campaign + 1.1.3.2.3.1.1 Heineken Premium Light + 1.1.3.2.3.2 superior taste + 1.1.3.2.3.3 no mythology + 1.1.3.2.3.4 premium brand + 1.1.3.2.3.5 premium beer + 1.1.3.2.4 produces beer domestically + 1.1.3.2.4.1 parent of local distributors + 1.1.3.2.4.1.1 distribution + 1.1.3.2.4.1.2 importing + 1.1.3.2.4.1.2.1 import taxes passed on to consumer + 1.1.3.2.4.1.3 marketing + 1.1.3.3 SAP Miller + 1.1.3.4 inbev + 1.1.4 2004 merger + 1.1.4.1 largest merge + 1.1.4.1.1 worth 12.8 billion + 1.1.4.2 #5 Am Bev - Brazil + 1.1.4.3 #1 Interbrew + 1.1.5 Interbrew + 1.1.5.1 flagship brand: Stella Artois + 1.1.5.2 local managers controlling brands + 1.1.5.3 sales in 110 countries + 1.1.5.4 aquired breweries in 20 countries + 1.1.5.5 Belgian + 1.1.6 startup costs high + 1.1.6.1 industry supported conectration + 1.1.7 90s national leaders expanded abroad + 1.1.8 different countries had different tastes + 1.1.9 colsolition happened in 1800s + 1.1.10 no means of transport + 1.1.11 many local breweries + 1.1.12 traditionally a clustered market 1.2 Carloz Fernandez CEO - 1.2.1 CEO Since 1997 - 1.2.1.1 29 years old - 1.2.1.1.1 working there since 13 + 1.2.1 Expanding production + 1.2.1.1 300 million investment + 1.2.1.2 renovate facility in Zacatecas 1.2.2 vision: top five brewers - 1.2.2.1 International Business model - 1.2.2.1.1 experienced local distributors - 1.2.2.1.2 Growing international demand - 1.2.2.1.3 Capitalize on NAFTA - 1.2.2.2 top 10 beer producers in world - 1.2.2.2.1 7.8 % sales growth compounded over ten years - 1.2.2.2.2 2005 - 1.2.2.2.2.1 12.3 % exports - 1.2.2.2.2.2 4% increase domestically - 1.2.2.2.2.3 export sales 30% - 1.2.2.2.3 Corona Extra - 1.2.2.2.3.1 worlds fourth best selling beer - 1.2.2.2.3.2 56% shar of domestic market - 1.2.2.2.3.3 Since 1997 #1 import in US - 1.2.2.2.3.3.1 outsold competitor by 50% - 1.2.3 Expanding production - 1.2.3.1 renovate facility in Zacatecas - 1.2.3.2 300 million investment - 1.3 US Beer Market - 1.3.1 2nd largest nest to China - 1.3.2 Consumption six times higher per cap - 1.3.3 Groth expectations reduced - 1.3.4 80% of market - 1.3.4.1 AB - 1.3.4.1.1 75% of industry profits - 1.3.4.2 adolf coors - 1.3.4.3 Miller - 1.3.5 dense network of regional craft brewing - 1.3.6 volume main driver - 1.4 Modelo in Mexico - 1.4.1 History to 1970 - 1.4.1.1 formed in 1922 - 1.4.1.1.1 Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr - 1.4.1.1.2 Iriarte died in 1932 - 1.4.1.1.3 Diez sole owner 1936 - 1.4.1.1.4 Fernandez Family Sole owner since 1936 - 1.4.1.2 focus on Mexico City - 1.4.1.3 Modelo 1st Brand - 1.4.1.4 Corona 2nd Brand - 1.4.1.4.1 Clear Glass Customers preference - 1.4.1.5 1940s period of strong growth - 1.4.1.5.1 concentrate domesti¬cally - 1.4.1.5.2 improve distribution methods and produc¬tion facilities - 1.4.1.5.2.1 distribution: direct with profit sharing - 1.4.1.6 bought the brands and assets of the Toluca y Mexico Brewery - 1.4.1.6.1 1935 - 1.4.1.6.2 country's oldest brand of beer - 1.4.2 1971, Antonino Fernandez was appointed CEO - 1.4.2.1 Mexican Stock exchange in 1994 - 1.4.2.2 Anheuser-Busch 17.7 % of the equity - 1.4.2.2.1 The 50.2 % represented 43.9% voting - 1.4.3 Largest Beer producer and distrubutor in Mexico - 1.4.3.1 corona 56% share - 1.5 Modelo in US - 1.5.1 History - 1.5.1.1 1979 - 1.5.1.2 Amalgamated Distillery Products Inc. ( - 1.5.1.2.1 later renamed Barton Beers Ltd. - 1.5.1.3 gained popularity in southern states - 1.5.1.4 rapid growth 1980s - 1.5.1.4.1 second most popular imported beer - 1.5.1.5 1991 - 1.5.1.5.1 doubling of federal excise tax on beer - 1.5.1.5.1.1 sales decrease of 15 percent - 1.5.1.5.1.2 distributor absorb the tax 92 - 1.5.1.5.2 distributors took the loss - 1.5.2 2007 5 beers to us - 1.5.2.1 3 of top 8 beers in US - 1.5.2.2 Heineken - 1.5.2.2.1 Main Import Comptitor - 1.5.2.3 131 million cases - 1.5.3 Marketing - 1.5.3.1 surfing mythology - 1.5.3.2 not selling premium quality - 1.5.3.3 not testosterone driven - 1.5.3.4 found new following - 1.5.3.5 beer for non beer drinkers - 1.5.3.6 dependable second choise - 1.5.3.7 Fun in the sun - 1.5.3.7.1 Barton Beer's idea - 1.5.3.7.2 escape - 1.5.3.7.3 relaxation - 1.5.3.8 1996ad budget - 1.5.3.8.1 Corona 5.1 mil - 1.5.3.8.2 Heiniken 15 mil - 1.5.3.8.3 an bsch 192 mil - 1.5.4 Us dist contracts - 1.5.4.1 importer/distributors - 1.5.4.1.1 Local Companies - 1.5.4.1.2 Autonomous - 1.5.4.1.3 competitive relationship - 1.5.4.1.4 transportation - 1.5.4.1.5 insurance - 1.5.4.1.6 pricing - 1.5.4.1.7 customs - 1.5.4.1.8 advertixing - 1.5.4.2 procermex inc - 1.5.4.2.1 Modelo us subsidiary - 1.5.4.2.2 Support - 1.5.4.2.3 Supervise - 1.5.4.2.4 Coordinate - 1.5.4.3 Modelo had final say on brand image - 1.5.4.4 production in Mexico - 1.5.4.5 Chicago based Barton Beers 1st - 1.5.4.5.1 largest importer in 25 western states - 1.5.4.6 Gambrinus - 1.5.4.6.1 1986 - 1.5.4.6.2 eastern dist - 1.6 The Beer market - 1.6.1 traditionally a clustered market - 1.6.2 many local breweries - 1.6.3 no means of transport - 1.6.4 colsolition happened in 1800s - 1.6.5 different countries had different tastes - 1.6.6 90s national leaders expanded abroad - 1.6.7 startup costs high - 1.6.7.1 industry supported conectration - 1.6.8 Interbrew - 1.6.8.1 Belgian - 1.6.8.2 aquired breweries in 20 countries - 1.6.8.3 sales in 110 countries - 1.6.8.4 local managers controlling brands - 1.6.8.5 flagship brand: Stella Artois - 1.6.9 2004 merger - 1.6.9.1 #1 Interbrew - 1.6.9.2 #5 Am Bev - Brazil - 1.6.9.3 largest merge - 1.6.9.3.1 worth 12.8 billion - 1.6.10 2007 - 1.6.10.1 inbev - 1.6.10.2 SAP Miller - 1.6.10.3 Heineken - 1.6.10.3.1 produces beer domestically - 1.6.10.3.1.1 parent of local distributors - 1.6.10.3.1.1.1 marketing - 1.6.10.3.1.1.2 importing - 1.6.10.3.1.1.2.1 import taxes passed on to consumer - 1.6.10.3.1.1.3 distribution - 1.6.10.3.2 marketing - 1.6.10.3.2.1 premium beer - 1.6.10.3.2.2 premium brand - 1.6.10.3.2.3 no mythology - 1.6.10.3.2.4 superior taste - 1.6.10.3.2.5 2006 aggressive marketing campaign - 1.6.10.3.2.5.1 Heineken Premium Light - 1.6.10.3.3 reputation of top selling beer in world - 1.6.10.3.4 Dutch - 1.6.10.4 Anh Bush - 1.6.10.4.1 produces in foreign markets - 1.6.11 Beer Marketing - 1.6.11.1 People drink marketing - 1.6.12 Future - 1.6.12.1 domestic and foreign threats - 1.6.12.2 other merger talks - 1.6.12.3 Inbev in talks with Anh Bush - 1.6.12.3.1 Two biggest companies will create huge company - 1.6.12.4 Sales were decreasing due to competitive media budgets - 1.7 Mexico Industry - 1.7.1 has most trade agreements in world - 1.7.2 one of the largest domestic beer markets - 1.7.3 imported beer only 1% sales - 1.7.3.1 half were anh bcsh dist by modelo - 1.7.4 modelo - 1.7.4.1 NAFTA S.A. An Bucsh - 1.7.4.2 62.8% of market - 1.7.5 FEMSA - 1.7.5.1 domestic market - 1.7.5.1.1 37% of domestic market - 1.7.5.1.2 production and distribution in Mexico: peso not a threat - 1.7.5.1.3 Owns Oxxo C - 1.7.5.1.3.1 CA largest chain of conv stores - 1.7.5.1.4 leads domestic premium beer market - 1.7.5.1.5 997 to 2004 taking domestic market share - 1.7.5.1.6 NAFTA SACoca cola - 1.7.5.1.6.1 Exclusive distributor - 1.7.5.2 foriegn market - 1.7.5.2.1 Partnership Heiniken - 1.7.5.2.1.1 Distribution in US - 1.7.5.2.2 90s entry to us market failed - 1.7.5.2.3 Recently partnered with Heiniken for US market - 1.7.5.2.3.1 2005 18.7% growth + 1.2.2.1 top 10 beer producers in world + 1.2.2.1.1 Corona Extra + 1.2.2.1.1.1 Since 1997 #1 import in US + 1.2.2.1.1.1.1 outsold competitor by 50% + 1.2.2.1.1.2 56% shar of domestic market + 1.2.2.1.1.3 worlds fourth best selling beer + 1.2.2.1.2 2005 + 1.2.2.1.2.1 export sales 30% + 1.2.2.1.2.2 4% increase domestically + 1.2.2.1.2.3 12.3 % exports + 1.2.2.1.3 7.8 % sales growth compounded over ten years + 1.2.2.2 International Business model + 1.2.2.2.1 Capitalize on NAFTA + 1.2.2.2.2 Growing international demand + 1.2.2.2.3 experienced local distributors + 1.2.3 CEO Since 1997 + 1.2.3.1 29 years old + 1.2.3.1.1 working there since 13 + 1.3 Modelo in world + 1.3.1 One of top 10 breweries in world + 1.3.2 Fifth largest distributor in world + 1.3.2.1 in 12 years + 1.3.2.2 Can they sustain that trend + 1.3.3 International market protected Modelo from unstable peso + 1.4 Mexico Industry + 1.4.1 FEMSA + 1.4.1.1 foriegn market + 1.4.1.1.1 Recently partnered with Heiniken for US market + 1.4.1.1.1.1 2005 18.7% growth + 1.4.1.1.2 90s entry to us market failed + 1.4.1.1.3 Partnership Heiniken + 1.4.1.1.3.1 Distribution in US + 1.4.1.2 domestic market + 1.4.1.2.1 NAFTA SACoca cola + 1.4.1.2.1.1 Exclusive distributor + 1.4.1.2.2 997 to 2004 taking domestic market share + 1.4.1.2.3 leads domestic premium beer market + 1.4.1.2.4 Owns Oxxo C + 1.4.1.2.4.1 CA largest chain of conv stores + 1.4.1.2.5 production and distribution in Mexico: peso not a threat + 1.4.1.2.6 37% of domestic market + 1.4.2 modelo + 1.4.2.1 62.8% of market + 1.4.2.2 NAFTA S.A. An Bucsh + 1.4.3 imported beer only 1% sales + 1.4.3.1 half were anh bcsh dist by modelo + 1.4.4 one of the largest domestic beer markets + 1.4.5 has most trade agreements in world + 1.5 Modelo in Mexico + 1.5.1 Largest Beer producer and distrubutor in Mexico + 1.5.1.1 corona 56% share + 1.5.2 1971, Antonino Fernandez was appointed CEO + 1.5.2.1 Anheuser-Busch 17.7 % of the equity + 1.5.2.1.1 The 50.2 % represented 43.9% voting + 1.5.2.2 Mexican Stock exchange in 1994 + 1.5.3 History to 1970 + 1.5.3.1 bought the brands and assets of the Toluca y Mexico Brewery + 1.5.3.1.1 country's oldest brand of beer + 1.5.3.1.2 1935 + 1.5.3.2 1940s period of strong growth + 1.5.3.2.1 improve distribution methods and produc¬tion facilities + 1.5.3.2.1.1 distribution: direct with profit sharing + 1.5.3.2.2 concentrate domesti¬cally + 1.5.3.3 Corona 2nd Brand + 1.5.3.3.1 Clear Glass Customers preference + 1.5.3.4 Modelo 1st Brand + 1.5.3.5 focus on Mexico City + 1.5.3.6 formed in 1922 + 1.5.3.6.1 Fernandez Family Sole owner since 1936 + 1.5.3.6.2 Diez sole owner 1936 + 1.5.3.6.3 Iriarte died in 1932 + 1.5.3.6.4 Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr + 1.6 US Beer Market + 1.6.1 volume main driver + 1.6.2 dense network of regional craft brewing + 1.6.3 80% of market + 1.6.3.1 Miller + 1.6.3.2 adolf coors + 1.6.3.3 AB + 1.6.3.3.1 75% of industry profits + 1.6.4 Groth expectations reduced + 1.6.5 Consumption six times higher per cap + 1.6.6 2nd largest nest to China + 1.7 Modelo in US + 1.7.1 Us dist contracts + 1.7.1.1 Gambrinus + 1.7.1.1.1 eastern dist + 1.7.1.1.2 1986 + 1.7.1.2 Chicago based Barton Beers 1st + 1.7.1.2.1 largest importer in 25 western states + 1.7.1.3 production in Mexico + 1.7.1.4 Modelo had final say on brand image + 1.7.1.5 procermex inc + 1.7.1.5.1 Coordinate + 1.7.1.5.2 Supervise + 1.7.1.5.3 Support + 1.7.1.5.4 Modelo us subsidiary + 1.7.1.6 importer/distributors + 1.7.1.6.1 advertixing + 1.7.1.6.2 customs + 1.7.1.6.3 pricing + 1.7.1.6.4 insurance + 1.7.1.6.5 transportation + 1.7.1.6.6 competitive relationship + 1.7.1.6.7 Autonomous + 1.7.1.6.8 Local Companies + 1.7.2 Marketing + 1.7.2.1 1996ad budget + 1.7.2.1.1 an bsch 192 mil + 1.7.2.1.2 Heiniken 15 mil + 1.7.2.1.3 Corona 5.1 mil + 1.7.2.2 Fun in the sun + 1.7.2.2.1 relaxation + 1.7.2.2.2 escape + 1.7.2.2.3 Barton Beer's idea + 1.7.2.3 dependable second choise + 1.7.2.4 beer for non beer drinkers + 1.7.2.5 found new following + 1.7.2.6 not testosterone driven + 1.7.2.7 not selling premium quality + 1.7.2.8 surfing mythology + 1.7.3 2007 5 beers to us + 1.7.3.1 131 million cases + 1.7.3.2 Heineken + 1.7.3.2.1 Main Import Comptitor + 1.7.3.3 3 of top 8 beers in US + 1.7.4 History + 1.7.4.1 1991 + 1.7.4.1.1 distributors took the loss + 1.7.4.1.2 doubling of federal excise tax on beer + 1.7.4.1.2.1 distributor absorb the tax 92 + 1.7.4.1.2.2 sales decrease of 15 percent + 1.7.4.2 rapid growth 1980s + 1.7.4.2.1 second most popular imported beer + 1.7.4.3 gained popularity in southern states + 1.7.4.4 Amalgamated Distillery Products Inc. ( + 1.7.4.4.1 later renamed Barton Beers Ltd. + 1.7.4.5 1979 diff --git a/wise-webapp/src/test/resources/data/export/bigmap.xls b/wise-webapp/src/test/resources/data/export/bigmap.xls index 1909ee20..79345d17 100644 --- a/wise-webapp/src/test/resources/data/export/bigmap.xls +++ b/wise-webapp/src/test/resources/data/export/bigmap.xls @@ -28,32 +28,247 @@ -Modelo in world +The Beer market -International market protected Modelo from unstable peso - - - - -Fifth largest distributor in world +Future -Can they sustain that trend +Sales were decreasing due to competitive media budgets -in 12 years +Inbev in talks with Anh Bush + + + + +Two biggest companies will create huge company + + + + +other merger talks + + + + +domestic and foreign threats -One of top 10 breweries in world +Beer Marketing + + + + +People drink marketing + + + + +2007 + + + + +Anh Bush + + + + +produces in foreign markets + + + + +Heineken + + + + +Dutch + + + + +reputation of top selling beer in world + + + + +marketing + + + + +2006 aggressive marketing campaign + + + + +Heineken Premium Light + + + + +superior taste + + + + +no mythology + + + + +premium brand + + + + +premium beer + + + + +produces beer domestically + + + + +parent of local distributors + + + + +distribution + + + + +importing + + + + +import taxes passed on to consumer + + + + +marketing + + + + +SAP Miller + + + + +inbev + + + + +2004 merger + + + + +largest merge + + + + +worth 12.8 billion + + + + +#5 Am Bev - Brazil + + + + +#1 Interbrew + + + + +Interbrew + + + + +flagship brand: Stella Artois + + + + +local managers controlling brands + + + + +sales in 110 countries + + + + +aquired breweries in 20 countries + + + + +Belgian + + + + +startup costs high + + + + +industry supported conectration + + + + +90s national leaders expanded abroad + + + + +different countries had different tastes + + + + +colsolition happened in 1800s + + + + +no means of transport + + + + +many local breweries + + + + +traditionally a clustered market @@ -63,6 +278,101 @@ +Expanding production + + + + +300 million investment + + + + +renovate facility in Zacatecas + + + + +vision: top five brewers + + + + +top 10 beer producers in world + + + + +Corona Extra + + + + +Since 1997 #1 import in US + + + + +outsold competitor by 50% + + + + +56% shar of domestic market + + + + +worlds fourth best selling beer + + + + +2005 + + + + +export sales 30% + + + + +4% increase domestically + + + + +12.3 % exports + + + + +7.8 % sales growth compounded over ten years + + + + +International Business model + + + + +Capitalize on NAFTA + + + + +Growing international demand + + + + +experienced local distributors + + + + CEO Since 1997 @@ -77,793 +387,33 @@ - -vision: top five brewers - - - - -International Business model - - - - -experienced local distributors - - - - -Growing international demand - - - - -Capitalize on NAFTA - - - - -top 10 beer producers in world - - - - -7.8 % sales growth compounded over ten years - - - - -2005 - - - - -12.3 % exports - - - - -4% increase domestically - - - - -export sales 30% - - - - -Corona Extra - - - - -worlds fourth best selling beer - - - - -56% shar of domestic market - - - - -Since 1997 #1 import in US - - - - -outsold competitor by 50% - - - - -Expanding production - - - - -renovate facility in Zacatecas - - - - -300 million investment - - - -US Beer Market +Modelo in world -2nd largest nest to China +One of top 10 breweries in world -Consumption six times higher per cap +Fifth largest distributor in world + + + + +in 12 years + + + + +Can they sustain that trend -Groth expectations reduced - - - - -80% of market - - - - -AB - - - - -75% of industry profits - - - - -adolf coors - - - - -Miller - - - - -dense network of regional craft brewing - - - - -volume main driver - - - - -Modelo in Mexico - - - - -History to 1970 - - - - -formed in 1922 - - - - -Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr - - - - -Iriarte died in 1932 - - - - -Diez sole owner 1936 - - - - -Fernandez Family Sole owner since 1936 - - - - -focus on Mexico City - - - - -Modelo 1st Brand - - - - -Corona 2nd Brand - - - - -Clear Glass Customers preference - - - - -1940s period of strong growth - - - - -concentrate domesti¬cally - - - - -improve distribution methods and produc¬tion facilities - - - - -distribution: direct with profit sharing - - - - -bought the brands and assets of the Toluca y Mexico Brewery - - - - -1935 - - - - -country's oldest brand of beer - - - - -1971, Antonino Fernandez was appointed CEO - - - - -Mexican Stock exchange in 1994 - - - - -Anheuser-Busch 17.7 % of the equity - - - - -The 50.2 % represented 43.9% voting - - - - -Largest Beer producer and distrubutor in Mexico - - - - -corona 56% share - - - - -Modelo in US - - - - -History - - - - -1979 - - - - -Amalgamated Distillery Products Inc. ( - - - - -later renamed Barton Beers Ltd. - - - - -gained popularity in southern states - - - - -rapid growth 1980s - - - - -second most popular imported beer - - - - -1991 - - - - -doubling of federal excise tax on beer - - - - -sales decrease of 15 percent - - - - -distributor absorb the tax 92 - - - - -distributors took the loss - - - - -2007 5 beers to us - - - - -3 of top 8 beers in US - - - - -Heineken - - - - -Main Import Comptitor - - - - -131 million cases - - - - -Marketing - - - - -surfing mythology - - - - -not selling premium quality - - - - -not testosterone driven - - - - -found new following - - - - -beer for non beer drinkers - - - - -dependable second choise - - - - -Fun in the sun - - - - -Barton Beer's idea - - - - -escape - - - - -relaxation - - - - -1996ad budget - - - - -Corona 5.1 mil - - - - -Heiniken 15 mil - - - - -an bsch 192 mil - - - - -Us dist contracts - - - - -importer/distributors - - - - -Local Companies - - - - -Autonomous - - - - -competitive relationship - - - - -transportation - - - - -insurance - - - - -pricing - - - - -customs - - - - -advertixing - - - - -procermex inc - - - - -Modelo us subsidiary - - - - -Support - - - - -Supervise - - - - -Coordinate - - - - -Modelo had final say on brand image - - - - -production in Mexico - - - - -Chicago based Barton Beers 1st - - - - -largest importer in 25 western states - - - - -Gambrinus - - - - -1986 - - - - -eastern dist - - - - -The Beer market - - - - -traditionally a clustered market - - - - -many local breweries - - - - -no means of transport - - - - -colsolition happened in 1800s - - - - -different countries had different tastes - - - - -90s national leaders expanded abroad - - - - -startup costs high - - - - -industry supported conectration - - - - -Interbrew - - - - -Belgian - - - - -aquired breweries in 20 countries - - - - -sales in 110 countries - - - - -local managers controlling brands - - - - -flagship brand: Stella Artois - - - - -2004 merger - - - - -#1 Interbrew - - - - -#5 Am Bev - Brazil - - - - -largest merge - - - - -worth 12.8 billion - - - - -2007 - - - - -inbev - - - - -SAP Miller - - - - -Heineken - - - - -produces beer domestically - - - - -parent of local distributors - - - - -marketing - - - - -importing - - - - -import taxes passed on to consumer - - - - -distribution - - - - -marketing - - - - -premium beer - - - - -premium brand - - - - -no mythology - - - - -superior taste - - - - -2006 aggressive marketing campaign - - - - -Heineken Premium Light - - - - -reputation of top selling beer in world - - - - -Dutch - - - - -Anh Bush - - - - -produces in foreign markets - - - - -Beer Marketing - - - - -People drink marketing - - - - -Future - - - - -domestic and foreign threats - - - - -other merger talks - - - - -Inbev in talks with Anh Bush - - - - -Two biggest companies will create huge company - - - - -Sales were decreasing due to competitive media budgets +International market protected Modelo from unstable peso @@ -873,57 +423,62 @@ -has most trade agreements in world - - - - -one of the largest domestic beer markets - - - - -imported beer only 1% sales - - - - -half were anh bcsh dist by modelo - - - - -modelo - - - - -NAFTA S.A. An Bucsh - - - - -62.8% of market - - - - FEMSA +foriegn market + + + + +Recently partnered with Heiniken for US market + + + + +2005 18.7% growth + + + + +90s entry to us market failed + + + + +Partnership Heiniken + + + + +Distribution in US + + + + domestic market -37% of domestic market +NAFTA SACoca cola + + + + +Exclusive distributor -production and distribution in Mexico: peso not a threat +997 to 2004 taking domestic market share + + + + +leads domestic premium beer market @@ -938,52 +493,497 @@ -leads domestic premium beer market +production and distribution in Mexico: peso not a threat -997 to 2004 taking domestic market share +37% of domestic market - -NAFTA SACoca cola - - - - -Exclusive distributor + +modelo -foriegn market +62.8% of market + + + + +NAFTA S.A. An Bucsh + + + + +imported beer only 1% sales + + + + +half were anh bcsh dist by modelo + + + + +one of the largest domestic beer markets + + + + +has most trade agreements in world + + + + +Modelo in Mexico + + + + +Largest Beer producer and distrubutor in Mexico + + + + +corona 56% share + + + + +1971, Antonino Fernandez was appointed CEO + + + + +Anheuser-Busch 17.7 % of the equity -Partnership Heiniken +The 50.2 % represented 43.9% voting + + + + +Mexican Stock exchange in 1994 + + + + +History to 1970 + + + + +bought the brands and assets of the Toluca y Mexico Brewery + + + + +country's oldest brand of beer + + + + +1935 + + + + +1940s period of strong growth + + + + +improve distribution methods and produc¬tion facilities -Distribution in US +distribution: direct with profit sharing -90s entry to us market failed +concentrate domesti¬cally + + + + +Corona 2nd Brand -Recently partnered with Heiniken for US market +Clear Glass Customers preference + + + + +Modelo 1st Brand + + + + +focus on Mexico City + + + + +formed in 1922 + + + + +Fernandez Family Sole owner since 1936 + + + + +Diez sole owner 1936 + + + + +Iriarte died in 1932 + + + + +Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr + + + + +US Beer Market + + + + +volume main driver + + + + +dense network of regional craft brewing + + + + +80% of market + + + + +Miller + + + + +adolf coors + + + + +AB + + + + +75% of industry profits + + + + +Groth expectations reduced + + + + +Consumption six times higher per cap + + + + +2nd largest nest to China + + + + +Modelo in US + + + + +Us dist contracts + + + + +Gambrinus + + + + +eastern dist + + + + +1986 + + + + +Chicago based Barton Beers 1st + + + + +largest importer in 25 western states + + + + +production in Mexico + + + + +Modelo had final say on brand image + + + + +procermex inc + + + + +Coordinate + + + + +Supervise + + + + +Support + + + + +Modelo us subsidiary + + + + +importer/distributors + + + + +advertixing + + + + +customs + + + + +pricing + + + + +insurance + + + + +transportation + + + + +competitive relationship + + + + +Autonomous + + + + +Local Companies + + + + +Marketing + + + + +1996ad budget + + + + +an bsch 192 mil + + + + +Heiniken 15 mil + + + + +Corona 5.1 mil + + + + +Fun in the sun + + + + +relaxation + + + + +escape + + + + +Barton Beer's idea + + + + +dependable second choise + + + + +beer for non beer drinkers + + + + +found new following + + + + +not testosterone driven + + + + +not selling premium quality + + + + +surfing mythology + + + + +2007 5 beers to us + + + + +131 million cases + + + + +Heineken + + + + +Main Import Comptitor + + + + +3 of top 8 beers in US + + + + +History + + + + +1991 + + + + +distributors took the loss + + + + +doubling of federal excise tax on beer -2005 18.7% growth +distributor absorb the tax 92 + + + + +sales decrease of 15 percent + + + + +rapid growth 1980s + + + + +second most popular imported beer + + + + +gained popularity in southern states + + + + +Amalgamated Distillery Products Inc. ( + + + + +later renamed Barton Beers Ltd. + + + + +1979 diff --git a/wise-webapp/src/test/resources/data/export/bug2.csv b/wise-webapp/src/test/resources/data/export/bug2.csv index 6b4635b5..936e380e 100644 --- a/wise-webapp/src/test/resources/data/export/bug2.csv +++ b/wise-webapp/src/test/resources/data/export/bug2.csv @@ -1,8 +1,45 @@ SaberMás +, + Complementamos el trabajo de la escuela +, + , + SaberMás trabaja con, desde y para la motivación +, + , + Trabajamos en equipo en nuestros proyectos +, + , + Cada uno va a su ritmo, y cada cual pone sus límites +, + , + Aprendemos todos de todos +, + , + Valoramos lo que hemos aprendido +, + Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas +, + Trabajo basado en la experimentación y en la investigación +, + Alternativa a otras actividades de ocio +, + Actividades centradas en el contexto cercano +, + Duración limitada: 5-6 semanas , Utilización de medios de expresión artística, digitales y analógicos , Precio también limitado: 100-120? +, + Uso de la tecnología durante todo el proceso de aprendizaje +, + Niños y niñas que quieren saber más +, + Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?) +, + De 8 a 12 años, sin separación por edades +, + Máximo 10/1 por taller , Talleres temáticos , @@ -15,9 +52,19 @@ SaberMás , , Arqueología +, + , + Culturas Antiguas +, + , + , + Egipto, Grecia, China... , , Energía +, + , + Paleontología , , Astronomía @@ -30,50 +77,3 @@ SaberMás , , Poesía -, - , - Culturas Antiguas -, - , - , - Egipto, Grecia, China... -, - , - Paleontología -, - Duración limitada: 5-6 semanas -, - Niños y niñas que quieren saber más -, - Alternativa a otras actividades de ocio -, - Uso de la tecnología durante todo el proceso de aprendizaje -, - Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas -, - Trabajo basado en la experimentación y en la investigación -, - De 8 a 12 años, sin separación por edades -, - Máximo 10/1 por taller -, - Actividades centradas en el contexto cercano -, - Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?) -, - Complementamos el trabajo de la escuela -, - , - Cada uno va a su ritmo, y cada cual pone sus límites -, - , - Aprendemos todos de todos -, - , - Valoramos lo que hemos aprendido -, - , - SaberMás trabaja con, desde y para la motivación -, - , - Trabajamos en equipo en nuestros proyectos diff --git a/wise-webapp/src/test/resources/data/export/bug2.doc b/wise-webapp/src/test/resources/data/export/bug2.doc index 6a26f456..c6ec5345 100644 --- a/wise-webapp/src/test/resources/data/export/bug2.doc +++ b/wise-webapp/src/test/resources/data/export/bug2.doc @@ -267,6 +267,131 @@ +Complementamos el trabajo de la escuela + + + + + + + + + Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica. + A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña, + ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea. + + Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella, + y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá. + + + + + + + + + +SaberMás trabaja con, desde y para la motivación + + + + + + + + + +Trabajamos en equipo en nuestros proyectos + + + + + + + + + +Cada uno va a su ritmo, y cada cual pone sus límites + + + + + + + + + +Aprendemos todos de todos + + + + + + + + + +Valoramos lo que hemos aprendido + + + + + + + + + + +Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas + + + + + + + + + +Trabajo basado en la experimentación y en la investigación + + + + + + + + + +Alternativa a otras actividades de ocio + + + + + + + + + +Actividades centradas en el contexto cercano + + + + + + + + + +Duración limitada: 5-6 semanas + + + + + + + + + Utilización de medios de expresión artística, digitales y analógicos @@ -287,6 +412,56 @@ +Uso de la tecnología durante todo el proceso de aprendizaje + + + + + + + + + +Niños y niñas que quieren saber más + + + + + + + + + +Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?) + + + + + + + + + +De 8 a 12 años, sin separación por edades + + + + + + + + + +Máximo 10/1 por taller + + + + + + + + + Talleres temáticos @@ -326,6 +501,26 @@ +Culturas Antiguas + + + + + + + + +Egipto, Grecia, China... + + + + + + + + + + Energía @@ -336,6 +531,16 @@ +Paleontología + + + + + + + + + Astronomía @@ -370,211 +575,6 @@ - - - - - - -Culturas Antiguas - - - - - - - - -Egipto, Grecia, China... - - - - - - - - - - -Paleontología - - - - - - - - - - -Duración limitada: 5-6 semanas - - - - - - - - - -Niños y niñas que quieren saber más - - - - - - - - - -Alternativa a otras actividades de ocio - - - - - - - - - -Uso de la tecnología durante todo el proceso de aprendizaje - - - - - - - - - -Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas - - - - - - - - - -Trabajo basado en la experimentación y en la investigación - - - - - - - - - -De 8 a 12 años, sin separación por edades - - - - - - - - - -Máximo 10/1 por taller - - - - - - - - - -Actividades centradas en el contexto cercano - - - - - - - - - -Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?) - - - - - - - - - -Complementamos el trabajo de la escuela - - - - - - - - - Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica. - A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña, - ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea. - - Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella, - y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá. - - - - - - - - - -Cada uno va a su ritmo, y cada cual pone sus límites - - - - - - - - - -Aprendemos todos de todos - - - - - - - - - -Valoramos lo que hemos aprendido - - - - - - - - - -SaberMás trabaja con, desde y para la motivación - - - - - - - - - -Trabajamos en equipo en nuestros proyectos - - - diff --git a/wise-webapp/src/test/resources/data/export/bug2.latex b/wise-webapp/src/test/resources/data/export/bug2.latex index e8c27573..b2033118 100644 --- a/wise-webapp/src/test/resources/data/export/bug2.latex +++ b/wise-webapp/src/test/resources/data/export/bug2.latex @@ -1,32 +1,32 @@ \chapter{SaberMás}\label{ID_1} + \section{Complementamos el trabajo de la escuela}\label{ID_27}Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá. + \subsection{SaberMás trabaja con, desde y para la motivación}\label{ID_28} + \subsection{Trabajamos en equipo en nuestros proyectos }\label{ID_32} + \subsection{Cada uno va a su ritmo, y cada cual pone sus límites}\label{ID_30} + \subsection{Aprendemos todos de todos}\label{ID_31} + \subsection{Valoramos lo que hemos aprendido}\label{ID_33} + \section{Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas }\label{ID_3} + \section{Trabajo basado en la experimentación y en la investigación}\label{ID_4} + \section{Alternativa a otras actividades de ocio}\label{ID_8} + \section{Actividades centradas en el contexto cercano}\label{ID_37} + \section{Duración limitada: 5-6 semanas}\label{ID_6} \section{Utilización de medios de expresión artística, digitales y analógicos}\label{ID_5} \section{Precio también limitado: 100-120?}\label{ID_9} + \section{Uso de la tecnología durante todo el proceso de aprendizaje}\label{ID_23} + \section{Niños y niñas que quieren saber más}\label{ID_7} + \section{Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)}\label{ID_22} + \section{De 8 a 12 años, sin separación por edades}\label{ID_10} + \section{Máximo 10/1 por taller}\label{ID_19} \section{Talleres temáticos}\label{ID_2} \subsection{Naturaleza}\label{ID_13} \subsubsection{Animales, Plantas, Piedras}\label{ID_17} \subsection{Arqueología}\label{ID_21} + \subsection{Culturas Antiguas}\label{ID_25} + \subsubsection{Egipto, Grecia, China...}\label{ID_26} \subsection{Energía}\label{ID_18} + \subsection{Paleontología}\label{ID_38} \subsection{Astronomía}\label{ID_16} \subsection{Arquitectura}\label{ID_20} \subsection{Cocina}\label{ID_11} - \subsection{Poesía}\label{ID_24} - \subsection{Culturas Antiguas}\label{ID_25} - \subsubsection{Egipto, Grecia, China...}\label{ID_26} - \subsection{Paleontología}\label{ID_38} - \section{Duración limitada: 5-6 semanas}\label{ID_6} - \section{Niños y niñas que quieren saber más}\label{ID_7} - \section{Alternativa a otras actividades de ocio}\label{ID_8} - \section{Uso de la tecnología durante todo el proceso de aprendizaje}\label{ID_23} - \section{Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas }\label{ID_3} - \section{Trabajo basado en la experimentación y en la investigación}\label{ID_4} - \section{De 8 a 12 años, sin separación por edades}\label{ID_10} - \section{Máximo 10/1 por taller}\label{ID_19} - \section{Actividades centradas en el contexto cercano}\label{ID_37} - \section{Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)}\label{ID_22} - \section{Complementamos el trabajo de la escuela}\label{ID_27}Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá. - \subsection{Cada uno va a su ritmo, y cada cual pone sus límites}\label{ID_30} - \subsection{Aprendemos todos de todos}\label{ID_31} - \subsection{Valoramos lo que hemos aprendido}\label{ID_33} - \subsection{SaberMás trabaja con, desde y para la motivación}\label{ID_28} - \subsection{Trabajamos en equipo en nuestros proyectos }\label{ID_32} \ No newline at end of file + \subsection{Poesía}\label{ID_24} \ No newline at end of file diff --git a/wise-webapp/src/test/resources/data/export/bug2.mm b/wise-webapp/src/test/resources/data/export/bug2.mm index 5d08cb8f..84123d89 100644 --- a/wise-webapp/src/test/resources/data/export/bug2.mm +++ b/wise-webapp/src/test/resources/data/export/bug2.mm @@ -1,32 +1,5 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -41,11 +14,38 @@